| Index: third_party/WebKit/LayoutTests/animations/keyframes-rule.html
|
| diff --git a/third_party/WebKit/LayoutTests/animations/keyframes-rule.html b/third_party/WebKit/LayoutTests/animations/keyframes-rule.html
|
| index 9b65228255e48b4ba93afb58f64151b28ff8a7dc..9a9d693515eaeacb57263edf037214e9a2bc864d 100644
|
| --- a/third_party/WebKit/LayoutTests/animations/keyframes-rule.html
|
| +++ b/third_party/WebKit/LayoutTests/animations/keyframes-rule.html
|
| @@ -1,63 +1,63 @@
|
| <html>
|
| <head>
|
| <style type="text/css" media="screen">
|
| - @-webkit-keyframes test1 {
|
| + @keyframes test1 {
|
| from { left: 10px; }
|
| to { left: 20px; }
|
| }
|
| - @-webkit-keyframes test2 {
|
| + @keyframes test2 {
|
| from { left: 10px; }
|
| to { left: 20px; }
|
| 30% { left: 30px; }
|
| 60% { left: 60px; }
|
| 20% { left: 50px; }
|
| }
|
| - @-webkit-keyframes test3 {
|
| + @keyframes test3 {
|
| 0% { left: 10px; }
|
| 50% , 60% { left: 30px; }
|
| -10% { left: 50px; }
|
| 90%, 100% { left: 20px; }
|
| }
|
| - @-webkit-keyframes test4 {
|
| + @keyframes test4 {
|
| from { left: 10px; }
|
| 50% { left: 30px; }
|
| to { left: 20px; }
|
| }
|
| - @-webkit-keyframes test5 {
|
| + @keyframes test5 {
|
| 0% { left: 10px; }
|
| 50% , 60% { left: 30px; }
|
| 90%, 100% { left: 20px; }
|
| }
|
| - @-webkit-keyframes test6 {
|
| + @keyframes test6 {
|
| from { left: 10px; }
|
| 50% { left: 30px; }
|
| to { left: 20px; }
|
| }
|
| - @-webkit-keyframes test7 {
|
| + @keyframes test7 {
|
| 0% { left: 10px; }
|
| 90%, 100% { left: 20px; }
|
| }
|
| - @-webkit-keyframes test8 {
|
| + @keyframes test8 {
|
| 0% { left: 10px; }
|
| 90%, 100% { left: 20px; }
|
| }
|
| - @-webkit-keyframes test9 {
|
| + @keyframes test9 {
|
| 0% { left: 10px; }
|
| 90%, 100% { left: 20px; }
|
| }
|
| - @-webkit-keyframes test10 {
|
| + @keyframes test10 {
|
| 0% { left: 10px; }
|
| 90%, 100% { left: 20px; }
|
| }
|
| - @-webkit-keyframes test11 {
|
| + @keyframes test11 {
|
| 0% { left: 10px; }
|
| 90%, 100% { left: 20px; }
|
| }
|
| - @-webkit-keyframes test12 {
|
| + @keyframes test12 {
|
| 0% { left: 10px; }
|
| 90%, 100% { left: 20px; }
|
| }
|
| - @-webkit-keyframes test13 {
|
| + @keyframes test13 {
|
| 0% { left: 10px; }
|
| 90%, 100% { left: 20px; }
|
| }
|
| @@ -81,14 +81,14 @@ else
|
| testFailed("CSSKeyframesRule does not exist on Window object");
|
|
|
| if (window.CSSRule.WEBKIT_KEYFRAME_RULE)
|
| - testPassed("WEBKIT_KEYFRAME_RULE exists on Window.CSSRule object");
|
| + testFailed("WEBKIT_KEYFRAME_RULE exists on Window.CSSRule object");
|
| else
|
| - testFailed("WEBKIT_KEYFRAME_RULE does not exist on Window.CSSRule object");
|
| + testPassed("WEBKIT_KEYFRAME_RULE does not exist on Window.CSSRule object");
|
|
|
| if (window.CSSRule.WEBKIT_KEYFRAMES_RULE)
|
| - testPassed("WEBKIT_KEYFRAMES_RULE exists on Window.CSSRule object");
|
| + testFailed("WEBKIT_KEYFRAMES_RULE exists on Window.CSSRule object");
|
| else
|
| - testFailed("WEBKIT_KEYFRAMES_RULE does not exist on Window.CSSRule object");
|
| + testPassed("WEBKIT_KEYFRAMES_RULE does not exist on Window.CSSRule object");
|
|
|
| if (window.CSSRule.KEYFRAME_RULE)
|
| testPassed("KEYFRAME_RULE exists on Window.CSSRule object");
|
| @@ -104,12 +104,12 @@ debug("");
|
| debug("Basic queries");
|
|
|
| var keyframes1 = document.styleSheets.item(0).cssRules.item(0);
|
| -shouldBe("keyframes1.type", "window.CSSRule.WEBKIT_KEYFRAMES_RULE");
|
| +shouldBe("keyframes1.type", "window.CSSRule.KEYFRAMES_RULE");
|
| shouldBe("keyframes1.name", "'test1'");
|
|
|
| var rules1 = keyframes1.cssRules;
|
| shouldBe("rules1.length", "2");
|
| -shouldBe("rules1.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rules1.item(0).type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rules1.item(0).cssText", "'0% { left: 10px; }'");
|
| shouldBe("rules1.item(1).cssText", "'100% { left: 20px; }'");
|
|
|
| @@ -144,12 +144,12 @@ debug("");
|
| debug("Keys");
|
|
|
| var keyframes3 = document.styleSheets.item(0).cssRules.item(2);
|
| -shouldBe("keyframes3.type", "window.CSSRule.WEBKIT_KEYFRAMES_RULE");
|
| +shouldBe("keyframes3.type", "window.CSSRule.KEYFRAMES_RULE");
|
| shouldBe("keyframes3.name", "'test3'");
|
|
|
| var rules3 = keyframes3.cssRules;
|
| shouldBe("rules3.length", "3");
|
| -shouldBe("rules3.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rules3.item(0).type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rules3.item(0).keyText", "'0%'");
|
| shouldBe("rules3.item(1).keyText", "'50%, 60%'");
|
| shouldBe("rules3.item(2).keyText", "'90%, 100%'");
|
| @@ -166,7 +166,7 @@ var rule = keyframes3.findRule("0%");
|
|
|
| if (!rule)
|
| testFailed("Could not extract '0%' keyframe rule");
|
| -shouldBe("rule.type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rule.type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rule.cssText", "'0% { left: 10px; }'");
|
|
|
| debug("");
|
| @@ -175,21 +175,21 @@ var rule = keyframes3.findRule("50%, 60%");
|
|
|
| if (!rule)
|
| testFailed("Could not extract '50%,60%' keyframe rule");
|
| -shouldBe("rule.type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rule.type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rule.cssText", "'50%, 60% { left: 30px; }'");
|
|
|
| debug("");
|
| debug("Find a rule using from and to");
|
|
|
| var keyframes4 = document.styleSheets.item(0).cssRules.item(3);
|
| -shouldBe("keyframes4.type", "window.CSSRule.WEBKIT_KEYFRAMES_RULE");
|
| +shouldBe("keyframes4.type", "window.CSSRule.KEYFRAMES_RULE");
|
|
|
| rule = keyframes4.findRule("From");
|
| -shouldBe("rule.type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rule.type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rule.cssText", "'0% { left: 10px; }'");
|
|
|
| rule = keyframes4.findRule("TO");
|
| -shouldBe("rule.type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rule.type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rule.cssText", "'100% { left: 20px; }'");
|
|
|
| debug("");
|
| @@ -208,7 +208,7 @@ var keyframes5 = document.styleSheets.item(0).cssRules.item(4);
|
| keyframes5.deleteRule("50%,60%");
|
| var rules5 = keyframes5.cssRules;
|
| shouldBe("rules5.length", "2");
|
| -shouldBe("rules5.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rules5.item(0).type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rules5.item(0).keyText", "'0%'");
|
| shouldBe("rules5.item(1).keyText", "'90%, 100%'");
|
|
|
| @@ -219,7 +219,7 @@ var keyframes6 = document.styleSheets.item(0).cssRules.item(5);
|
| keyframes6.deleteRule("0%");
|
| var rules6 = keyframes6.cssRules;
|
| shouldBe("rules6.length", "2");
|
| -shouldBe("rules6.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rules6.item(0).type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rules6.item(0).keyText", "'50%'");
|
| shouldBe("rules6.item(1).keyText", "'100%'");
|
|
|
| @@ -230,7 +230,7 @@ var keyframes7 = document.styleSheets.item(0).cssRules.item(6);
|
| keyframes7.deleteRule("70%");
|
| var rules7 = keyframes7.cssRules;
|
| shouldBe("rules7.length", "2");
|
| -shouldBe("rules7.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rules7.item(0).type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rules7.item(0).keyText", "'0%'");
|
| shouldBe("rules7.item(1).keyText", "'90%, 100%'");
|
|
|
| @@ -240,7 +240,7 @@ debug("Set a keyframe key");
|
| var rules8 = document.styleSheets.item(0).cssRules.item(7).cssRules;
|
| rules8.item(0).keyText = "70%";
|
| shouldBe("rules8.length", "2");
|
| -shouldBe("rules8.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rules8.item(0).type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rules8.item(0).keyText", "'70%'");
|
| shouldBe("rules8.item(1).keyText", "'90%, 100%'");
|
|
|
| @@ -250,7 +250,7 @@ debug("Set a keyframe key with 'from'");
|
| var rules9 = document.styleSheets.item(0).cssRules.item(8).cssRules;
|
| rules9.item(0).keyText = "from";
|
| shouldBe("rules9.length", "2");
|
| -shouldBe("rules9.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rules9.item(0).type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rules9.item(0).keyText", "'0%'");
|
| shouldBe("rules9.item(1).keyText", "'90%, 100%'");
|
|
|
| @@ -260,7 +260,7 @@ debug("Set a keyframe key with multiple values");
|
| var rules10 = document.styleSheets.item(0).cssRules.item(9).cssRules;
|
| rules10.item(0).keyText = "0%, 10%, from, 20%, 30%, to";
|
| shouldBe("rules10.length", "2");
|
| -shouldBe("rules10.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rules10.item(0).type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rules10.item(0).keyText", "'0%, 10%, 0%, 20%, 30%, 100%'");
|
| shouldBe("rules10.item(1).keyText", "'90%, 100%'");
|
|
|
| @@ -270,7 +270,7 @@ debug("Set a keyframe key with an out-of-range value");
|
| var rules11 = document.styleSheets.item(0).cssRules.item(10).cssRules;
|
| shouldThrow('rules11.item(0).keyText = "40%, -50%, 60%";');
|
| shouldBe("rules11.length", "2");
|
| -shouldBe("rules11.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rules11.item(0).type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rules11.item(0).keyText", "'0%'");
|
| shouldBe("rules11.item(1).keyText", "'90%, 100%'");
|
|
|
| @@ -280,7 +280,7 @@ debug("Set a keyframe key with an invalid value");
|
| var rules12 = document.styleSheets.item(0).cssRules.item(11).cssRules;
|
| shouldThrow('rules12.item(0).keyText = "foo";');
|
| shouldBe("rules12.length", "2");
|
| -shouldBe("rules12.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rules12.item(0).type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rules12.item(0).keyText", "'0%'");
|
| shouldBe("rules12.item(1).keyText", "'90%, 100%'");
|
|
|
| @@ -290,7 +290,7 @@ debug("Set a keyframe key with a null value");
|
| var rules13 = document.styleSheets.item(0).cssRules.item(12).cssRules;
|
| shouldThrow('rules13.item(0).keyText = null;');
|
| shouldBe("rules13.length", "2");
|
| -shouldBe("rules13.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
|
| +shouldBe("rules13.item(0).type", "window.CSSRule.KEYFRAME_RULE");
|
| shouldBe("rules13.item(0).keyText", "'0%'");
|
| shouldBe("rules13.item(1).keyText", "'90%, 100%'");
|
|
|
|
|