Title: [280894] releases/WebKitGTK/webkit-2.32/Source/WebCore
- Revision
- 280894
- Author
- [email protected]
- Date
- 2021-08-11 03:15:10 -0700 (Wed, 11 Aug 2021)
Log 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (280893 => 280894)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-08-11 10:14:26 UTC (rev 280893)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-08-11 10:15:10 UTC (rev 280894)
@@ -1,3 +1,17 @@
+2021-03-15 Zalan Bujtas <[email protected]>
+
+ 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 <[email protected]>
RenderLineBreak should stay inline level box even when display property says otherwise.
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.cpp (280893 => 280894)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.cpp 2021-08-11 10:14:26 UTC (rev 280893)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.cpp 2021-08-11 10:15:10 UTC (rev 280894)
@@ -288,7 +288,7 @@
// with inline content, then we can fold the inline content back together.
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);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
