Changeset 280834 in webkit

Timestamp:

Aug 10, 2021, 2:27:27 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r274144 - [Multi-column] Adjust fragmented flow state of the out-of-flow descendants
​https://bugs.webkit.org/show_bug.cgi?id=222958
<rdar://74865741>

Reviewed by Antti Koivisto.

When a block container's style change from positioned to non-positioned and it is part of a multi-column context,
we need to make sure that the out-of-flow positined descendants' flow state are updated accordingly (as
they may not be part of the multi-column context anymore).

• rendering/RenderElement.cpp:

(WebCore::RenderElement::adjustFragmentedFlowStateOnContainingBlockChangeIfNeeded):

Location:

releases/WebKitGTK/webkit-2.32/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (1 diff)

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

@@ +1 @@
+2021-03-09  Zalan Bujtas  <zalan@apple.com>
+
+        [Multi-column] Adjust fragmented flow state of the out-of-flow descendants
+        https://bugs.webkit.org/show_bug.cgi?id=222958
+        <rdar://74865741>
+
+        Reviewed by Antti Koivisto.
+
+        When a block container's style change from positioned to non-positioned and it is part of a multi-column context,
+        we need to make sure that the out-of-flow positined descendants' flow state are updated accordingly (as
+        they may not be part of the multi-column context anymore).
+
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::adjustFragmentedFlowStateOnContainingBlockChangeIfNeeded):
+
 2021-03-08  Julian Gonzalez  <julian_a_gonzalez@apple.com>
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/rendering/RenderElement.cpp

@@ -2178 +2178 @@
         downcast<RenderBlock>(*this).resetEnclosingFragmentedFlowAndChildInfoIncludingDescendants();
     else {
-        // Relatively positioned inline boxes can have absolutely positioned block children. We need to reset them as well.
-        for (auto& descendant : childrenOfType<RenderBlock>(*this))
+        // Relatively positioned inline boxes can have absolutely positioned block descendants. We need to reset them as well.
+        for (auto& descendant : descendantsOfType<RenderBlock>(*this))
             descendant.resetEnclosingFragmentedFlowAndChildInfoIncludingDescendants();
     }