Changeset 278933 in webkit

Timestamp:

Jun 16, 2021, 7:37:30 AM (4 years ago)

Author:

ntim@apple.com

Message:

Make CSS.supports() return false for internal CSS properties
​https://bugs.webkit.org/show_bug.cgi?id=224930

Reviewed by Antti Koivisto.

Test: LayoutTests/fast/backgrounds/background-repeat-x-y-parse.html

Examples that are now rejected:

CSS.supports("background-repeat-x: inherit")
CSS.supports("background-repeat-x", "inherit")
CSS.supports("background-repeat-y: inherit")
CSS.supports("background-repeat-y", "inherit")

Source/WebCore:

• css/DOMCSSNamespace.cpp:

(WebCore::DOMCSSNamespace::supports):

• css/parser/CSSParserImpl.cpp:

(WebCore::CSSParserImpl::consumeDeclaration):

LayoutTests:

• fast/backgrounds/background-repeat-x-y-parse-expected.txt:
• fast/backgrounds/background-repeat-x-y-parse.html:
• fast/css/webkit-mask-crash-implicit-expected.txt:
• fast/css/webkit-mask-crash-implicit.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/backgrounds/background-repeat-x-y-parse-expected.txt (modified) (2 diffs)
• LayoutTests/fast/backgrounds/background-repeat-x-y-parse.html (modified) (2 diffs)
• LayoutTests/fast/css/webkit-mask-crash-implicit-expected.txt (modified) (1 diff)
• LayoutTests/fast/css/webkit-mask-crash-implicit.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/DOMCSSNamespace.cpp (modified) (1 diff)
• Source/WebCore/css/parser/CSSParserImpl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-06-16  Tim Nguyen  <ntim@apple.com>
+
+        Make CSS.supports() return false for internal CSS properties
+        https://bugs.webkit.org/show_bug.cgi?id=224930
+
+        Reviewed by Antti Koivisto.
+
+        Test: LayoutTests/fast/backgrounds/background-repeat-x-y-parse.html
+
+        Examples that are now rejected:
+
+        CSS.supports("background-repeat-x: inherit")
+        CSS.supports("background-repeat-x", "inherit")
+        CSS.supports("background-repeat-y: inherit")
+        CSS.supports("background-repeat-y", "inherit")
+
+        * fast/backgrounds/background-repeat-x-y-parse-expected.txt:
+        * fast/backgrounds/background-repeat-x-y-parse.html:
+        * fast/css/webkit-mask-crash-implicit-expected.txt:
+        * fast/css/webkit-mask-crash-implicit.html:
+
 2021-06-16  Toshio Ogasawara  <toshio.ogasawara@access-company.com>
 

trunk/LayoutTests/fast/backgrounds/background-repeat-x-y-parse-expected.txt

@@ -1 @@
-This test checks that background-repeat-x/y are not parsed
+This test checks that background-repeat-x/y are not parsed or supported
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -8 +8 @@
 PASS window.getComputedStyle(document.getElementById('test3')).getPropertyValue('background-repeat') is "repeat-y"
 PASS window.getComputedStyle(document.getElementById('test4')).getPropertyValue('background-repeat') is "repeat-x"
+PASS CSS.supports('background-repeat-x: inherit') is false
+PASS CSS.supports('background-repeat-x', 'inherit') is false
+PASS CSS.supports('background-repeat-y: inherit') is false
+PASS CSS.supports('background-repeat-y', 'inherit') is false
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/backgrounds/background-repeat-x-y-parse.html

@@ -20 +20 @@
 <div id="test4" class="test" style="background-repeat: repeat-x; background-repeat-x: no-repeat;"></div>
 <script>
-description("This test checks that background-repeat-x/y are not parsed");
+description("This test checks that background-repeat-x/y are not parsed or supported");
 
 shouldBeEqualToString("window.getComputedStyle(document.getElementById('test1')).getPropertyValue('background-repeat')", "repeat");
@@ -26 +26 @@
 shouldBeEqualToString("window.getComputedStyle(document.getElementById('test3')).getPropertyValue('background-repeat')", "repeat-y");
 shouldBeEqualToString("window.getComputedStyle(document.getElementById('test4')).getPropertyValue('background-repeat')", "repeat-x");
+
+shouldBeFalse("CSS.supports('background-repeat-x: inherit')");
+shouldBeFalse("CSS.supports('background-repeat-x', 'inherit')");
+shouldBeFalse("CSS.supports('background-repeat-y: inherit')");
+shouldBeFalse("CSS.supports('background-repeat-y', 'inherit')");
 </script>
 <script src="../../resources/js-test-post.js"></script>

trunk/LayoutTests/fast/css/webkit-mask-crash-implicit-expected.txt

@@ -1 @@
-PASS document.styleSheets[1].rules[0].style.cssText is "-webkit-mask-repeat-x: repeat; -webkit-mask-repeat-y: inherit;"
+PASS document.styleSheets[1].rules[0].style.cssText is "-webkit-mask-repeat-x: repeat; -webkit-mask-repeat-y: no-repeat;"
 PASS document.styleSheets[1].rules[0].style.getPropertyValue('-webkit-mask') is ""
-PASS document.styleSheets[1].rules[0].style.getPropertyValue('-webkit-mask-repeat') is "inherit"
+PASS document.styleSheets[1].rules[0].style.getPropertyValue('-webkit-mask-repeat') is "repeat-x"
 

trunk/LayoutTests/fast/css/webkit-mask-crash-implicit.html

@@ -10 +10 @@
 if (window.internals)
     testRunner.dumpAsText();
-shouldBeEqualToString("document.styleSheets[1].rules[0].style.cssText", "-webkit-mask-repeat-x: repeat; -webkit-mask-repeat-y: inherit;");
+shouldBeEqualToString("document.styleSheets[1].rules[0].style.cssText", "-webkit-mask-repeat-x: repeat; -webkit-mask-repeat-y: no-repeat;");
 shouldBeEqualToString("document.styleSheets[1].rules[0].style.getPropertyValue('-webkit-mask')", "");
-shouldBeEqualToString("document.styleSheets[1].rules[0].style.getPropertyValue('-webkit-mask-repeat')", "inherit");
+shouldBeEqualToString("document.styleSheets[1].rules[0].style.getPropertyValue('-webkit-mask-repeat')", "repeat-x");
 </script>
 </head>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-16  Tim Nguyen  <ntim@apple.com>
+
+        Make CSS.supports() return false for internal CSS properties
+        https://bugs.webkit.org/show_bug.cgi?id=224930
+
+        Reviewed by Antti Koivisto.
+
+        Test: LayoutTests/fast/backgrounds/background-repeat-x-y-parse.html
+
+        Examples that are now rejected:
+
+        CSS.supports("background-repeat-x: inherit")
+        CSS.supports("background-repeat-x", "inherit")
+        CSS.supports("background-repeat-y: inherit")
+        CSS.supports("background-repeat-y", "inherit")
+
+        * css/DOMCSSNamespace.cpp:
+        (WebCore::DOMCSSNamespace::supports):
+        * css/parser/CSSParserImpl.cpp:
+        (WebCore::CSSParserImpl::consumeDeclaration):
+
 2021-06-16  Toshio Ogasawara  <toshio.ogasawara@access-company.com>
 

trunk/Source/WebCore/css/DOMCSSNamespace.cpp

@@ -64 +64 @@
         return false;
 
+    if (isInternalCSSProperty(propertyID))
+        return false;
+
     if (propertyID == CSSPropertyInvalid)
         return false;

trunk/Source/WebCore/css/parser/CSSParserImpl.cpp

@@ -811 +811 @@
         return; // Parse error
 
-    if (m_context.isPropertyRuntimeDisabled(propertyID))
+    if (m_context.isPropertyRuntimeDisabled(propertyID) || isInternalCSSProperty(propertyID))
         propertyID = CSSPropertyInvalid;