Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: LayoutTests/animations/transition-and-animation-2.html

Issue 716963002: Remove property-specific handling in animation-test-helpers.js (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@animhelpercleanup
Patch Set: rm whitespace Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 1 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
2 "http://www.w3.org/TR/html4/loose.dtd"> 2 "http://www.w3.org/TR/html4/loose.dtd">
3 3
4 <html lang="en"> 4 <html lang="en">
5 <head> 5 <head>
6 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 6 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
7 <title>Transition/Animation Test #2</title> 7 <title>Transition/Animation Test #2</title>
8 <style type="text/css" media="screen"> 8 <style type="text/css" media="screen">
9 #box { 9 #box {
10 position: absolute; 10 position: absolute;
(...skipping 12 matching lines...) Expand all
23 @-webkit-keyframes anim { 23 @-webkit-keyframes anim {
24 from { transform: translate(0,100px) } 24 from { transform: translate(0,100px) }
25 to { transform: translate(400px, 100px) } 25 to { transform: translate(400px, 100px) }
26 } 26 }
27 </style> 27 </style>
28 <script src="resources/animation-test-helpers.js" type="text/javascript" cha rset="utf-8"></script> 28 <script src="resources/animation-test-helpers.js" type="text/javascript" cha rset="utf-8"></script>
29 <script type="text/javascript" charset="utf-8"> 29 <script type="text/javascript" charset="utf-8">
30 30
31 const expectedValues = [ 31 const expectedValues = [
32 // [time, element-id, property, expected-value, tolerance] 32 // [time, element-id, property, expected-value, tolerance]
33 [0.4, "box", "webkitTransform.5", 0, 0], 33 [0.4, "box", "transform", "none", 0],
34 ]; 34 ];
35 35
36 // FIXME: This doesn't get called so we don't trigger a transition...
36 function setup() 37 function setup()
37 { 38 {
38 document.getElementById("box").style.webkitTransform = "translateX(400px )"; 39 document.getElementById("box").style.webkitTransform = "translateX(400px )";
39 } 40 }
40 41
41 runAnimationTest(expectedValues, undefined, undefined, 'do-not-use-pause-api '); 42 runAnimationTest(expectedValues, undefined, undefined, 'do-not-use-pause-api ');
42 43
43 </script> 44 </script>
44 </head> 45 </head>
45 <body> 46 <body>
46 This test has a transition and animation on the same property (-webkit-transform ). 47 This test has a transition and animation on the same property (-webkit-transform ).
47 The animation starts and then the transition is triggered. The transition should start 48 The animation starts and then the transition is triggered. The transition should start
48 at the position before the animation started (the unanimated position), which is (0,0). If it 49 at the position before the animation started (the unanimated position), which is (0,0). If it
49 starts from the start point of the animation (0,100) then there is an error 50 starts from the start point of the animation (0,100) then there is an error
50 <div id="box"> 51 <div id="box">
51 </div> 52 </div>
52 <div id="result"> 53 <div id="result">
53 </div> 54 </div>
54 </body> 55 </body>
55 </html> 56 </html>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698