Changeset 274437 in webkit

Timestamp:

Mar 15, 2021, 1:45:45 PM (5 years ago)

Author:

Alan Bujtas

Message:

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:

trunk/Source/WebCore

Files:

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

trunk/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-15  Simon Fraser  <simon.fraser@apple.com>
 

trunk/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);