Changeset 117759 in webkit

Timestamp:

May 21, 2012, 3:48:40 AM (14 years ago)

Author:

kov@webkit.org

Message:

Merge 113497 - Virtualize createAnonymousBoxWithSameTypeAs. ​https://bugs.webkit.org/show_bug.cgi?id=83229

Reviewed by Julien Chaffraix.

This helps to use the same function to create anonymous
table parts and in the future extend to more classes
derived from RenderBox.

The current switch case situation was going to be messy as
we will need to mix cases that were very dependent on the
class, so it made sense to add a virtual function.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::splitAnonymousBlocksAroundChild):
(WebCore::RenderBlock::createAnonymousBoxWithSameTypeAs):

• rendering/RenderBlock.h:

(RenderBlock):

• rendering/RenderBox.h:

(WebCore::RenderBox::createAnonymousBoxWithSameTypeAs):
(RenderBox):

• rendering/RenderInline.cpp:

(WebCore::RenderInline::splitFlow):

• rendering/RenderTable.h:

(WebCore::RenderTable::createAnonymousBoxWithSameTypeAs):

• rendering/RenderTableCell.h:

(WebCore::RenderTableCell::createAnonymousBoxWithSameTypeAs):

• rendering/RenderTableRow.h:

(WebCore::RenderTableRow::createAnonymousBoxWithSameTypeAs):

• rendering/RenderTableSection.h:

(WebCore::RenderTableSection::createAnonymousBoxWithSameTypeAs):

Conflicts:

Source/WebCore/rendering/RenderBox.h

Location:

releases/WebKitGTK/webkit-1.8/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (2 diffs)
• rendering/RenderBlock.h (modified) (1 diff)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (1 diff)
• rendering/RenderTable.h (modified) (1 diff)
• rendering/RenderTableCell.h (modified) (1 diff)
• rendering/RenderTableRow.h (modified) (1 diff)
• rendering/RenderTableSection.h (modified) (1 diff)

releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-06  Abhishek Arya  <inferno@chromium.org>
+
+        Virtualize createAnonymousBoxWithSameTypeAs.
+        https://bugs.webkit.org/show_bug.cgi?id=83229
+
+        Reviewed by Julien Chaffraix.
+
+        This helps to use the same function to create anonymous
+        table parts and in the future extend to more classes
+        derived from RenderBox.
+
+        The current switch case situation was going to be messy as
+        we will need to mix cases that were very dependent on the
+        class, so it made sense to add a virtual function.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::splitAnonymousBlocksAroundChild):
+        (WebCore::RenderBlock::createAnonymousBoxWithSameTypeAs):
+        * rendering/RenderBlock.h:
+        (RenderBlock):
+        * rendering/RenderBox.h:
+        (WebCore::RenderBox::createAnonymousBoxWithSameTypeAs):
+        (RenderBox):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::splitFlow):
+        * rendering/RenderTable.h:
+        (WebCore::RenderTable::createAnonymousBoxWithSameTypeAs):
+        * rendering/RenderTableCell.h:
+        (WebCore::RenderTableCell::createAnonymousBoxWithSameTypeAs):
+        * rendering/RenderTableRow.h:
+        (WebCore::RenderTableRow::createAnonymousBoxWithSameTypeAs):
+        * rendering/RenderTableSection.h:
+        (WebCore::RenderTableSection::createAnonymousBoxWithSameTypeAs):
+
 2012-04-04  Abhishek Arya  <inferno@chromium.org>
 

releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderBlock.cpp

@@ -607 +607 @@
         if (blockToSplit->firstChild() != beforeChild) {
             // We have to split the parentBlock into two blocks.
-            RenderBlock* post = createAnonymousBlockWithSameTypeAs(blockToSplit);
+            RenderBlock* post = toRenderBlock(blockToSplit->createAnonymousBoxWithSameTypeAs(this));
             post->setChildrenInline(blockToSplit->childrenInline());
             RenderBlock* parentBlock = toRenderBlock(blockToSplit->parent());
@@ -6467 +6467 @@
 }
 
-RenderBlock* RenderBlock::createAnonymousBlockWithSameTypeAs(RenderBlock* otherAnonymousBlock) const
-{
-    if (otherAnonymousBlock->isAnonymousColumnsBlock())
-        return createAnonymousColumnsBlock();
-    if (otherAnonymousBlock->isAnonymousColumnSpanBlock())
-        return createAnonymousColumnSpanBlock();
-    return createAnonymousBlock(otherAnonymousBlock->style()->display());
+RenderBox* RenderBlock::createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const
+{
+    if (isAnonymousColumnsBlock())
+        return createAnonymousColumnsWithParentRenderer(parent);
+    if (isAnonymousColumnSpanBlock())
+        return createAnonymousColumnSpanWithParentRenderer(parent);
+    return createAnonymousWithParentRendererAndDisplay(parent, style()->display());
 }
 

releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderBlock.h

@@ -228 +228 @@
     RenderBlock* createAnonymousColumnSpanBlock() const { return createAnonymousColumnSpanWithParentRenderer(this); }
 
-    RenderBlock* createAnonymousBlockWithSameTypeAs(RenderBlock* otherAnonymousBlock) const;
+    virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const OVERRIDE;
     
     static void appendRunsForObject(BidiRunList<BidiRun>&, int start, int end, RenderObject*, InlineBidiResolver&);

releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderBox.h

@@ -446 +446 @@
     virtual void computeIntrinsicRatioInformation(FloatSize& /* intrinsicSize */, double& /* intrinsicRatio */, bool& /* isPercentageIntrinsicSize */) const { }
 
+    virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject*) const
+    {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }
+
 protected:
     virtual void willBeDestroyed();

releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderInline.cpp

@@ -427 +427 @@
     }
 
-    RenderBlock* post = block->createAnonymousBlockWithSameTypeAs(pre);
+    RenderBlock* post = toRenderBlock(pre->createAnonymousBoxWithSameTypeAs(block));
 
     RenderObject* boxFirst = madeNewBeforeBlock ? block->firstChild() : pre->nextSibling();

releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderTable.h

@@ -213 +213 @@
 
     static RenderTable* createAnonymousWithParentRenderer(const RenderObject*);
+    virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const OVERRIDE
+    {
+        return createAnonymousWithParentRenderer(parent);
+    }
 
 protected:

releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderTableCell.h

@@ -138 +138 @@
 
     static RenderTableCell* createAnonymousWithParentRenderer(const RenderObject*);
+    virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const OVERRIDE
+    {
+        return createAnonymousWithParentRenderer(parent);
+    }
 
 protected:

releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderTableRow.h

@@ -44 +44 @@
 
     static RenderTableRow* createAnonymousWithParentRenderer(const RenderObject*);
+    virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const OVERRIDE
+    {
+        return createAnonymousWithParentRenderer(parent);
+    }
 
 private:

releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderTableSection.h

@@ -143 +143 @@
 
     static RenderTableSection* createAnonymousWithParentRenderer(const RenderObject*);
+    virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const OVERRIDE
+    {
+        return createAnonymousWithParentRenderer(parent);
+    }
 
 protected: