Don't require getPropertyCSSValue in fast/css tests

As getPropertyCSSValue is no longer web-exposed we shouldn't require it
in tests so we can delete the interface.

BUG=428595

Review URL: https://codereview.chromium.org/714693002

git-svn-id: svn://svn.chromium.org/blink/trunk@185111 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/fast/css/custom-font-xheight.html

@@ -42,8 +42,7 @@ if (window.testRunner)
 
 function test()
 {
-    var totalHeight = document.defaultView.getComputedStyle(document.getElementById("test"), null).getPropertyCSSValue("height");
-    totalHeight = totalHeight.getFloatValue(CSSPrimitiveValue.CSS_PX);
+    var totalHeight = parseFloat(getComputedStyle(document.getElementById("test")).height);
     if (totalHeight > 150 && totalHeight < 300)
         document.getElementById("result").innerHTML = "PASS";
     else

third_party/WebKit/LayoutTests/fast/css/image-set-parsing-expected.txt

@@ -4,89 +4,32 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 
-Single value for background-image : url('#a') 1x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 2
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
+Single value for background-image : url(#a) 1x
+PASS result is "-webkit-image-set(url(#a) 1x)"
 
-Multiple values for background-image : url('#a') 1x, url('#b') 2x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 4
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
-PASS subRule is 'b'
-PASS subRule.cssText is '2'
+Multiple values for background-image : url(#a) 1x, url(#b) 2x
+PASS result is "-webkit-image-set(url(#a) 1x, url(#b) 2x)"
 
-Multiple values for background-image, out of order : url('#c') 3x, url('#b') 2x, url('#a') 1x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 6
-PASS subRule is 'c'
-PASS subRule.cssText is '3'
-PASS subRule is 'b'
-PASS subRule.cssText is '2'
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
+Multiple values for background-image, out of order : url(#c) 3x, url(#b) 2x, url(#a) 1x
+PASS result is "-webkit-image-set(url(#c) 3x, url(#b) 2x, url(#a) 1x)"
 
-Single value for content : url('#a') 1x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 2
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
+Single value for content : url(#a) 1x
+PASS result is "-webkit-image-set(url(#a) 1x)"
 
-Multiple values for content : url('#a') 1x, url('#b') 2x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 4
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
-PASS subRule is 'b'
-PASS subRule.cssText is '2'
+Multiple values for content : url(#a) 1x, url(#b) 2x
+PASS result is "-webkit-image-set(url(#a) 1x, url(#b) 2x)"
 
-Single value for border-image : url('#a') 1x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 2
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
+Single value for border-image : url(#a) 1x
+PASS result is "-webkit-image-set(url(#a) 1x)"
 
-Multiple values for border-image : url('#a') 1x, url('#b') 2x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 4
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
-PASS subRule is 'b'
-PASS subRule.cssText is '2'
+Multiple values for border-image : url(#a) 1x, url(#b) 2x
+PASS result is "-webkit-image-set(url(#a) 1x, url(#b) 2x)"
 
-Single value for -webkit-mask-box-image-source : url('#a') 1x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 2
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
+Single value for -webkit-mask-box-image-source : url(#a) 1x
+PASS result is "-webkit-image-set(url(#a) 1x)"
 
-Multiple values for -webkit-mask-box-image-source : url('#a') 1x, url('#b') 2x
-PASS jsWrapperClass(imageSetRule) is 'CSSValueList'
-FAIL jsWrapperClass(imageSetRule.__proto__) should be CSSValueListPrototype. Was Object.
-FAIL jsWrapperClass(imageSetRule.constructor) should be CSSValueListConstructor. Was Function.
-PASS imageSetRule.length is 4
-PASS subRule is 'a'
-PASS subRule.cssText is '1'
-PASS subRule is 'b'
-PASS subRule.cssText is '2'
+Multiple values for -webkit-mask-box-image-source : url(#a) 1x, url(#b) 2x
+PASS result is "-webkit-image-set(url(#a) 1x, url(#b) 2x)"
 PASS successfullyParsed is true
 
 TEST COMPLETE

third_party/WebKit/LayoutTests/fast/css/image-set-parsing-invalid-expected.txt

@@ -5,22 +5,22 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 Too many url parameters : url(#a #b)
-PASS cssRule is null
+PASS cssRule is ""
 
 No x : url('#a') 1
-PASS cssRule is null
+PASS cssRule is ""
 
 No comma : url('#a') 1x url('#b') 2x
-PASS cssRule is null
+PASS cssRule is ""
 
 Too many scale factor parameters : url('#a') 1x 2x
-PASS cssRule is null
+PASS cssRule is ""
 
 Scale factor is 0 : url('#a') 0x
-PASS cssRule is null
+PASS cssRule is ""
 
 No url function : '#a' 1x
-PASS cssRule is null
+PASS cssRule is ""
 PASS successfullyParsed is true
 
 TEST COMPLETE

third_party/WebKit/LayoutTests/fast/css/script-tests/image-set-parsing-invalid.js

@@ -3,26 +3,26 @@ description("Test the parsing of the -webkit-image-set function.");
 // These have to be global for the test helpers to see them.
 var cssRule;
 
-function testInvalidImageSet(description, property, rule)
+function testInvalidImageSet(description, rule)
 {
     debug("");
     debug(description + " : " + rule);
 
     var div = document.createElement("div");
-    div.setAttribute("style", property + ": -webkit-image-set(" + rule + ")");
+    div.style.backgroundImage = "-webkit-image-set(" + rule + ")";
     document.body.appendChild(div);
 
-    cssRule = div.style.getPropertyCSSValue(property);
-    shouldBe("cssRule", "null");
+    cssRule = div.style.backgroundImage;
+    shouldBeEmptyString("cssRule");
 
     document.body.removeChild(div);
 }
 
-testInvalidImageSet("Too many url parameters", "background-image", "url(#a #b)");
-testInvalidImageSet("No x", "background-image", "url('#a') 1");
-testInvalidImageSet("No comma", "background-image", "url('#a') 1x url('#b') 2x");
-testInvalidImageSet("Too many scale factor parameters", "background-image", "url('#a') 1x 2x");
-testInvalidImageSet("Scale factor is 0", "background-image", "url('#a') 0x");
-testInvalidImageSet("No url function", "background-image", "'#a' 1x");
+testInvalidImageSet("Too many url parameters", "url(#a #b)");
+testInvalidImageSet("No x", "url('#a') 1");
+testInvalidImageSet("No comma", "url('#a') 1x url('#b') 2x");
+testInvalidImageSet("Too many scale factor parameters", "url('#a') 1x 2x");
+testInvalidImageSet("Scale factor is 0", "url('#a') 0x");
+testInvalidImageSet("No url function", "'#a' 1x");
 
 successfullyParsed = true;

third_party/WebKit/LayoutTests/fast/css/script-tests/image-set-parsing.js

 description("Test the parsing of the -webkit-image-set function.");
 
-function jsWrapperClass(node)
-{
-    if (!node)
-        return "[null]";
-    var string = Object.prototype.toString.apply(node);
-    return string.substr(8, string.length - 9);
-}
-
-function shouldBeType(expression, className, prototypeName, constructorName)
-{
-    if (!prototypeName)
-        prototypeName = className + "Prototype";
-    if (!constructorName)
-        constructorName = className + "Constructor";
-    shouldBe("jsWrapperClass(" + expression + ")", "'" + className + "'");
-    shouldBe("jsWrapperClass(" + expression + ".__proto__)", "'" + prototypeName + "'");
-    shouldBe("jsWrapperClass(" + expression + ".constructor)", "'" + constructorName + "'");
-}
-
-// These have to be global for the test helpers to see them.
-var imageSetRule, subRule;
+var result;
 
-function testImageSetRule(description, property, rule, expectedLength, expectedTexts)
+function testImageSetRule(description, property, rule, expectedTexts)
 {
     debug("");
     debug(description + " : " + rule);
 
     var div = document.createElement("div");
-    div.setAttribute("style", property + ": -webkit-image-set(" + rule + ")");
+    rule = "-webkit-image-set(" + rule + ")";
+    div.style[property] = rule;
     document.body.appendChild(div);
-
-    imageSetRule = div.style.getPropertyCSSValue(property);
-    shouldBeType("imageSetRule", "CSSValueList");
-
-    if (imageSetRule) {
-        if (jsWrapperClass(imageSetRule[0]) == "CSSValueList") {
-            // The content property returns a CSSValueList anyway, so to get to the 
-            // imageSet CSS value list, we have to look at the first entry in the 
-            // content value list.
-            imageSetRule = imageSetRule[0];
-        }
-    }
-
-    shouldBe("imageSetRule.length", "" + expectedLength); // shouldBe expects string arguments
-
-    if (imageSetRule) {
-        for (var i = 0; i < expectedLength; i++) {
-            string = imageSetRule[i];
-            if (i % 2 == 0) {
-                subRule = string.cssText.split('#')[1];
-                subRule = subRule.split(')')[0];
-                shouldBe("subRule", "'" + expectedTexts[i] + "'");
-            } else {
-                subRule = string;
-                shouldBe("subRule.cssText", "'" + expectedTexts[i] + "'");
-            }
-        }
-    }
-
+    result = div.style[property].replace(/url\([^#]*#/g, "url(#");
+    shouldBeEqualToString("result", rule);
     document.body.removeChild(div);
 }
 
 testImageSetRule("Single value for background-image",
                 "background-image",
-                "url('#a') 1x", 2,
-                ["a", "1"]);
+                "url(#a) 1x");
 
 testImageSetRule("Multiple values for background-image",
                 "background-image",
-                "url('#a') 1x, url('#b') 2x", 4,
-                ["a", "1", "b", "2"]);
+                "url(#a) 1x, url(#b) 2x");
 
 testImageSetRule("Multiple values for background-image, out of order",
                 "background-image",
-                "url('#c') 3x, url('#b') 2x, url('#a') 1x", 6,
-                ["c", "3", "b", "2", "a", "1"]);
+                "url(#c) 3x, url(#b) 2x, url(#a) 1x");
 
 testImageSetRule("Single value for content",
                 "content",
-                "url('#a') 1x", 2,
-                ["a", "1"]);
+                "url(#a) 1x");
 
 testImageSetRule("Multiple values for content",
                 "content",
-                "url('#a') 1x, url('#b') 2x", 4,
-                ["a", "1", "b", "2"]);
+                "url(#a) 1x, url(#b) 2x");
 
 testImageSetRule("Single value for border-image",
                 "-webkit-border-image",
-                "url('#a') 1x", 2,
-                ["a", "1"]);
+                "url(#a) 1x");
 
 testImageSetRule("Multiple values for border-image",
                 "-webkit-border-image",
-                "url('#a') 1x, url('#b') 2x", 4,
-                ["a", "1", "b", "2"]);
+                "url(#a) 1x, url(#b) 2x");
 
 testImageSetRule("Single value for -webkit-mask-box-image-source",
                 "-webkit-mask-box-image-source",
-                "url('#a') 1x", 2,
-                ["a", "1"]);
+                "url(#a) 1x");
 
 testImageSetRule("Multiple values for -webkit-mask-box-image-source",
                 "-webkit-mask-box-image-source",
-                "url('#a') 1x, url('#b') 2x", 4,
-                ["a", "1", "b", "2"]);
+                "url(#a) 1x, url(#b) 2x");
 
 successfullyParsed = true;

third_party/WebKit/LayoutTests/fast/css/sheet-collection-link.html

@@ -10,7 +10,7 @@
             for (i = 0; i < sheets.length; i++) {
                 if (sheets[i].cssRules.length != 1
                     || sheets[i].cssRules[0].type != CSSRule.STYLE_RULE
-                    || sheets[i].cssRules[0].style.getPropertyCSSValue("background-image") == null) {
+                    || sheets[i].cssRules[0].style.backgroundImage === "") {
                     return;
                 }
             }

third_party/WebKit/LayoutTests/fast/css/style-enumerate-properties-expected.txt

@@ -13,7 +13,6 @@ PASS 'webkitTransform' in document.body.style is true
 PASS 'WebkitTransform' in document.body.style is true
 PASS 'bogus-random-String' in document.body.style is false
 PASS 'cssText' in document.body.style is true
-PASS 'getPropertyCSSValue' in document.body.style is true
 PASS The CSS property order is correct
 PASS successfullyParsed is true
 

third_party/WebKit/LayoutTests/fast/css/style-enumerate-properties.html

@@ -25,7 +25,6 @@
         shouldBeTrue("'WebkitTransform' in document.body.style");
         shouldBeFalse("'bogus-random-String' in document.body.style");
         shouldBeTrue("'cssText' in document.body.style");
-        shouldBeTrue("'getPropertyCSSValue' in document.body.style");
 
         // Test CSS property order.
         var started;