Changeset 150527 in webkit

Timestamp:

May 22, 2013 11:59:38 AM (11 years ago)

Author:

robert@webkit.org

Message:

Need to Remove Anonymous Wrappers When All Children Become Inline
​https://bugs.webkit.org/show_bug.cgi?id=115687

Reviewed by David Hyatt.

Source/WebCore:

Remove a simple subset of anonymous wrappers, i.e. anonymous blocks without continuations,
when a block becoming float or positioned removes the need for them.

Test: fast/block/remove-anonymous-wrappers-when-element-changes-to-float-or-positioned.html

• rendering/RenderBlock.h:

(RenderBlock):

• rendering/RenderObject.cpp:

(WebCore):
(WebCore::RenderObject::removeAnonymousWrappersFromLineIfNecessary):
(WebCore::RenderObject::styleWillChange):
(WebCore::RenderObject::styleDidChange):

• rendering/RenderObject.h:

(RenderObject):

LayoutTests:

• fast/block/remove-anonymous-wrappers-when-element-changes-to-float-or-positioned-expected.txt: Added.
• fast/block/remove-anonymous-wrappers-when-element-changes-to-float-or-positioned.html: Added.
• platform/qt/fast/block/float/float-not-removed-from-next-sibling2-expected.txt:
• platform/qt/fast/dynamic/002-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/float/float-not-removed-from-next-sibling2-expected.txt (modified) (1 diff)
• LayoutTests/fast/block/remove-anonymous-wrappers-when-element-changes-to-float-or-positioned-expected.txt (added)
• LayoutTests/fast/block/remove-anonymous-wrappers-when-element-changes-to-float-or-positioned.html (added)
• LayoutTests/platform/mac/fast/dynamic/002-expected.txt (modified) (1 diff)
• LayoutTests/platform/qt/fast/block/float/float-not-removed-from-next-sibling2-expected.txt (modified) (1 diff)
• LayoutTests/platform/qt/fast/dynamic/002-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderObject.cpp (modified) (5 diffs)
• Source/WebCore/rendering/RenderObject.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-05-22  Robert Hogan  <robert@webkit.org>
+
+        Need to Remove Anonymous Wrappers When All Children Become Inline
+        https://bugs.webkit.org/show_bug.cgi?id=115687
+
+        Reviewed by David Hyatt.
+
+        * fast/block/remove-anonymous-wrappers-when-element-changes-to-float-or-positioned-expected.txt: Added.
+        * fast/block/remove-anonymous-wrappers-when-element-changes-to-float-or-positioned.html: Added.
+        * platform/qt/fast/block/float/float-not-removed-from-next-sibling2-expected.txt:
+        * platform/qt/fast/dynamic/002-expected.txt:
+
 2013-05-22  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
 

trunk/LayoutTests/fast/block/float/float-not-removed-from-next-sibling2-expected.txt

@@ -15 +15 @@
     RenderBlock (floating) {DIV} at (0,0) size 20x100
       RenderImage {IMG} at (0,0) size 20x100 [bgcolor=#C0C0C0]
-    RenderBlock (anonymous) at (0,0) size 20x0
-      RenderInline {A} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
+    RenderInline {A} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0
 layer at (8,8) size 20x96
   RenderBlock (positioned) {DIV} at (0,0) size 20x96

trunk/LayoutTests/platform/mac/fast/dynamic/002-expected.txt

@@ -8 +8 @@
           RenderText {#text} at (2,2) size 258x18
             text run at (2,2) width 258: "I should become a right-floating element."
-        RenderBlock (anonymous) at (0,0) size 784x18
-          RenderText {#text} at (0,0) size 393x18
-            text run at (0,0) width 195: "This text should be on the left. "
-            text run at (195,0) width 198: "The float should be to the right."
+        RenderText {#text} at (0,0) size 393x18
+          text run at (0,0) width 195: "This text should be on the left. "
+          text run at (195,0) width 198: "The float should be to the right."
       RenderBlock {DIV} at (0,18) size 784x30
       RenderBlock {DIV} at (0,48) size 784x36

trunk/LayoutTests/platform/qt/fast/block/float/float-not-removed-from-next-sibling2-expected.txt

@@ -15 +15 @@
     RenderBlock (floating) {DIV} at (0,0) size 20x100
       RenderImage {IMG} at (0,0) size 20x100 [bgcolor=#C0C0C0]
-    RenderBlock (anonymous) at (0,0) size 20x0
-      RenderInline {A} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
+    RenderInline {A} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0
 layer at (8,8) size 20x100
   RenderBlock (positioned) {DIV} at (0,0) size 20x100

trunk/LayoutTests/platform/qt/fast/dynamic/002-expected.txt

@@ -8 +8 @@
           RenderText {#text} at (2,2) size 244x19
             text run at (2,2) width 244: "I should become a right-floating element."
-        RenderBlock (anonymous) at (0,0) size 784x19
-          RenderText {#text} at (0,0) size 371x19
-            text run at (0,0) width 184: "This text should be on the left. "
-            text run at (184,0) width 187: "The float should be to the right."
+        RenderText {#text} at (0,0) size 371x19
+          text run at (0,0) width 184: "This text should be on the left. "
+          text run at (184,0) width 187: "The float should be to the right."
       RenderBlock {DIV} at (0,19) size 784x30
       RenderBlock {DIV} at (0,49) size 784x38

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-22  Robert Hogan  <robert@webkit.org>
+
+        Need to Remove Anonymous Wrappers When All Children Become Inline
+        https://bugs.webkit.org/show_bug.cgi?id=115687
+
+        Reviewed by David Hyatt.
+
+        Remove a simple subset of anonymous wrappers, i.e. anonymous blocks without continuations,
+        when a block becoming float or positioned removes the need for them.
+
+        Test: fast/block/remove-anonymous-wrappers-when-element-changes-to-float-or-positioned.html
+
+        * rendering/RenderBlock.h:
+        (RenderBlock):
+        * rendering/RenderObject.cpp:
+        (WebCore):
+        (WebCore::RenderObject::removeAnonymousWrappersFromLineIfNecessary):
+        (WebCore::RenderObject::styleWillChange):
+        (WebCore::RenderObject::styleDidChange):
+        * rendering/RenderObject.h:
+        (RenderObject):
+
 2013-05-22  Bruno de Oliveira Abinader  <bruno.abinader@basyskom.com>
 

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -280 +280 @@
     RenderBlock* createAnonymousColumnsBlock() const { return createAnonymousColumnsWithParentRenderer(this); }
     RenderBlock* createAnonymousColumnSpanBlock() const { return createAnonymousColumnSpanWithParentRenderer(this); }
+    static void collapseAnonymousBoxChild(RenderBlock* parent, RenderObject* child);
 
     virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const OVERRIDE;
@@ -603 +604 @@
     virtual void removeLeftoverAnonymousBlock(RenderBlock* child);
 
-    static void collapseAnonymousBoxChild(RenderBlock* parent, RenderObject* child);
     void moveAllChildrenIncludingFloatsTo(RenderBlock* toBlock, bool fullRemoveInsert);
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -123 +123 @@
 
 bool RenderObject::s_affectsParentBlock = false;
+bool RenderObject::s_noLongerAffectsParentBlock = false;
 
 RenderObjectAncestorLineboxDirtySet* RenderObject::s_ancestorLineboxDirtySet = 0;
@@ -1677 +1678 @@
 }
 
+void RenderObject::removeAnonymousWrappersForInlinesIfNecessary()
+{
+    // We have changed to floated or out-of-flow positioning so maybe all our parent's
+    // children can be inline now. Bail if there are any block children left on the line,
+    // otherwise we can proceed to stripping solitary anonymous wrappers from the inlines.
+    // FIXME: We should also handle split inlines here - we exclude them at the moment by returning
+    // if we find a continuation.
+    RenderObject* curr = parent()->firstChild();
+    while (curr && ((curr->isAnonymousBlock() && !toRenderBlock(curr)->isAnonymousBlockContinuation()) || curr->style()->isFloating() || curr->style()->hasOutOfFlowPosition()))
+        curr = curr->nextSibling();
+
+    if (curr)
+        return;
+
+    curr = parent()->firstChild();
+    RenderBlock* parentBlock = toRenderBlock(parent());
+    while (curr) {
+        RenderObject* next = curr->nextSibling();
+        if (curr->isAnonymousBlock())
+            parentBlock->collapseAnonymousBoxChild(parentBlock, toRenderBlock(curr));
+        curr = next;
+    }
+}
+
 void RenderObject::setAnimatableStyle(PassRefPtr<RenderStyle> style)
 {
@@ -1894 +1919 @@
             && parent() && (parent()->isBlockFlow() || parent()->isRenderInline());
 
+        s_noLongerAffectsParentBlock = ((!isFloating() && newStyle->isFloating()) || (!isOutOfFlowPositioned() && newStyle->hasOutOfFlowPosition()))
+            && parent() && parent()->isRenderBlock();
+
         // reset style flags
         if (diff == StyleDifferenceLayout || diff == StyleDifferenceLayoutPositionedMovementOnly) {
@@ -1904 +1932 @@
         setHasTransform(false);
         setHasReflection(false);
-    } else
+    } else {
         s_affectsParentBlock = false;
+        s_noLongerAffectsParentBlock = false;
+    }
 
     if (view()->frameView()) {
@@ -1960 +1990 @@
         handleDynamicFloatPositionChange();
 
+    if (s_noLongerAffectsParentBlock)
+        removeAnonymousWrappersForInlinesIfNecessary();
 #if ENABLE(SVG)
     SVGRenderSupport::styleChanged(this);

trunk/Source/WebCore/rendering/RenderObject.h

@@ -248 +248 @@
     // normal flow object.
     void handleDynamicFloatPositionChange();
+    void removeAnonymousWrappersForInlinesIfNecessary();
     
     // RenderObject tree manipulation
@@ -1170 +1171 @@
     // Store state between styleWillChange and styleDidChange
     static bool s_affectsParentBlock;
+    static bool s_noLongerAffectsParentBlock;
 };