Changeset 214119 in webkit

Timestamp:

Mar 17, 2017 2:12:47 PM (7 years ago)

Author:

Alan Bujtas

Message:

Fix the flow thread state on the descendants of out of flow positioned replaced elements.
​https://bugs.webkit.org/show_bug.cgi?id=169821
<rdar://problem/30964017>

Reviewed by Simon Fraser.

Source/WebCore:

Descendants of a replaced out of flow elmement should inherit the flowthread state
from the replaced element and not from the replaced element's parent.

Test: fast/multicol/fix-inherit-when-container-is-replaced.html

• rendering/RenderObject.cpp:

(WebCore::RenderObject::computedFlowThreadState):

LayoutTests:

• fast/multicol/fix-inherit-when-container-is-replaced-expected.txt: Added.
• fast/multicol/fix-inherit-when-container-is-replaced.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/fix-inherit-when-container-is-replaced-expected.txt (added)
• LayoutTests/fast/multicol/fix-inherit-when-container-is-replaced.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-03-17  Zalan Bujtas  <zalan@apple.com>
+
+        Fix the flow thread state on the descendants of out of flow positioned replaced elements.
+        https://bugs.webkit.org/show_bug.cgi?id=169821
+        <rdar://problem/30964017>
+
+        Reviewed by Simon Fraser.
+
+        * fast/multicol/fix-inherit-when-container-is-replaced-expected.txt: Added.
+        * fast/multicol/fix-inherit-when-container-is-replaced.html: Added.
+
 2017-03-17  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-17  Zalan Bujtas  <zalan@apple.com>
+
+        Fix the flow thread state on the descendants of out of flow positioned replaced elements.
+        https://bugs.webkit.org/show_bug.cgi?id=169821
+        <rdar://problem/30964017>
+
+        Reviewed by Simon Fraser.
+
+        Descendants of a replaced out of flow elmement should inherit the flowthread state
+        from the replaced element and not from the replaced element's parent.
+
+        Test: fast/multicol/fix-inherit-when-container-is-replaced.html
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::computedFlowThreadState):
+
 2017-03-17  Jon Davis  <jond@apple.com>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -198 +198 @@
         if (auto* svgRoot = SVGRenderSupport::findTreeRootObject(downcast<RenderElement>(renderer)))
             inheritedFlowState = svgRoot->flowThreadState();
-    } else if (auto* containingBlock = renderer.containingBlock())
-        inheritedFlowState = containingBlock->flowThreadState();
+    } else if (auto* container = renderer.container())
+        inheritedFlowState = container->flowThreadState();
     else {
         // Splitting lines or doing continuation, so just keep the current state.