Changeset 280892 in webkit

Timestamp:

Aug 11, 2021, 3:13:25 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r274387 - Mark the line dirty when list marker goes from inline to block
​https://bugs.webkit.org/show_bug.cgi?id=223132

Reviewed by Antti Koivisto.

This patch ensures that the line layout has a chance to clean up the inline boxes when the marker goes from inline to block.
Instead of deleting the inline box wrapper (InlineElement) here let's

1. mark both the renderer and the line dirty and let the inline layout code run its normal cleanup process on dirty lines.
2. detach the inline box wrapper from the now-block list marker.

• rendering/RenderListMarker.cpp:

(WebCore::RenderListMarker::styleDidChange):

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::verticalPositionForBox):

Location:

releases/WebKitGTK/webkit-2.32/Source/WebCore

Files:

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

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

@@ +1 @@
+2021-03-13  Zalan Bujtas  <zalan@apple.com>
+
+        Mark the line dirty when list marker goes from inline to block
+        https://bugs.webkit.org/show_bug.cgi?id=223132
+
+        Reviewed by Antti Koivisto.
+
+        This patch ensures that the line layout has a chance to clean up the inline boxes when the marker goes from inline to block.
+        Instead of deleting the inline box wrapper (InlineElement) here let's
+        1. mark both the renderer and the line dirty and let the inline layout code run its normal cleanup process on dirty lines.
+        2. detach the inline box wrapper from the now-block list marker.
+
+        * rendering/RenderListMarker.cpp:
+        (WebCore::RenderListMarker::styleDidChange):
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::verticalPositionForBox):
+
 2021-03-12  Rob Buis  <rbuis@igalia.com>
 

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

@@ -1094 +1094 @@
             setNeedsLayoutAndPrefWidthsRecalc();
         if (oldStyle->isDisplayInlineType() && !style().isDisplayInlineType()) {
-            delete m_inlineBoxWrapper;
+            setNeedsLayoutAndPrefWidthsRecalc();
+            if (m_inlineBoxWrapper)
+                m_inlineBoxWrapper->dirtyLineBoxes();
             m_inlineBoxWrapper = nullptr;
         }