Changeset 194645 in webkit

Timestamp:

Jan 6, 2016 10:34:02 AM (8 years ago)

Author:

Alan Bujtas

Message:

Float with media query positioned incorrectly after window resize.
​https://bugs.webkit.org/show_bug.cgi?id=152558

Reviewed by Simon Fraser and David Hyatt.

This patch ensures that when a renderer becomes floated, it is moved
to the right containing block.
When this floated renderer's previous sibling is an anonymous block, it needs
to be reparented so that the float is positioned as if there was no anonymous block at all.

Source/WebCore:

Test: fast/block/float/float-with-anonymous-previous-sibling.html

• rendering/RenderElement.cpp:

(WebCore::RenderElement::styleDidChange):

LayoutTests:

• fast/block/float/float-with-anonymous-previous-sibling-expected.html: Added.
• fast/block/float/float-with-anonymous-previous-sibling.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/float/float-with-anonymous-previous-sibling-expected.html (added)
• LayoutTests/fast/block/float/float-with-anonymous-previous-sibling.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-01-06  Zalan Bujtas  <zalan@apple.com>
+
+        Float with media query positioned incorrectly after window resize.
+        https://bugs.webkit.org/show_bug.cgi?id=152558
+
+        Reviewed by Simon Fraser and David Hyatt.
+
+        This patch ensures that when a renderer becomes floated, it is moved
+        to the right containing block.
+        When this floated renderer's previous sibling is an anonymous block, it needs
+        to be reparented so that the float is positioned as if there was no anonymous block at all.
+
+        * fast/block/float/float-with-anonymous-previous-sibling-expected.html: Added.
+        * fast/block/float/float-with-anonymous-previous-sibling.html: Added.
+
 2016-01-06  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-06  Zalan Bujtas  <zalan@apple.com>
+
+        Float with media query positioned incorrectly after window resize.
+        https://bugs.webkit.org/show_bug.cgi?id=152558
+
+        Reviewed by Simon Fraser and David Hyatt.
+
+        This patch ensures that when a renderer becomes floated, it is moved
+        to the right containing block.
+        When this floated renderer's previous sibling is an anonymous block, it needs
+        to be reparented so that the float is positioned as if there was no anonymous block at all.
+
+        Test: fast/block/float/float-with-anonymous-previous-sibling.html
+
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::styleDidChange):
+
 2016-01-06  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -997 +997 @@
         handleDynamicFloatPositionChange();
 
-    if (s_noLongerAffectsParentBlock)
+    if (s_noLongerAffectsParentBlock) {
         removeAnonymousWrappersForInlinesIfNecessary();
+        // Fresh floats need to be reparented if they actually belong to the previous anonymous block.
+        // It copies the logic of RenderBlock::addChildIgnoringContinuation
+        if (style().isFloating() && previousSibling() && previousSibling()->isAnonymousBlock())
+            downcast<RenderBoxModelObject>(*parent()).moveChildTo(&downcast<RenderBoxModelObject>(*previousSibling()), this);
+    }
 
     SVGRenderSupport::styleChanged(*this, oldStyle);