Changeset 280599 in webkit

Timestamp:

Aug 3, 2021, 9:54:57 AM (5 years ago)

Author:

Antti Koivisto

Message:

REGRESSION(r279050): Crash under CSSImageValue::createDeprecatedCSSOMWrapper with cursor images
​https://bugs.webkit.org/show_bug.cgi?id=228735

Reviewed by Alex Christensen.

Source/WebCore:

CSSCursorImageValue is not a CSSImageValue. This used to work before r279050 because they had
the URL field in the same offset.

Test: fast/css/cursor-image-cssvalue.html

• css/CSSValue.cpp:

(WebCore::CSSValue::createDeprecatedCSSOMWrapper const):

Don't do any special handling for CSSCursorImageValue. They are exposed as generic (deprecated)
CSS values with cssText only.

LayoutTests:

• fast/css/cursor-image-cssvalue-expected.txt: Added.
• fast/css/cursor-image-cssvalue.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/cursor-image-cssvalue-expected.txt (added)
• LayoutTests/fast/css/cursor-image-cssvalue.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSValue.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-08-03  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r279050): Crash under CSSImageValue::createDeprecatedCSSOMWrapper with cursor images
+        https://bugs.webkit.org/show_bug.cgi?id=228735
+
+        Reviewed by Alex Christensen.
+
+        * fast/css/cursor-image-cssvalue-expected.txt: Added.
+        * fast/css/cursor-image-cssvalue.html: Added.
+
 2021-08-03  Cathie Chen  <cathiechen@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-03  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r279050): Crash under CSSImageValue::createDeprecatedCSSOMWrapper with cursor images
+        https://bugs.webkit.org/show_bug.cgi?id=228735
+
+        Reviewed by Alex Christensen.
+
+        CSSCursorImageValue is not a CSSImageValue. This used to work before r279050 because they had
+        the URL field in the same offset.
+
+        Test: fast/css/cursor-image-cssvalue.html
+
+        * css/CSSValue.cpp:
+        (WebCore::CSSValue::createDeprecatedCSSOMWrapper const):
+
+        Don't do any special handling for CSSCursorImageValue. They are exposed as generic (deprecated)
+        CSS values with cssText only.
+
 2021-08-03  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/css/CSSValue.cpp

@@ -494 +494 @@
 Ref<DeprecatedCSSOMValue> CSSValue::createDeprecatedCSSOMWrapper(CSSStyleDeclaration& styleDeclaration) const
 {
-    if (isImageValue() || isCursorImageValue())
+    if (isImageValue())
         return downcast<CSSImageValue>(this)->createDeprecatedCSSOMWrapper(styleDeclaration);
     if (isPrimitiveValue())