Changeset 280894 in webkit

Timestamp:

Aug 11, 2021, 3:15:10 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r274437 - Do not collapse the anonymous block when it is a candidate container for the list marker
​https://bugs.webkit.org/show_bug.cgi?id=223196
<rdar://74574330>

Reviewed by Antti Koivisto.

Do not merge empty anonymous siblings when the callers says "do not collpase anonymous block". Those merge candidate
anonymous blocks may be candidate containers for some other conent (we expand on r238119 here).

• rendering/updating/RenderTreeBuilderBlock.cpp:

(WebCore::RenderTreeBuilder::Block::detach):

Location:

releases/WebKitGTK/webkit-2.32/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/updating/RenderTreeBuilderBlock.cpp (modified) (1 diff)

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

@@ +1 @@
+2021-03-15  Zalan Bujtas  <zalan@apple.com>
+
+        Do not collapse the anonymous block when it is a candidate container for the list marker
+        https://bugs.webkit.org/show_bug.cgi?id=223196
+        <rdar://74574330>
+
+        Reviewed by Antti Koivisto.
+
+        Do not merge empty anonymous siblings when the callers says "do not collpase anonymous block". Those merge candidate
+        anonymous blocks may be candidate containers for some other conent (we expand on r238119 here).
+
+        * rendering/updating/RenderTreeBuilderBlock.cpp:
+        (WebCore::RenderTreeBuilder::Block::detach):
+
 2021-03-14  Zalan Bujtas  <zalan@apple.com>
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.cpp

@@ -289 +289 @@
     auto prev = makeWeakPtr(oldChild.previousSibling());
     auto next = makeWeakPtr(oldChild.nextSibling());
-    bool canMergeAnonymousBlocks = canMergeContiguousAnonymousBlocks(oldChild, prev.get(), next.get());
+    bool canMergeAnonymousBlocks = canCollapseAnonymousBlock == CanCollapseAnonymousBlock::Yes && canMergeContiguousAnonymousBlocks(oldChild, prev.get(), next.get());
 
     auto takenChild = m_builder.detachFromRenderElement(parent, oldChild);