third_party/WebKit/LayoutTests/animations/transition-and-animation-2.html - Issue 2518273002: Remove unnecessary webkit prefixes from animation layout tests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/LayoutTests/animations/transition-and-animation-2.html

Issue 2518273002: Remove unnecessary webkit prefixes from animation layout tests (Closed)

Patch Set: remove trailing space Created 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/animations/transition-and-animation-1-expected.txt ('k') | third_party/WebKit/LayoutTests/animations/wrong-keyframe-name.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/animations/transition-and-animation-2.html

diff --git a/third_party/WebKit/LayoutTests/animations/transition-and-animation-2.html b/third_party/WebKit/LayoutTests/animations/transition-and-animation-2.html

index 17383c19f8375a37eb25b86b720b26d1323a4886..9709ef7f84f1a414d89faff656eb5519765af8df 100644

--- a/third_party/WebKit/LayoutTests/animations/transition-and-animation-2.html

+++ b/third_party/WebKit/LayoutTests/animations/transition-and-animation-2.html

@@ -13,14 +13,14 @@

height: 100px;

width: 100px;

background-color: blue;

- -webkit-animation-duration: 0.3s;

- -webkit-animation-timing-function: linear;

- -webkit-animation-name: anim;

- -webkit-transition-property: -webkit-transform;

- -webkit-transition-duration: 10s;

- -webkit-transition-timing-function: linear;

+ animation-duration: 0.3s;

+ animation-timing-function: linear;

+ animation-name: anim;

+ transition-property: transform;

+ transition-duration: 10s;

+ transition-timing-function: linear;

}

- @-webkit-keyframes anim {

+ @keyframes anim {

from { transform: translate(0,100px) }

to { transform: translate(400px, 100px) }

}

@@ -36,7 +36,7 @@

// FIXME: This doesn't get called so we don't trigger a transition...

function setup()

{

- document.getElementById("box").style.webkitTransform = "translateX(400px)";

+ document.getElementById("box").style.transform = "translateX(400px)";

}

runAnimationTest(expectedValues, undefined, undefined, 'do-not-use-pause-api');

@@ -44,7 +44,7 @@

</script>

</head>

<body>

-This test has a transition and animation on the same property (-webkit-transform).

+This test has a transition and animation on the same property (transform).

The animation starts and then the transition is triggered. The transition should start

at the position before the animation started (the unanimated position), which is (0,0). If it

starts from the start point of the animation (0,100) then there is an error