Skip to content

Commit 9e4f12a

Browse files
committed
2011-04-25 Simon Fraser <simon.fraser@apple.com>
Reviewed by Dan Bernstein. Clean up transition tests https://bugs.webkit.org/show_bug.cgi?id=59410 General test cleanup: use the named variables as arguments to runTransitionTest() for readability, remove unnecessary titles and meta tags, remove style and script tag attributes etc. No substantive changes. Canonical link: https://commits.webkit.org/74597@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@84875 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 7830f81 commit 9e4f12a

70 files changed

Lines changed: 321 additions & 375 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

LayoutTests/ChangeLog

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,86 @@
1+
2011-04-25 Simon Fraser <simon.fraser@apple.com>
2+
3+
Reviewed by Dan Bernstein.
4+
5+
Clean up transition tests
6+
https://bugs.webkit.org/show_bug.cgi?id=59410
7+
8+
General test cleanup: use the named variables as
9+
arguments to runTransitionTest() for readability,
10+
remove unnecessary titles and meta tags, remove
11+
style and script tag attributes etc. No substantive
12+
changes.
13+
14+
* transitions/background-transitions.html:
15+
* transitions/bad-transition-shorthand-crash.html:
16+
* transitions/border-radius-transition.html:
17+
* transitions/cancel-transition.html:
18+
* transitions/change-values-during-transition.html:
19+
* transitions/clip-transition.html:
20+
* transitions/color-transition-all.html:
21+
* transitions/color-transition-premultiplied.html:
22+
* transitions/default-timing-function.html:
23+
* transitions/extra-transition.html:
24+
* transitions/hang-with-bad-transition-list.html:
25+
* transitions/inherit-other-props.html:
26+
* transitions/inherit.html:
27+
* transitions/interrupt-transform-transition.html:
28+
* transitions/interrupt-zero-duration.html:
29+
* transitions/interrupted-accelerated-transition.html:
30+
* transitions/interrupted-all-transition.html:
31+
* transitions/mask-transitions.html:
32+
* transitions/matched-transform-functions.html:
33+
* transitions/min-max-width-height-transitions.html:
34+
* transitions/mismatched-shadow-styles.html:
35+
* transitions/move-after-transition.html:
36+
* transitions/multiple-background-size-transitions.html:
37+
* transitions/multiple-background-transitions.html:
38+
* transitions/multiple-mask-transitions.html:
39+
* transitions/multiple-shadow-transitions.html:
40+
* transitions/multiple-text-shadow-transition.html:
41+
* transitions/negative-delay.html:
42+
* transitions/opacity-transition-zindex.html:
43+
* transitions/override-transition-crash.html:
44+
* transitions/remove-transition-style.html:
45+
* transitions/repeated-firing-background-color.html:
46+
* transitions/retargetted-transition.html:
47+
* transitions/shadow.html:
48+
* transitions/shorthand-border-transitions.html:
49+
* transitions/shorthand-transitions.html:
50+
* transitions/start-transform-transition.html:
51+
* transitions/steps-timing-function.html:
52+
* transitions/suspend-transform-transition.html:
53+
* transitions/svg-text-shadow-transition.html:
54+
* transitions/text-indent-transition.html:
55+
* transitions/transform-op-list-match.html:
56+
* transitions/transform-op-list-no-match.html:
57+
* transitions/transition-drt-api-delay.html:
58+
* transitions/transition-drt-api.html:
59+
* transitions/transition-duration-cleared-in-transitionend-crash.html:
60+
* transitions/transition-end-event-all-properties.html:
61+
* transitions/transition-end-event-attributes.html:
62+
* transitions/transition-end-event-container.html:
63+
* transitions/transition-end-event-destroy-iframe.html:
64+
* transitions/transition-end-event-destroy-renderer.html:
65+
* transitions/transition-end-event-left.html:
66+
* transitions/transition-end-event-multiple-01.html:
67+
* transitions/transition-end-event-multiple-02.html:
68+
* transitions/transition-end-event-multiple-03.html:
69+
* transitions/transition-end-event-multiple-04.html:
70+
* transitions/transition-end-event-nested.html:
71+
* transitions/transition-end-event-rendering.html:
72+
* transitions/transition-end-event-set-none.html:
73+
* transitions/transition-end-event-transform.html:
74+
* transitions/transition-end-event-window.html:
75+
* transitions/transition-hit-test-transform.html:
76+
* transitions/transition-hit-test.html:
77+
* transitions/transition-shorthand-delay.html:
78+
* transitions/transition-timing-function.html:
79+
* transitions/zero-duration-in-list.html:
80+
* transitions/zero-duration-with-non-zero-delay-end.html:
81+
* transitions/zero-duration-with-non-zero-delay-start.html:
82+
* transitions/zero-duration-without-units.html:
83+
184
2011-04-25 Simon Fraser <simon.fraser@apple.com>
285

386
Reviewed by Daniel Bates.

LayoutTests/transitions/background-transitions.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<!DOCTYPE>
22

3-
<html lang="en">
3+
<html>
44
<head>
5-
<title>background-position and size transitions</title>
6-
<style type="text/css" media="screen">
5+
<style>
76
.box {
87
height: 100px;
98
width: 100px;
@@ -32,8 +31,8 @@
3231
}
3332

3433
</style>
35-
<script src="resources/transition-test-helpers.js" type="text/javascript" charset="utf-8"></script>
36-
<script type="text/javascript" charset="utf-8">
34+
<script src="resources/transition-test-helpers.js" type="text/javascript"></script>
35+
<script>
3736

3837
const expectedValues = [
3938
// [time, element-id, property, expected-value, tolerance]
@@ -47,7 +46,7 @@
4746
document.getElementById('box2').className = 'box final';
4847
}
4948

50-
runTransitionTest(expectedValues, setupTest, true);
49+
runTransitionTest(expectedValues, setupTest, usePauseAPI);
5150
</script>
5251
</head>
5352
<body>

LayoutTests/transitions/bad-transition-shorthand-crash.html

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
2-
"http://www.w3.org/TR/html4/loose.dtd">
1+
<!DOCTYPE html>
32

4-
<html lang="en">
3+
<html>
54
<head>
6-
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
7-
<title>Test For Crash When Transition Properties Overridden</title>
8-
<style type="text/css" media="screen">
5+
<style>
96
#box {
107
position: relative;
118
height: 100px;
@@ -15,7 +12,7 @@
1512
-webkit-transition: -webkit-transform, 2s;
1613
}
1714
</style>
18-
<script type="text/javascript" charset="utf-8">
15+
<script>
1916
if (window.layoutTestController) {
2017
layoutTestController.dumpAsText();
2118
layoutTestController.waitUntilDone();
@@ -41,7 +38,6 @@
4138
}
4239

4340
window.addEventListener('load', start, false);
44-
4541
</script>
4642
</head>
4743
<body>

LayoutTests/transitions/border-radius-transition.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!DOCTYPE>
22

3-
<html lang="en">
3+
<html>
44
<head>
5-
<style type="text/css" media="screen">
5+
<style>
66
.box {
77
height: 100px;
88
width: 100px;
@@ -29,8 +29,8 @@
2929
}
3030

3131
</style>
32-
<script src="resources/transition-test-helpers.js" type="text/javascript" charset="utf-8"></script>
33-
<script type="text/javascript" charset="utf-8">
32+
<script src="resources/transition-test-helpers.js"></script>
33+
<script type="text/javascript">
3434

3535
const expectedValues = [
3636
// [time, element-id, property, expected-value, tolerance]

LayoutTests/transitions/cancel-transition.html

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
2-
"http://www.w3.org/TR/html4/loose.dtd">
1+
<!DOCTYPE html>
32

4-
<html lang="en">
3+
<html>
54
<head>
6-
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
7-
<title>Cancelled Transition Should Not Continue To Run</title>
8-
<style type="text/css" media="screen">
5+
<style>
96
#container {
107
height: 300px;
118
width: 700px;
@@ -40,7 +37,7 @@
4037
-webkit-transition-timing-function: linear;
4138
}
4239
</style>
43-
<script type="text/javascript" charset="utf-8">
40+
<script>
4441
if (window.layoutTestController) {
4542
layoutTestController.dumpAsText();
4643
layoutTestController.waitUntilDone();
@@ -97,6 +94,7 @@
9794
setTimeout("restartTransition()", 200);
9895
}
9996
</script>
97+
</head>
10098
<body onload="start()">
10199
<p>
102100
Test removes the transition properties while the transition is running, then adds them back in.

LayoutTests/transitions/change-values-during-transition.html

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<!DOCTYPE html>
22

3-
<html lang="en">
3+
<html>
44
<head>
5-
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
6-
<title>Changing transition values during transition should not affect it</title>
7-
<style type="text/css" media="screen">
5+
<style>
86
#box {
97
height: 100px;
108
width: 100px;
@@ -14,7 +12,7 @@
1412
-webkit-transition-property: -webkit-transform;
1513
}
1614
</style>
17-
<script type="text/javascript" charset="utf-8">
15+
<script>
1816
if (window.layoutTestController) {
1917
layoutTestController.dumpAsText();
2018
layoutTestController.waitUntilDone();
@@ -91,7 +89,6 @@
9189

9290
window.addEventListener('load', start, false);
9391
document.addEventListener('webkitTransitionEnd', goBack, false);
94-
9592
</script>
9693
</head>
9794
<body>

LayoutTests/transitions/clip-transition.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<html>
44
<head>
5-
<style type="text/css" media="screen">
5+
<style>
66
#box {
77
position: absolute;
88
height: 100px;
@@ -16,8 +16,8 @@
1616
clip: rect(30px, 70px, 70px, 30px);
1717
}
1818
</style>
19-
<script src="resources/transition-test-helpers.js" type="text/javascript" charset="utf-8"></script>
20-
<script type="text/javascript" charset="utf-8">
19+
<script src="resources/transition-test-helpers.js"></script>
20+
<script type="text/javascript">
2121

2222
const expectedValues = [
2323
// [time, element-id, property, expected-value, tolerance]
@@ -29,7 +29,7 @@
2929
document.getElementById('box').className = 'changed';
3030
}
3131

32-
runTransitionTest(expectedValues, setupTest, true);
32+
runTransitionTest(expectedValues, setupTest, usePauseAPI);
3333
</script>
3434
</head>
3535
<body>

LayoutTests/transitions/color-transition-all.html

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<!DOCTYPE>
22

3-
<html lang="en">
3+
<html>
44
<head>
5-
<title>Color transition with transition-property: all</title>
6-
<style type="text/css" media="screen">
5+
<style>
76
#outer {
87
font-size: 200%;
98
color: #00F;
@@ -18,8 +17,8 @@
1817
color: #0F0;
1918
}
2019
</style>
21-
<script src="resources/transition-test-helpers.js" type="text/javascript" charset="utf-8"></script>
22-
<script type="text/javascript" charset="utf-8">
20+
<script src="resources/transition-test-helpers.js"></script>
21+
<script type="text/javascript">
2322
const expectedValues = [
2423
// [time, element-id, property, expected-value, tolerance, post-completion callback, should-be-transitioning]
2524
[0.5, 'outer', 'color', [0, 127, 127], 2, null, shouldBeTransitioning],

LayoutTests/transitions/color-transition-premultiplied.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<html>
44
<head>
5-
<style type="text/css" media="screen">
5+
<style>
66

77
.box {
88
width: 100px;
@@ -29,8 +29,8 @@
2929
background-color: rgba(0, 0, 255, 1);
3030
}
3131
</style>
32-
<script src="resources/transition-test-helpers.js" type="text/javascript" charset="utf-8"></script>
33-
<script type="text/javascript" charset="utf-8">
32+
<script src="resources/transition-test-helpers.js"></script>
33+
<script type="text/javascript">
3434
const expectedValues = [
3535
// [time, element-id, property, expected-value, tolerance]
3636
[0.5, 'one', 'background-color', [0, 127, 0], 2],

LayoutTests/transitions/default-timing-function.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<html>
44
<head>
5-
<style type="text/css" media="screen">
5+
<style>
66
.container {
77
position: relative;
88
}
@@ -39,8 +39,8 @@
3939
}
4040

4141
</style>
42-
<script src="resources/transition-test-helpers.js" type="text/javascript" charset="utf-8"></script>
43-
<script type="text/javascript" charset="utf-8">
42+
<script src="resources/transition-test-helpers.js"></script>
43+
<script type="text/javascript">
4444

4545
const expectedValues = [
4646
// [time, element-id, property, expected-value, tolerance]

0 commit comments

Comments
 (0)