Skip to content

Commit d75f420

Browse files
rniwarniwa
committed
Use testRunner instead of layoutTestController in css 1, css 2.1, and css3 tests
https://bugs.webkit.org/show_bug.cgi?id=88769 Reviewed by Tony Chang. * css1/units/zero-duration-without-units.html: * css3/calc/: * css3/filters/: * css3/filters/custom/: * css3/filters/resources/: * css3/filters/script-tests/: * css3/flexbox/: * css3/font-feature-settings-rendering.html: * css3/images/cross-fade-invalidation.html: * css3/images/optimize-contrast-canvas.html: * css3/images/optimize-contrast-image.html: * css3/khtml-background-size-0x0-bmp.html: * css3/parsing-css3-nthchild.html: * css3/style-zoomed-image.html: * css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-getStyle.html: * css3/zoom-coords.xhtml: * platform/win/css2.1/resources/run-webkit-tests-epilogue.html: * platform/win/css2.1/resources/run-webkit-tests-prologue.html: Canonical link: https://commits.webkit.org/106625@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@119990 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent dd1edd3 commit d75f420

153 files changed

Lines changed: 434 additions & 408 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: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
2012-06-11 Ryosuke Niwa <rniwa@webkit.org>
2+
3+
Use testRunner instead of layoutTestController in css 1, css 2.1, and css3 tests
4+
https://bugs.webkit.org/show_bug.cgi?id=88769
5+
6+
Reviewed by Tony Chang.
7+
8+
* css1/units/zero-duration-without-units.html:
9+
* css3/calc/:
10+
* css3/filters/:
11+
* css3/filters/custom/:
12+
* css3/filters/resources/:
13+
* css3/filters/script-tests/:
14+
* css3/flexbox/:
15+
* css3/font-feature-settings-rendering.html:
16+
* css3/images/cross-fade-invalidation.html:
17+
* css3/images/optimize-contrast-canvas.html:
18+
* css3/images/optimize-contrast-image.html:
19+
* css3/khtml-background-size-0x0-bmp.html:
20+
* css3/parsing-css3-nthchild.html:
21+
* css3/style-zoomed-image.html:
22+
* css3/viewport-percentage-lengths/css3-viewport-percentage-lengths-getStyle.html:
23+
* css3/zoom-coords.xhtml:
24+
* platform/win/css2.1/resources/run-webkit-tests-epilogue.html:
25+
* platform/win/css2.1/resources/run-webkit-tests-prologue.html:
26+
127
2012-06-11 Ryosuke Niwa <rniwa@webkit.org>
228

329
Use testRunner instead of layoutTestController in animations tests

‎LayoutTests/css1/units/zero-duration-without-units.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
}
1818
</style>
1919
<script type="text/javascript" charset="utf-8">
20-
if (window.layoutTestController) {
21-
layoutTestController.dumpAsText();
22-
layoutTestController.waitUntilDone();
20+
if (window.testRunner) {
21+
testRunner.dumpAsText();
22+
testRunner.waitUntilDone();
2323
}
2424

2525
function test()
2626
{
2727
var box = document.getElementById('box');
2828
var dur = parseInt(window.getComputedStyle(box).webkitTransitionDuration);
2929
document.getElementById('result').innerHTML = (dur == 0) ? "PASS" : "FAIL";
30-
if (window.layoutTestController)
31-
layoutTestController.notifyDone();
30+
if (window.testRunner)
31+
testRunner.notifyDone();
3232
}
3333
window.addEventListener('load', test, false)
3434
</script>

‎LayoutTests/css3/calc/background-position-parsing-expected.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,4 @@
134134

135135

136136
</body>
137-
</html>
137+
</html>

‎LayoutTests/css3/calc/background-position-parsing.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,4 @@
134134

135135

136136
</body>
137-
</html>
137+
</html>

‎LayoutTests/css3/calc/border.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
<p class="simple-bottom">This element should have a bottom border of 25 pixels.</p>
2929

3030
<script>
31-
if (window.layoutTestController)
32-
layoutTestController.dumpAsText();
31+
if (window.testRunner)
32+
testRunner.dumpAsText();
3333

3434
var innerWidth = 200;
3535
var innerHeight = 120;

‎LayoutTests/css3/calc/calc-errors.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
</div>
8585

8686
<script>
87-
if (window.layoutTestController)
88-
layoutTestController.dumpAsText();
87+
if (window.testRunner)
88+
testRunner.dumpAsText();
8989

9090
var test = document.getElementById("test");
9191
for (var element = test.firstChild; element; element = element.nextSibling) {

‎LayoutTests/css3/calc/color-hsl.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
shouldBeEqualToString('getComputedStyle(document.getElementById("' + test + '"), null).color', getComputedStyle(document.getElementById("control" + test), null).color);
2626
}
2727

28-
if (window.layoutTestController)
28+
if (window.testRunner)
2929
document.body.removeChild(document.getElementById("test-container"));
3030
</script>
3131
<script src="../../fast/js/resources/js-test-post.js"></script>

‎LayoutTests/css3/calc/color-rgb.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
shouldBeEqualToString('getComputedStyle(document.getElementById("' + test + '"), null).color', getComputedStyle(document.getElementById("control" + test), null).color);
4646
}
4747

48-
if (window.layoutTestController)
48+
if (window.testRunner)
4949
document.body.removeChild(document.getElementById("test-container"));
5050
</script>
5151
<script src="../../fast/js/resources/js-test-post.js"></script>

‎LayoutTests/css3/calc/cssom.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<div id="dummy"></div>
33
<div id="results">This tests calc() and the CSSOM<br><br></div>
44
<script>
5-
if (window.layoutTestController)
6-
window.layoutTestController.dumpAsText();
5+
if (window.testRunner)
6+
window.testRunner.dumpAsText();
77

88
var tests = ["10px",
99
"10px + 15px",

‎LayoutTests/css3/calc/font-monospace.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<div id="results"></div>
1414

1515
<script>
16-
if (window.layoutTestController)
17-
layoutTestController.dumpAsText();
16+
if (window.testRunner)
17+
testRunner.dumpAsText();
1818
var controlHeight = getComputedStyle(document.getElementById("control"), null).lineHeight;
1919
var controlSize = getComputedStyle(document.getElementById("control"), null).fontSize;
2020

0 commit comments

Comments
 (0)