Changeset 275087 in webkit

Timestamp:

Mar 26, 2021, 3:16:48 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Remove ASSERT in RenderListItem::computeMarkerStyle
​https://bugs.webkit.org/show_bug.cgi?id=222670

Patch by Rob Buis <​rbuis@igalia.com> on 2021-03-26
Reviewed by Ryosuke Niwa.

Source/WebCore:

Remove ASSERT in RenderListItem::computeMarkerStyle
since ::marker does not apply to all elements so
getCachedPseudoStyle can return null.

Test: fast/lists/list-item-compute-marker-style-crash.xhtml

• rendering/RenderListItem.cpp:

(WebCore::RenderListItem::computeMarkerStyle const):

LayoutTests:

• fast/lists/list-item-compute-marker-style-crash-expected.txt: Added.
• fast/lists/list-item-compute-marker-style-crash.xhtml: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/lists/list-item-compute-marker-style-crash-expected.txt (added)
• LayoutTests/fast/lists/list-item-compute-marker-style-crash.xhtml (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderListItem.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-03-26  Rob Buis  <rbuis@igalia.com>
+
+        Remove ASSERT in RenderListItem::computeMarkerStyle
+        https://bugs.webkit.org/show_bug.cgi?id=222670
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/lists/list-item-compute-marker-style-crash-expected.txt: Added.
+        * fast/lists/list-item-compute-marker-style-crash.xhtml: Added.
+
 2021-03-25  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-26  Rob Buis  <rbuis@igalia.com>
+
+        Remove ASSERT in RenderListItem::computeMarkerStyle
+        https://bugs.webkit.org/show_bug.cgi?id=222670
+
+        Reviewed by Ryosuke Niwa.
+
+        Remove ASSERT in RenderListItem::computeMarkerStyle
+        since ::marker does not apply to all elements so
+        getCachedPseudoStyle can return null.
+
+        Test: fast/lists/list-item-compute-marker-style-crash.xhtml
+
+        * rendering/RenderListItem.cpp:
+        (WebCore::RenderListItem::computeMarkerStyle const):
+
 2021-03-26  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/rendering/RenderListItem.cpp

@@ -62 +62 @@
 {
     if (!is<PseudoElement>(element())) {
-        auto markerStyle = getCachedPseudoStyle(PseudoId::Marker, &style());
-        ASSERT(markerStyle);
-        return RenderStyle::clone(*markerStyle);
+        if (auto markerStyle = getCachedPseudoStyle(PseudoId::Marker, &style()))
+            return RenderStyle::clone(*markerStyle);
     }