Index: third_party/WebKit/LayoutTests/animations/computed-style.html |
diff --git a/third_party/WebKit/LayoutTests/animations/computed-style.html b/third_party/WebKit/LayoutTests/animations/computed-style.html |
index cf7cf52a29d9c6399e37a777592f752068067fff..f30b09d42e1da8cb7d64e381ffdf1ad8fd5c393d 100644 |
--- a/third_party/WebKit/LayoutTests/animations/computed-style.html |
+++ b/third_party/WebKit/LayoutTests/animations/computed-style.html |
@@ -6,43 +6,43 @@ |
height: 20px; |
background-color: blue; |
position: relative; |
- -webkit-animation-name: anim1; |
- -webkit-animation-duration: 10s; |
- -webkit-animation-fill-mode: backwards; |
- -webkit-animation-iteration-count: 10; |
- -webkit-animation-timing-function: linear; |
- -webkit-animation-direction: normal; |
+ animation-name: anim1; |
+ animation-duration: 10s; |
+ animation-fill-mode: backwards; |
+ animation-iteration-count: 10; |
+ animation-timing-function: linear; |
+ animation-direction: normal; |
} |
#test2 { |
width: 20px; |
height: 20px; |
background-color: blue; |
position: relative; |
- -webkit-animation-name: anim2, anim3; |
- -webkit-animation-duration: 5s, 2500ms; |
- -webkit-animation-fill-mode: forwards, both; |
- -webkit-animation-iteration-count: 10, infinite; |
- -webkit-animation-timing-function: linear, ease-in-out; |
- -webkit-animation-direction: normal, alternate; |
+ animation-name: anim2, anim3; |
+ animation-duration: 5s, 2500ms; |
+ animation-fill-mode: forwards, both; |
+ animation-iteration-count: 10, infinite; |
+ animation-timing-function: linear, ease-in-out; |
+ animation-direction: normal, alternate; |
} |
#test3 { |
width: 20px; |
height: 20px; |
background-color: blue; |
position: relative; |
- -webkit-animation-name: anim1, anim2, anim3; |
- -webkit-animation-duration: 5s; |
- -webkit-animation-timing-function: step-start, step-end, steps(5, end); |
+ animation-name: anim1, anim2, anim3; |
+ animation-duration: 5s; |
+ animation-timing-function: step-start, step-end, steps(5, end); |
} |
- @-webkit-keyframes anim1 { |
+ @keyframes anim1 { |
from { left: 10px; } |
to { left: 20px; } |
} |
- @-webkit-keyframes anim2 { |
+ @keyframes anim2 { |
from { width: 20px; } |
to { width: 25px; } |
} |
- @-webkit-keyframes anim3 { |
+ @keyframes anim3 { |
from { left: 10px; } |
to { left: 20px; } |
} |
@@ -66,25 +66,25 @@ var test1Style = window.getComputedStyle(test1); |
var test2Style = window.getComputedStyle(test2); |
var test3Style = window.getComputedStyle(test3); |
-shouldBe("test1Style.webkitAnimationName", "'anim1'"); |
-shouldBe("test2Style.webkitAnimationName", "'anim2, anim3'"); |
-shouldBe("test3Style.webkitAnimationName", "'anim1, anim2, anim3'"); |
+shouldBe("test1Style.animationName", "'anim1'"); |
+shouldBe("test2Style.animationName", "'anim2, anim3'"); |
+shouldBe("test3Style.animationName", "'anim1, anim2, anim3'"); |
-shouldBe("test1Style.webkitAnimationDuration", "'10s'"); |
-shouldBe("test2Style.webkitAnimationDuration", "'5s, 2.5s'"); |
+shouldBe("test1Style.animationDuration", "'10s'"); |
+shouldBe("test2Style.animationDuration", "'5s, 2.5s'"); |
-shouldBe("test1Style.webkitAnimationFillMode", "'backwards'"); |
-shouldBe("test2Style.webkitAnimationFillMode", "'forwards, both'"); |
+shouldBe("test1Style.animationFillMode", "'backwards'"); |
+shouldBe("test2Style.animationFillMode", "'forwards, both'"); |
-shouldBe("test1Style.webkitAnimationIterationCount", "'10'"); |
-shouldBe("test2Style.webkitAnimationIterationCount", "'10, infinite'"); |
+shouldBe("test1Style.animationIterationCount", "'10'"); |
+shouldBe("test2Style.animationIterationCount", "'10, infinite'"); |
-shouldBe("test1Style.webkitAnimationTimingFunction", "'linear'"); |
-shouldBe("test2Style.webkitAnimationTimingFunction", "'linear, ease-in-out'"); |
-shouldBe("test3Style.webkitAnimationTimingFunction", "'step-start, step-end, steps(5, end)'"); |
+shouldBe("test1Style.animationTimingFunction", "'linear'"); |
+shouldBe("test2Style.animationTimingFunction", "'linear, ease-in-out'"); |
+shouldBe("test3Style.animationTimingFunction", "'step-start, step-end, steps(5, end)'"); |
-shouldBe("test1Style.webkitAnimationDirection", "'normal'"); |
-shouldBe("test2Style.webkitAnimationDirection", "'normal, alternate'"); |
+shouldBe("test1Style.animationDirection", "'normal'"); |
+shouldBe("test2Style.animationDirection", "'normal, alternate'"); |
debug(""); |