add placeholder RenderFlexibleBox.cpp files
authortony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Jul 2011 19:35:52 +0000 (19:35 +0000)
committertony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Jul 2011 19:35:52 +0000 (19:35 +0000)
https://bugs.webkit.org/show_bug.cgi?id=64982

Reviewed by Ojan Vafai.

No new tests, just adding new files and making sure it compiles.
Also adding the isFlexibleBox identifier to RenderObject.

* CMakeLists.txt:
* GNUmakefile.list.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* rendering/RenderFlexibleBox.cpp: Added.
(WebCore::RenderFlexibleBox::RenderFlexibleBox): Inherit from RenderBlock like the old flexbox.
(WebCore::RenderFlexibleBox::~RenderFlexibleBox):
(WebCore::RenderFlexibleBox::renderName):
(WebCore::RenderFlexibleBox::layoutBlock):
* rendering/RenderFlexibleBox.h: Added.
(WebCore::RenderFlexibleBox::isFlexibleBox):
* rendering/RenderObject.h:
(WebCore::RenderObject::isFlexibleBox):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@91594 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.pro
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/rendering/RenderFlexibleBox.cpp [new file with mode: 0644]
Source/WebCore/rendering/RenderFlexibleBox.h [new file with mode: 0644]
Source/WebCore/rendering/RenderObject.h

index 81aecf0..acd2c28 100644 (file)
@@ -1209,6 +1209,7 @@ SET(WebCore_SOURCES
     rendering/RenderEmbeddedObject.cpp
     rendering/RenderFieldset.cpp
     rendering/RenderFileUploadControl.cpp
+    rendering/RenderFlexibleBox.cpp
     rendering/RenderFrame.cpp
     rendering/RenderFrameBase.cpp
     rendering/RenderFrameSet.cpp
index fc12411..f7f5a59 100644 (file)
@@ -1,3 +1,29 @@
+2011-07-22  Tony Chang  <tony@chromium.org>
+
+        add placeholder RenderFlexibleBox.cpp files
+        https://bugs.webkit.org/show_bug.cgi?id=64982
+
+        Reviewed by Ojan Vafai.
+
+        No new tests, just adding new files and making sure it compiles.
+        Also adding the isFlexibleBox identifier to RenderObject.
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * rendering/RenderFlexibleBox.cpp: Added.
+        (WebCore::RenderFlexibleBox::RenderFlexibleBox): Inherit from RenderBlock like the old flexbox.
+        (WebCore::RenderFlexibleBox::~RenderFlexibleBox):
+        (WebCore::RenderFlexibleBox::renderName):
+        (WebCore::RenderFlexibleBox::layoutBlock):
+        * rendering/RenderFlexibleBox.h: Added.
+        (WebCore::RenderFlexibleBox::isFlexibleBox):
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::isFlexibleBox):
+
 2011-07-22  James Robinson  <jamesr@chromium.org>
 
         [chromium] Force slow scrolling path for non-composited frames in a composited page
index 614860d..e82c292 100644 (file)
@@ -2947,6 +2947,8 @@ webcore_sources += \
        Source/WebCore/rendering/RenderFieldset.h \
        Source/WebCore/rendering/RenderFileUploadControl.cpp \
        Source/WebCore/rendering/RenderFileUploadControl.h \
+       Source/WebCore/rendering/RenderFlexibleBox.cpp \
+       Source/WebCore/rendering/RenderFlexibleBox.h \
        Source/WebCore/rendering/RenderFrameBase.cpp \
        Source/WebCore/rendering/RenderFrameBase.h \
        Source/WebCore/rendering/RenderFrame.cpp \
index fd22cce..18c0aba 100644 (file)
             'rendering/RenderFieldset.h',
             'rendering/RenderFileUploadControl.cpp',
             'rendering/RenderFileUploadControl.h',
+            'rendering/RenderFlexibleBox.cpp',
+            'rendering/RenderFlexibleBox.h',
             'rendering/RenderFrame.cpp',
             'rendering/RenderFrame.h',
             'rendering/RenderFrameBase.cpp',
index c820d8b..7d9fd17 100644 (file)
@@ -1117,6 +1117,7 @@ SOURCES += \
     rendering/RenderEmbeddedObject.cpp \
     rendering/RenderFieldset.cpp \
     rendering/RenderFileUploadControl.cpp \
+    rendering/RenderFlexibleBox.cpp \
     rendering/RenderFrame.cpp \
     rendering/RenderFrameBase.cpp \
     rendering/RenderFrameSet.cpp \
@@ -2162,6 +2163,7 @@ HEADERS += \
     rendering/RenderEmbeddedObject.h \
     rendering/RenderFieldset.h \
     rendering/RenderFileUploadControl.h \
+    rendering/RenderFlexibleBox.h \
     rendering/RenderFrame.h \
     rendering/RenderFrameBase.h \
     rendering/RenderFrameSet.h \
index 8ce337c..8232be4 100755 (executable)
                                >
                        </File>
                        <File
+                               RelativePath="..\rendering\RenderFlexibleBox.cpp"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Debug_Cairo_CFLite|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release_Cairo_CFLite|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Debug_All|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Production|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File
+                               RelativePath="..\rendering\RenderFlexibleBox.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\rendering\svg\RenderForeignObject.cpp"
                                >
                                <FileConfiguration
index 29c85cc..643548a 100644 (file)
                5317612313C516690026E454 /* StyleFlexibleBoxData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5317612113C516690026E454 /* StyleFlexibleBoxData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5325E4D713A6C88B00404A36 /* CSSFlexValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5325E4D513A6C88B00404A36 /* CSSFlexValue.cpp */; };
                5325E4D813A6C88B00404A36 /* CSSFlexValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 5325E4D613A6C88B00404A36 /* CSSFlexValue.h */; };
+               53C8298D13D8D92700DE2DEB /* RenderFlexibleBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53C8298B13D8D92700DE2DEB /* RenderFlexibleBox.cpp */; };
+               53C8298E13D8D92700DE2DEB /* RenderFlexibleBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 53C8298C13D8D92700DE2DEB /* RenderFlexibleBox.h */; };
                550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 550A0BC7085F6039007353D6 /* QualifiedName.cpp */; };
                550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 /* QualifiedName.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5905ADBF1302F3CE00F116DF /* XMLTreeViewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5905ADBD1302F3CE00F116DF /* XMLTreeViewer.cpp */; };
                5317612113C516690026E454 /* StyleFlexibleBoxData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleFlexibleBoxData.h; path = style/StyleFlexibleBoxData.h; sourceTree = "<group>"; };
                5325E4D513A6C88B00404A36 /* CSSFlexValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFlexValue.cpp; sourceTree = "<group>"; };
                5325E4D613A6C88B00404A36 /* CSSFlexValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFlexValue.h; sourceTree = "<group>"; };
+               53C8298B13D8D92700DE2DEB /* RenderFlexibleBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderFlexibleBox.cpp; sourceTree = "<group>"; };
+               53C8298C13D8D92700DE2DEB /* RenderFlexibleBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderFlexibleBox.h; sourceTree = "<group>"; };
                550A0BC7085F6039007353D6 /* QualifiedName.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QualifiedName.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                5905ADBD1302F3CE00F116DF /* XMLTreeViewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLTreeViewer.cpp; sourceTree = "<group>"; };
                                A8EA73B00A1900E300A8EF5F /* RenderFieldset.h */,
                                066C772E0AB603FD00238CC4 /* RenderFileUploadControl.cpp */,
                                066C772F0AB603FD00238CC4 /* RenderFileUploadControl.h */,
+                               53C8298B13D8D92700DE2DEB /* RenderFlexibleBox.cpp */,
+                               53C8298C13D8D92700DE2DEB /* RenderFlexibleBox.h */,
                                A871DECC0A1530C700B12A68 /* RenderFrame.cpp */,
                                A871DECB0A1530C700B12A68 /* RenderFrame.h */,
                                0FD3080C117CF7E700A791F7 /* RenderFrameBase.cpp */,
                                0F5B7A5510F65D7A00376302 /* RenderEmbeddedObject.h in Headers */,
                                A8EA73C40A1900E300A8EF5F /* RenderFieldset.h in Headers */,
                                066C77310AB603FD00238CC4 /* RenderFileUploadControl.h in Headers */,
+                               53C8298E13D8D92700DE2DEB /* RenderFlexibleBox.h in Headers */,
                                A871DED30A1530C700B12A68 /* RenderFrame.h in Headers */,
                                0FD3080F117CF7E700A791F7 /* RenderFrameBase.h in Headers */,
                                A871DED10A1530C700B12A68 /* RenderFrameSet.h in Headers */,
                                0F5B7A5410F65D7A00376302 /* RenderEmbeddedObject.cpp in Sources */,
                                A8EA73C30A1900E300A8EF5F /* RenderFieldset.cpp in Sources */,
                                066C77300AB603FD00238CC4 /* RenderFileUploadControl.cpp in Sources */,
+                               53C8298D13D8D92700DE2DEB /* RenderFlexibleBox.cpp in Sources */,
                                A871DED40A1530C700B12A68 /* RenderFrame.cpp in Sources */,
                                0FD3080E117CF7E700A791F7 /* RenderFrameBase.cpp in Sources */,
                                A871DED20A1530C700B12A68 /* RenderFrameSet.cpp in Sources */,
diff --git a/Source/WebCore/rendering/RenderFlexibleBox.cpp b/Source/WebCore/rendering/RenderFlexibleBox.cpp
new file mode 100644 (file)
index 0000000..9be6351
--- /dev/null
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "RenderFlexibleBox.h"
+
+#include "NotImplemented.h"
+
+#if ENABLE(CSS3_FLEXBOX)
+
+namespace WebCore {
+
+RenderFlexibleBox::RenderFlexibleBox(Node* node)
+    : RenderBlock(node)
+{
+}
+
+RenderFlexibleBox::~RenderFlexibleBox()
+{
+}
+
+const char* RenderFlexibleBox::renderName() const
+{
+    return "RenderFlexibleBox";
+}
+
+void RenderFlexibleBox::layoutBlock(bool relayoutChildren, int pageLogicalHeight)
+{
+    notImplemented();
+}
+
+}
+
+#endif // ENABLE(CSS3_FLEXBOX)
diff --git a/Source/WebCore/rendering/RenderFlexibleBox.h b/Source/WebCore/rendering/RenderFlexibleBox.h
new file mode 100644 (file)
index 0000000..43c62d4
--- /dev/null
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef RenderFlexibleBox_h
+#define RenderFlexibleBox_h
+
+#include "RenderBlock.h"
+
+#if ENABLE(CSS3_FLEXBOX)
+
+namespace WebCore {
+
+class RenderFlexibleBox : public RenderBlock {
+public:
+    RenderFlexibleBox(Node*);
+    virtual ~RenderFlexibleBox();
+
+    virtual const char* renderName() const;
+
+    virtual bool isFlexibleBox() const { return true; }
+
+    virtual void layoutBlock(bool relayoutChildren, int pageLogicalHeight);
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(CSS3_FLEXBOX)
+
+#endif // RenderFlexibleBox_h
index 2c82648..32b4d42 100644 (file)
@@ -740,11 +740,16 @@ public:
 
     virtual void destroy();
 
-    // Virtual function helpers for the deprecated Flexible Box Layout (display: -webkit-box)
+    // Virtual function helpers for the deprecated Flexible Box Layout (display: -webkit-box).
     virtual bool isDeprecatedFlexibleBox() const { return false; }
     virtual bool isFlexingChildren() const { return false; }
     virtual bool isStretchingChildren() const { return false; }
 
+#if ENABLE(CSS3_FLEXBOX)
+    // Virtual function helper for the new FlexibleBox Layout (display: -webkit-flexbox).
+    virtual bool isFlexibleBox() const { return false; }
+#endif
+
     virtual bool isCombineText() const { return false; }
 
     virtual int caretMinOffset() const;