Skip to content

Commit eab5f86

Browse files
rniwarniwa
committed
Use testRunner instead of layoutTestController in fast/hidpi, history, html, images, inline, inline-block, innerHTML, inspector-support, invalid tests
https://bugs.webkit.org/show_bug.cgi?id=89744 Reviewed by Kent Tamura. * fast/hidpi/broken-image-icon-hidpi.html: * fast/hidpi/broken-image-with-size-hidpi.html: * fast/hidpi/clip-text-in-hidpi.html: * fast/hidpi/device-scale-factor-paint.html: * fast/hidpi/focus-rings.html: * fast/hidpi/image-set-as-background.html: * fast/hidpi/image-set-background-dynamic.html: * fast/hidpi/image-set-background-repeat-without-size.html: * fast/hidpi/image-set-background-repeat.html: * fast/hidpi/image-set-border-image-comparison.html: * fast/hidpi/image-set-border-image-dynamic.html: * fast/hidpi/image-set-border-image-simple.html: * fast/hidpi/image-set-in-content-dynamic.html: * fast/hidpi/image-set-out-of-order.html: * fast/hidpi/image-set-simple.html: * fast/hidpi/image-set-without-specified-width.html: * fast/hidpi/resize-corner-hidpi.html: * fast/hidpi/video-controls-in-hidpi.html: * fast/history/back-forward-reset-after-error-handling.html: * fast/history/form-submit-in-frame-via-onclick.html: * fast/history/form-submit-in-frame.html: * fast/history/forward-during-load.html: * fast/history/gesture-before-onload-form-submit.html: * fast/history/gesture-before-onload-location-href.html: * fast/history/go-back-to-changed-name.html: * fast/history/history-back-initial-vs-final-url.html: * fast/history/history-back-twice-with-subframes-assert.html: * fast/history/history-back-within-subframe-hash.html: * fast/history/history-back-within-subframe-url.html: * fast/history/history-length.html: * fast/history/history-replace-updates-current-item.html: * fast/history/history-subframe-with-name.html: * fast/history/history_reload.html: * fast/history/location-replace-hash.html: * fast/history/multiple-classes-visited.html: * fast/history/nested-visited-test.html: * fast/history/redirect-via-iframe.html: * fast/history/resources/clicked-link-is-visited-2.html: * fast/history/resources/history-back-within-subframe-hash-2.html: * fast/history/resources/history-replace-updates-current-item-done.html: * fast/history/resources/history_reload_window.html: * fast/history/resources/redirect-target.html: * fast/history/same-document-iframes-changing-fragment.html: * fast/history/same-document-iframes-changing-pushstate.html: * fast/history/saves-state-after-fragment-nav.html: * fast/history/saves-state-after-frame-nav.html: * fast/history/self-is-visited.html: * fast/history/sibling-visited-test.html: * fast/history/timed-refresh-in-cached-frame.html: * fast/history/visited-generated-content-test.html: * fast/history/visited-link-background-color.html: * fast/history/window-open.html: * fast/html/adopt-parent-frame.html: * fast/html/body-offset-properties.html: * fast/html/crash-style-first-letter.html: * fast/html/details-add-summary-1-and-click.html: * fast/html/details-add-summary-10-and-click.html: * fast/html/details-add-summary-2-and-click.html: * fast/html/details-add-summary-3-and-click.html: * fast/html/details-add-summary-4-and-click.html: * fast/html/details-add-summary-5-and-click.html: * fast/html/details-add-summary-6-and-click.html: * fast/html/details-add-summary-7-and-click.html: * fast/html/details-add-summary-8-and-click.html: * fast/html/details-add-summary-9-and-click.html: * fast/html/details-children-merge-crash.html: * fast/html/details-element-render-inline-crash.html: * fast/html/details-mouse-click.html: * fast/html/details-remove-summary-1-and-click.html: * fast/html/details-remove-summary-2-and-click.html: * fast/html/details-remove-summary-3-and-click.html: * fast/html/details-remove-summary-4-and-click.html: * fast/html/details-remove-summary-5-and-click.html: * fast/html/details-remove-summary-6-and-click.html: * fast/html/details-replace-summary-child.html: * fast/html/details-replace-text.html: * fast/html/details-summary-document-child.html: * fast/html/draggable.html: * fast/html/empty-fragment-id-goto-top.html: * fast/html/font-face-empty-should-not-crash.html: * fast/html/marquee-scrollamount.html: * fast/html/nav-element.html: * fast/html/object-image-nested-fallback.html: * fast/html/pending-stylesheet-crash.html: * fast/html/process-end-tag-for-inbody-crash.html: * fast/html/script-allowed-types-languages.html: * fast/html/select-dropdown-consistent-background-color.html: * fast/html/set-text-direction.html: * fast/html/tab-order.html: * fast/html/tabindex-removal.html: * fast/html/text-field-input-types.html: * fast/html/xhtml-serialize.html: * fast/images/animated-background-image-crash.html: * fast/images/animated-gif-restored-from-bfcache.html: * fast/images/bad-png.html: * fast/images/busted-oval-does-not-render.html: * fast/images/destroyed-image-load-event.html: * fast/images/dont-crash-with-null-gif-frames.html: * fast/images/drag-pdf-as-image.html: * fast/images/embed-does-not-propagate-dimensions-to-object-ancestor.html: * fast/images/embed-image.html: * fast/images/exif-orientation-css.html: * fast/images/exif-orientation.html: * fast/images/extra-image-in-image-document.html: * fast/images/gif-loop-count.html: * fast/images/image-empty-data.html: * fast/images/image-invalid-data.html: * fast/images/image-load-event-in-fragment.html: * fast/images/image-map-multiple-xhtml.xhtml: * fast/images/image-map-multiple.html: * fast/images/image-map-zoom.html: * fast/images/imagemap-scroll.html: * fast/images/jpeg-with-color-profile.html: * fast/images/large-size-image-crash.html: * fast/images/link-body-content-imageDimensionChanged-crash.html: * fast/images/load-img-with-empty-src.html: * fast/images/paletted-png-with-color-profile.html: * fast/images/percent-height-image.html: * fast/images/png-extra-row-crash.html: * fast/images/png-suite/test.html: * fast/images/png-with-color-profile.html: * fast/images/read-past-end-of-buffer.html: * fast/images/rgb-jpeg-endian-pixels.html: * fast/images/rgb-jpeg-with-adobe-marker-only.html: * fast/images/rgb-png-with-cmyk-color-profile.html: * fast/images/script-counter-imageDimensionChanged-crash.html: * fast/images/script-tests/move-image-to-new-document.js: * fast/images/size-failure.html: * fast/images/style-access-during-imageChanged-crash.html: * fast/images/style-access-during-imageChanged-style-freeze.html: * fast/images/support-broken-image-delegate.html: * fast/images/text-content-crash-2.html: * fast/images/text-content-crash.html: * fast/images/webp-image-decoding.html: * fast/images/ycbcr-with-cmyk-color-profile.html: * fast/images/zoomed-img-size.html: * fast/inline-block/anonymous-block-crash.html: * fast/inline-block/inline-block-vertical-align-2.html: * fast/inline-block/relative-positioned-rtl-crash.html: * fast/inline/boundingBox-with-continuation.html: * fast/inline/clean-after-removing-temp-boxes.html: * fast/inline/continuation-positioned-reparenting.html: * fast/inline/crash-new-continuation-with-outline.html: * fast/inline/dirtyLinesForInline.html: * fast/inline/inline-body-crash.html: * fast/inline/inline-body-with-scrollbar-crash.html: * fast/inline/inline-box-adjust-position-crash.html: * fast/inline/inline-box-adjust-position-crash2.html: * fast/inline/inline-child-height-width-calc-crash.html: * fast/inline/inline-destroy-dirty-lines-crash.html: * fast/inline/inline-marquee-crash.html: * fast/inline/relative-positioned-overflow.html: * fast/inline/skipped-whitespace-boundingBox.html: * fast/inline/skipped-whitespace-client-rect.html: * fast/inline/update-always-create-line-boxes-full-layout-crash.html: * fast/innerHTML/004-expected.txt: * fast/innerHTML/004.xhtml: * fast/innerHTML/005-expected.txt: * fast/innerHTML/005.html: * fast/innerHTML/additional-inline-style.html: * fast/innerHTML/innerHTML-case.html: * fast/innerHTML/innerHTML-changing-document-properties.xhtml: * fast/innerHTML/innerHTML-custom-tag.html: * fast/innerHTML/innerHTML-iframe.html: * fast/innerHTML/innerHTML-nbsp.xhtml: * fast/innerHTML/innerHTML-script-tag-crash.xhtml: * fast/innerHTML/javascript-url.html: * fast/inspector-support/cssURLQuotes.html: * fast/inspector-support/style.html: * fast/inspector-support/uncaught-dom1-exception.html: * fast/inspector-support/uncaught-dom3-exception.html: * fast/inspector-support/uncaught-dom8-exception.html: * fast/invalid/invalidSVGFont.html: * fast/invalid/nestedh3s-rapidweaver.html: * fast/invalid/test-case-tr-th-td-should-not-close-dl-list.html: * platform/gtk/fast/images/exif-orientation-css-expected.txt: * platform/gtk/fast/images/exif-orientation-expected.txt: * platform/mac/fast/images/exif-orientation-css-expected.txt: * platform/mac/fast/images/exif-orientation-expected.txt: * platform/qt/fast/history/back-to-unreachable-url-then-forward.html: * platform/qt/fast/history/resources/check-scroll-position.html: Canonical link: https://commits.webkit.org/107595@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@121012 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent ed1b179 commit eab5f86

182 files changed

Lines changed: 718 additions & 529 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: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,192 @@
1+
2012-06-22 Ryosuke Niwa <rniwa@webkit.org>
2+
3+
Use testRunner instead of layoutTestController in fast/hidpi, history, html, images, inline, inline-block, innerHTML, inspector-support, invalid tests
4+
https://bugs.webkit.org/show_bug.cgi?id=89744
5+
6+
Reviewed by Kent Tamura.
7+
8+
* fast/hidpi/broken-image-icon-hidpi.html:
9+
* fast/hidpi/broken-image-with-size-hidpi.html:
10+
* fast/hidpi/clip-text-in-hidpi.html:
11+
* fast/hidpi/device-scale-factor-paint.html:
12+
* fast/hidpi/focus-rings.html:
13+
* fast/hidpi/image-set-as-background.html:
14+
* fast/hidpi/image-set-background-dynamic.html:
15+
* fast/hidpi/image-set-background-repeat-without-size.html:
16+
* fast/hidpi/image-set-background-repeat.html:
17+
* fast/hidpi/image-set-border-image-comparison.html:
18+
* fast/hidpi/image-set-border-image-dynamic.html:
19+
* fast/hidpi/image-set-border-image-simple.html:
20+
* fast/hidpi/image-set-in-content-dynamic.html:
21+
* fast/hidpi/image-set-out-of-order.html:
22+
* fast/hidpi/image-set-simple.html:
23+
* fast/hidpi/image-set-without-specified-width.html:
24+
* fast/hidpi/resize-corner-hidpi.html:
25+
* fast/hidpi/video-controls-in-hidpi.html:
26+
* fast/history/back-forward-reset-after-error-handling.html:
27+
* fast/history/form-submit-in-frame-via-onclick.html:
28+
* fast/history/form-submit-in-frame.html:
29+
* fast/history/forward-during-load.html:
30+
* fast/history/gesture-before-onload-form-submit.html:
31+
* fast/history/gesture-before-onload-location-href.html:
32+
* fast/history/go-back-to-changed-name.html:
33+
* fast/history/history-back-initial-vs-final-url.html:
34+
* fast/history/history-back-twice-with-subframes-assert.html:
35+
* fast/history/history-back-within-subframe-hash.html:
36+
* fast/history/history-back-within-subframe-url.html:
37+
* fast/history/history-length.html:
38+
* fast/history/history-replace-updates-current-item.html:
39+
* fast/history/history-subframe-with-name.html:
40+
* fast/history/history_reload.html:
41+
* fast/history/location-replace-hash.html:
42+
* fast/history/multiple-classes-visited.html:
43+
* fast/history/nested-visited-test.html:
44+
* fast/history/redirect-via-iframe.html:
45+
* fast/history/resources/clicked-link-is-visited-2.html:
46+
* fast/history/resources/history-back-within-subframe-hash-2.html:
47+
* fast/history/resources/history-replace-updates-current-item-done.html:
48+
* fast/history/resources/history_reload_window.html:
49+
* fast/history/resources/redirect-target.html:
50+
* fast/history/same-document-iframes-changing-fragment.html:
51+
* fast/history/same-document-iframes-changing-pushstate.html:
52+
* fast/history/saves-state-after-fragment-nav.html:
53+
* fast/history/saves-state-after-frame-nav.html:
54+
* fast/history/self-is-visited.html:
55+
* fast/history/sibling-visited-test.html:
56+
* fast/history/timed-refresh-in-cached-frame.html:
57+
* fast/history/visited-generated-content-test.html:
58+
* fast/history/visited-link-background-color.html:
59+
* fast/history/window-open.html:
60+
* fast/html/adopt-parent-frame.html:
61+
* fast/html/body-offset-properties.html:
62+
* fast/html/crash-style-first-letter.html:
63+
* fast/html/details-add-summary-1-and-click.html:
64+
* fast/html/details-add-summary-10-and-click.html:
65+
* fast/html/details-add-summary-2-and-click.html:
66+
* fast/html/details-add-summary-3-and-click.html:
67+
* fast/html/details-add-summary-4-and-click.html:
68+
* fast/html/details-add-summary-5-and-click.html:
69+
* fast/html/details-add-summary-6-and-click.html:
70+
* fast/html/details-add-summary-7-and-click.html:
71+
* fast/html/details-add-summary-8-and-click.html:
72+
* fast/html/details-add-summary-9-and-click.html:
73+
* fast/html/details-children-merge-crash.html:
74+
* fast/html/details-element-render-inline-crash.html:
75+
* fast/html/details-mouse-click.html:
76+
* fast/html/details-remove-summary-1-and-click.html:
77+
* fast/html/details-remove-summary-2-and-click.html:
78+
* fast/html/details-remove-summary-3-and-click.html:
79+
* fast/html/details-remove-summary-4-and-click.html:
80+
* fast/html/details-remove-summary-5-and-click.html:
81+
* fast/html/details-remove-summary-6-and-click.html:
82+
* fast/html/details-replace-summary-child.html:
83+
* fast/html/details-replace-text.html:
84+
* fast/html/details-summary-document-child.html:
85+
* fast/html/draggable.html:
86+
* fast/html/empty-fragment-id-goto-top.html:
87+
* fast/html/font-face-empty-should-not-crash.html:
88+
* fast/html/marquee-scrollamount.html:
89+
* fast/html/nav-element.html:
90+
* fast/html/object-image-nested-fallback.html:
91+
* fast/html/pending-stylesheet-crash.html:
92+
* fast/html/process-end-tag-for-inbody-crash.html:
93+
* fast/html/script-allowed-types-languages.html:
94+
* fast/html/select-dropdown-consistent-background-color.html:
95+
* fast/html/set-text-direction.html:
96+
* fast/html/tab-order.html:
97+
* fast/html/tabindex-removal.html:
98+
* fast/html/text-field-input-types.html:
99+
* fast/html/xhtml-serialize.html:
100+
* fast/images/animated-background-image-crash.html:
101+
* fast/images/animated-gif-restored-from-bfcache.html:
102+
* fast/images/bad-png.html:
103+
* fast/images/busted-oval-does-not-render.html:
104+
* fast/images/destroyed-image-load-event.html:
105+
* fast/images/dont-crash-with-null-gif-frames.html:
106+
* fast/images/drag-pdf-as-image.html:
107+
* fast/images/embed-does-not-propagate-dimensions-to-object-ancestor.html:
108+
* fast/images/embed-image.html:
109+
* fast/images/exif-orientation-css.html:
110+
* fast/images/exif-orientation.html:
111+
* fast/images/extra-image-in-image-document.html:
112+
* fast/images/gif-loop-count.html:
113+
* fast/images/image-empty-data.html:
114+
* fast/images/image-invalid-data.html:
115+
* fast/images/image-load-event-in-fragment.html:
116+
* fast/images/image-map-multiple-xhtml.xhtml:
117+
* fast/images/image-map-multiple.html:
118+
* fast/images/image-map-zoom.html:
119+
* fast/images/imagemap-scroll.html:
120+
* fast/images/jpeg-with-color-profile.html:
121+
* fast/images/large-size-image-crash.html:
122+
* fast/images/link-body-content-imageDimensionChanged-crash.html:
123+
* fast/images/load-img-with-empty-src.html:
124+
* fast/images/paletted-png-with-color-profile.html:
125+
* fast/images/percent-height-image.html:
126+
* fast/images/png-extra-row-crash.html:
127+
* fast/images/png-suite/test.html:
128+
* fast/images/png-with-color-profile.html:
129+
* fast/images/read-past-end-of-buffer.html:
130+
* fast/images/rgb-jpeg-endian-pixels.html:
131+
* fast/images/rgb-jpeg-with-adobe-marker-only.html:
132+
* fast/images/rgb-png-with-cmyk-color-profile.html:
133+
* fast/images/script-counter-imageDimensionChanged-crash.html:
134+
* fast/images/script-tests/move-image-to-new-document.js:
135+
* fast/images/size-failure.html:
136+
* fast/images/style-access-during-imageChanged-crash.html:
137+
* fast/images/style-access-during-imageChanged-style-freeze.html:
138+
* fast/images/support-broken-image-delegate.html:
139+
* fast/images/text-content-crash-2.html:
140+
* fast/images/text-content-crash.html:
141+
* fast/images/webp-image-decoding.html:
142+
* fast/images/ycbcr-with-cmyk-color-profile.html:
143+
* fast/images/zoomed-img-size.html:
144+
* fast/inline-block/anonymous-block-crash.html:
145+
* fast/inline-block/inline-block-vertical-align-2.html:
146+
* fast/inline-block/relative-positioned-rtl-crash.html:
147+
* fast/inline/boundingBox-with-continuation.html:
148+
* fast/inline/clean-after-removing-temp-boxes.html:
149+
* fast/inline/continuation-positioned-reparenting.html:
150+
* fast/inline/crash-new-continuation-with-outline.html:
151+
* fast/inline/dirtyLinesForInline.html:
152+
* fast/inline/inline-body-crash.html:
153+
* fast/inline/inline-body-with-scrollbar-crash.html:
154+
* fast/inline/inline-box-adjust-position-crash.html:
155+
* fast/inline/inline-box-adjust-position-crash2.html:
156+
* fast/inline/inline-child-height-width-calc-crash.html:
157+
* fast/inline/inline-destroy-dirty-lines-crash.html:
158+
* fast/inline/inline-marquee-crash.html:
159+
* fast/inline/relative-positioned-overflow.html:
160+
* fast/inline/skipped-whitespace-boundingBox.html:
161+
* fast/inline/skipped-whitespace-client-rect.html:
162+
* fast/inline/update-always-create-line-boxes-full-layout-crash.html:
163+
* fast/innerHTML/004-expected.txt:
164+
* fast/innerHTML/004.xhtml:
165+
* fast/innerHTML/005-expected.txt:
166+
* fast/innerHTML/005.html:
167+
* fast/innerHTML/additional-inline-style.html:
168+
* fast/innerHTML/innerHTML-case.html:
169+
* fast/innerHTML/innerHTML-changing-document-properties.xhtml:
170+
* fast/innerHTML/innerHTML-custom-tag.html:
171+
* fast/innerHTML/innerHTML-iframe.html:
172+
* fast/innerHTML/innerHTML-nbsp.xhtml:
173+
* fast/innerHTML/innerHTML-script-tag-crash.xhtml:
174+
* fast/innerHTML/javascript-url.html:
175+
* fast/inspector-support/cssURLQuotes.html:
176+
* fast/inspector-support/style.html:
177+
* fast/inspector-support/uncaught-dom1-exception.html:
178+
* fast/inspector-support/uncaught-dom3-exception.html:
179+
* fast/inspector-support/uncaught-dom8-exception.html:
180+
* fast/invalid/invalidSVGFont.html:
181+
* fast/invalid/nestedh3s-rapidweaver.html:
182+
* fast/invalid/test-case-tr-th-td-should-not-close-dl-list.html:
183+
* platform/gtk/fast/images/exif-orientation-css-expected.txt:
184+
* platform/gtk/fast/images/exif-orientation-expected.txt:
185+
* platform/mac/fast/images/exif-orientation-css-expected.txt:
186+
* platform/mac/fast/images/exif-orientation-expected.txt:
187+
* platform/qt/fast/history/back-to-unreachable-url-then-forward.html:
188+
* platform/qt/fast/history/resources/check-scroll-position.html:
189+
1190
2012-06-21 Ryosuke Niwa <rniwa@webkit.org>
2191

3192
Use testRunner instead of layoutTestController in fast/fast-mobile-scrolling, flexbox, forms, frames, gradients tests

‎LayoutTests/fast/hidpi/broken-image-icon-hidpi.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<html>
22
<script>
33
function startTest() {
4-
if (window.layoutTestController) {
5-
layoutTestController.waitUntilDone();
6-
layoutTestController.setBackingScaleFactor(2, finishTest);
4+
if (window.testRunner) {
5+
testRunner.waitUntilDone();
6+
testRunner.setBackingScaleFactor(2, finishTest);
77
}
88
}
99

1010
function finishTest() {
11-
setTimeout(function() { layoutTestController.notifyDone(); }, 0);
11+
setTimeout(function() { testRunner.notifyDone(); }, 0);
1212
}
1313
</script>
1414
</head>

‎LayoutTests/fast/hidpi/broken-image-with-size-hidpi.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<html>
22
<script>
33
function startTest() {
4-
if (window.layoutTestController) {
5-
layoutTestController.waitUntilDone();
6-
layoutTestController.setBackingScaleFactor(2, finishTest);
4+
if (window.testRunner) {
5+
testRunner.waitUntilDone();
6+
testRunner.setBackingScaleFactor(2, finishTest);
77
}
88
}
99

1010
function finishTest() {
11-
setTimeout(function() { layoutTestController.notifyDone(); }, 0);
11+
setTimeout(function() { testRunner.notifyDone(); }, 0);
1212
}
1313
</script>
1414
</head>

‎LayoutTests/fast/hidpi/clip-text-in-hidpi.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
<head>
33
<script>
44
function startTest() {
5-
if (window.layoutTestController) {
6-
layoutTestController.waitUntilDone();
7-
layoutTestController.setBackingScaleFactor(2, finishTest);
5+
if (window.testRunner) {
6+
testRunner.waitUntilDone();
7+
testRunner.setBackingScaleFactor(2, finishTest);
88
}
99
}
1010

1111
function finishTest() {
1212
var test = document.getElementById("test");
1313
test.innerHTML = window.devicePixelRatio;
14-
setTimeout(function() { layoutTestController.notifyDone(); }, 0);
14+
setTimeout(function() { testRunner.notifyDone(); }, 0);
1515
}
1616
</script>
1717
</head>

‎LayoutTests/fast/hidpi/device-scale-factor-paint.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<html>
33
<script>
44
function startTest() {
5-
if (window.layoutTestController) {
6-
layoutTestController.waitUntilDone();
7-
layoutTestController.setBackingScaleFactor(2, finishTest);
5+
if (window.testRunner) {
6+
testRunner.waitUntilDone();
7+
testRunner.setBackingScaleFactor(2, finishTest);
88
}
99
}
1010

1111
function finishTest() {
12-
setTimeout(function() { layoutTestController.notifyDone() }, 0);
12+
setTimeout(function() { testRunner.notifyDone() }, 0);
1313
}
1414
</script>
1515
</head>

‎LayoutTests/fast/hidpi/focus-rings.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<html>
22
<script>
33
function startTest() {
4-
if (window.layoutTestController) {
5-
layoutTestController.waitUntilDone();
6-
layoutTestController.setBackingScaleFactor(2, finishTest);
4+
if (window.testRunner) {
5+
testRunner.waitUntilDone();
6+
testRunner.setBackingScaleFactor(2, finishTest);
77
}
88
}
99

1010
function finishTest() {
1111
var div = document.getElementById("div");
1212
div.focus();
13-
setTimeout(function() { layoutTestController.notifyDone(); }, 0);
13+
setTimeout(function() { testRunner.notifyDone(); }, 0);
1414
}
1515
</script>
1616
</head>

‎LayoutTests/fast/hidpi/image-set-as-background.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<head>
33
<script>
44
function runTest() {
5-
if (!window.layoutTestController || !window.sessionStorage)
5+
if (!window.testRunner || !window.sessionStorage)
66
return;
77

88
if (!sessionStorage.scaleFactorIsSet) {
9-
layoutTestController.waitUntilDone();
10-
layoutTestController.setBackingScaleFactor(2, scaleFactorIsSet);
9+
testRunner.waitUntilDone();
10+
testRunner.setBackingScaleFactor(2, scaleFactorIsSet);
1111
}
1212

1313
if (sessionStorage.pageReloaded && sessionStorage.scaleFactorIsSet) {
1414
delete sessionStorage.pageReloaded;
1515
delete sessionStorage.scaleFactorIsSet;
16-
layoutTestController.notifyDone();
16+
testRunner.notifyDone();
1717
} else {
1818
// Right now there is a bug that image-set does not properly deal with dynamic changes to the scale factor,
1919
// so to work around that, we must reload the page to get the 2x image.

‎LayoutTests/fast/hidpi/image-set-background-dynamic.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
<head>
44
<script>
55
function startTest() {
6-
if (window.layoutTestController) {
7-
layoutTestController.waitUntilDone();
8-
layoutTestController.setBackingScaleFactor(2, finishTest);
6+
if (window.testRunner) {
7+
testRunner.waitUntilDone();
8+
testRunner.setBackingScaleFactor(2, finishTest);
99
}
1010
}
1111

1212
function finishTest() {
1313
var test = document.getElementById("foo");
1414
test.innerHTML = window.devicePixelRatio;
15-
setTimeout(function() { layoutTestController.notifyDone(); }, 0);
15+
setTimeout(function() { testRunner.notifyDone(); }, 0);
1616
}
1717
</script>
1818

‎LayoutTests/fast/hidpi/image-set-background-repeat-without-size.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<head>
33
<script>
44
function runTest() {
5-
if (!window.layoutTestController || !window.sessionStorage)
5+
if (!window.testRunner || !window.sessionStorage)
66
return;
77

88
if (!sessionStorage.scaleFactorIsSet) {
9-
layoutTestController.waitUntilDone();
10-
layoutTestController.setBackingScaleFactor(2, scaleFactorIsSet);
9+
testRunner.waitUntilDone();
10+
testRunner.setBackingScaleFactor(2, scaleFactorIsSet);
1111
}
1212

1313
if (sessionStorage.pageReloaded && sessionStorage.scaleFactorIsSet) {
1414
delete sessionStorage.pageReloaded;
1515
delete sessionStorage.scaleFactorIsSet;
16-
layoutTestController.notifyDone();
16+
testRunner.notifyDone();
1717
} else {
1818
// Right now there is a bug that image-set does not properly deal with dynamic changes to the scale factor,
1919
// so to work around that, we must reload the page to get the 2x image.

‎LayoutTests/fast/hidpi/image-set-background-repeat.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<head>
33
<script>
44
function runTest() {
5-
if (!window.layoutTestController || !window.sessionStorage)
5+
if (!window.testRunner || !window.sessionStorage)
66
return;
77

88
if (!sessionStorage.scaleFactorIsSet) {
9-
layoutTestController.waitUntilDone();
10-
layoutTestController.setBackingScaleFactor(2, scaleFactorIsSet);
9+
testRunner.waitUntilDone();
10+
testRunner.setBackingScaleFactor(2, scaleFactorIsSet);
1111
}
1212

1313
if (sessionStorage.pageReloaded && sessionStorage.scaleFactorIsSet) {
1414
delete sessionStorage.pageReloaded;
1515
delete sessionStorage.scaleFactorIsSet;
16-
layoutTestController.notifyDone();
16+
testRunner.notifyDone();
1717
} else {
1818
// Right now there is a bug that image-set does not properly deal with dynamic changes to the scale factor,
1919
// so to work around that, we must reload the page to get the 2x image.

0 commit comments

Comments
 (0)