Changeset 203437 in webkit

Timestamp:

Jul 19, 2016, 6:20:23 PM (10 years ago)

Author:

Chris Dumez

Message:

Align CSSStyleDeclaration.setProperty() with the specification
​https://bugs.webkit.org/show_bug.cgi?id=159955

Reviewed by Benjamin Poulain.

Source/WebCore:

Align CSSStyleDeclaration.setProperty() with the specification:

• ​https://drafts.csswg.org/cssom/#the-cssstyledeclaration-interface

In particular, the following changes were needed:

1. The 'value' parameter should not be optional
2. The 'priority' parameter should treat null as the empty string rather than the string "null".
3. The 'priority' parameter's default value should be the empty string, not the string "undefined".
4. CSSStyleDeclaration.setProperty() should return early if 'priority' is not the empty string and is not an ASCII case-insensitive match for the string "important".

Chrome matches the specification entirely.
Firefox matches the specification with the exception that it does a
case-sensitive match for "important".

Test: fast/css/CSSStyleDeclaration-setProperty.html

• css/CSSStyleDeclaration.idl:
• css/PropertySetCSSStyleDeclaration.cpp:

(WebCore::PropertySetCSSStyleDeclaration::setProperty):

LayoutTests:

Add layout test coverage.

• fast/css/CSSStyleDeclaration-setProperty-expected.txt: Added.
• fast/css/CSSStyleDeclaration-setProperty.html: Added.
• fast/css/shorthand-priority.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/CSSStyleDeclaration-setProperty-expected.txt (added)
• LayoutTests/fast/css/CSSStyleDeclaration-setProperty.html (added)
• LayoutTests/fast/css/shorthand-priority.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSStyleDeclaration.idl (modified) (1 diff)
• Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-07-19  Chris Dumez  <cdumez@apple.com>
+
+        Align CSSStyleDeclaration.setProperty() with the specification
+        https://bugs.webkit.org/show_bug.cgi?id=159955
+
+        Reviewed by Benjamin Poulain.
+
+        Add layout test coverage.
+
+        * fast/css/CSSStyleDeclaration-setProperty-expected.txt: Added.
+        * fast/css/CSSStyleDeclaration-setProperty.html: Added.
+        * fast/css/shorthand-priority.html:
+
 2016-07-19  Daniel Bates  <dabates@apple.com>
 

trunk/LayoutTests/fast/css/shorthand-priority.html

@@ -18 +18 @@
 
 // Sanity check.
-e.style.setProperty("border-bottom-style", "solid", "!important");
+e.style.setProperty("border-bottom-style", "solid", "important");
 shouldBe("e.style.getPropertyValue('border-bottom-style')", "'solid'");
 shouldBe("e.style.getPropertyPriority('border-bottom-style')", "'important'");
@@ -28 +28 @@
 
 e.style.border = "";
-e.style.setProperty("border", "20px solid green", "!important");
+e.style.setProperty("border", "20px solid green", "important");
 shouldBe("e.style.getPropertyValue('border')", "'20px solid green'");
 shouldBe("e.style.getPropertyPriority('border')", "'important'");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-07-19  Chris Dumez  <cdumez@apple.com>
+
+        Align CSSStyleDeclaration.setProperty() with the specification
+        https://bugs.webkit.org/show_bug.cgi?id=159955
+
+        Reviewed by Benjamin Poulain.
+
+        Align CSSStyleDeclaration.setProperty() with the specification:
+        - https://drafts.csswg.org/cssom/#the-cssstyledeclaration-interface
+
+        In particular, the following changes were needed:
+        1. The 'value' parameter should not be optional
+        2. The 'priority' parameter should treat null as the empty string
+           rather than the string "null".
+        3. The 'priority' parameter's default value should be the empty string,
+           not the string "undefined".
+        4. CSSStyleDeclaration.setProperty() should return early if 'priority'
+           is not the empty string and is not an ASCII case-insensitive match
+           for the string "important".
+
+        Chrome matches the specification entirely.
+        Firefox matches the specification with the exception that it does a
+        case-sensitive match for "important".
+
+        Test: fast/css/CSSStyleDeclaration-setProperty.html
+
+        * css/CSSStyleDeclaration.idl:
+        * css/PropertySetCSSStyleDeclaration.cpp:
+        (WebCore::PropertySetCSSStyleDeclaration::setProperty):
+
 2016-07-19  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/css/CSSStyleDeclaration.idl

@@ -39 +39 @@
     DOMString? getPropertyPriority(optional DOMString propertyName = "undefined");
 
-    // FIXME: 'priority' should use [TreatNullAs=EmptyString].
-    // FIXME: Using "undefined" as default parameter value is wrong.
-    [ObjCLegacyUnnamedParameters, RaisesException] void setProperty(optional DOMString propertyName = "undefined",
-                                    [TreatNullAs=EmptyString] optional DOMString value = "undefined",
-                                    optional DOMString priority = "undefined");
+    [ObjCLegacyUnnamedParameters, RaisesException] void setProperty(DOMString propertyName, [TreatNullAs=EmptyString] DOMString value, [TreatNullAs=EmptyString] optional DOMString priority = "");
 
     readonly attribute unsigned long    length;

trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp

@@ -227 +227 @@
         return;
 
-    bool important = priority.find("important", 0, false) != notFound;
+    bool important = equalIgnoringASCIICase(priority, "important");
+    if (!important && !priority.isEmpty())
+        return;
 
     ec = 0;