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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121012 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/images/animated-background-image-crash.html b/LayoutTests/fast/images/animated-background-image-crash.html
index 2f92319..c0ddd89 100644
--- a/LayoutTests/fast/images/animated-background-image-crash.html
+++ b/LayoutTests/fast/images/animated-background-image-crash.html
@@ -12,14 +12,14 @@
<script>
function step2()
{
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function step1()
{
- if (window.layoutTestController)
- layoutTestController.display();
+ if (window.testRunner)
+ testRunner.display();
document.getElementById("target").style.display="none";
document.body.offsetTop;
setTimeout("step2()", 200);
@@ -27,9 +27,9 @@
function test()
{
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
setTimeout("step1()", 100);
}
diff --git a/LayoutTests/fast/images/animated-gif-restored-from-bfcache.html b/LayoutTests/fast/images/animated-gif-restored-from-bfcache.html
index f391bbf..2359c78 100644
--- a/LayoutTests/fast/images/animated-gif-restored-from-bfcache.html
+++ b/LayoutTests/fast/images/animated-gif-restored-from-bfcache.html
@@ -1,12 +1,12 @@
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
}
function runTest() {
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+ if (window.testRunner)
+ testRunner.waitUntilDone();
var image = document.getElementById("image");
var console = document.getElementById("console");
@@ -30,15 +30,15 @@
else
console.innerHTML = "<span style='color:green'>PASS</span>";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 100);
}
window.onpageshow = function(event) {
- if (!event.persisted && window.layoutTestController) {
- layoutTestController.queueLoad("about:blank");
- layoutTestController.queueBackNavigation(1);
+ if (!event.persisted && window.testRunner) {
+ testRunner.queueLoad("about:blank");
+ testRunner.queueBackNavigation(1);
return;
}
diff --git a/LayoutTests/fast/images/bad-png.html b/LayoutTests/fast/images/bad-png.html
index a9662ba..2e1bd04 100644
--- a/LayoutTests/fast/images/bad-png.html
+++ b/LayoutTests/fast/images/bad-png.html
@@ -1,8 +1,8 @@
<html>
<head>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
diff --git a/LayoutTests/fast/images/busted-oval-does-not-render.html b/LayoutTests/fast/images/busted-oval-does-not-render.html
index 806de7c..32e9f07 100644
--- a/LayoutTests/fast/images/busted-oval-does-not-render.html
+++ b/LayoutTests/fast/images/busted-oval-does-not-render.html
@@ -1,5 +1,5 @@
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<img src="resources/busted-oval.png" onerror="alert('PASS')">
diff --git a/LayoutTests/fast/images/destroyed-image-load-event.html b/LayoutTests/fast/images/destroyed-image-load-event.html
index a4ad997c..d0bb91c 100644
--- a/LayoutTests/fast/images/destroyed-image-load-event.html
+++ b/LayoutTests/fast/images/destroyed-image-load-event.html
@@ -4,9 +4,9 @@
<div id="testRun"></div>
<div id="container"></div>
<script>
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
}
function gc()
@@ -29,8 +29,8 @@
if (--remainingTestRuns < 0) {
testRunDiv.innerHTML = "PASS";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
return;
}
diff --git a/LayoutTests/fast/images/dont-crash-with-null-gif-frames.html b/LayoutTests/fast/images/dont-crash-with-null-gif-frames.html
index a630c3c..5b819bb 100644
--- a/LayoutTests/fast/images/dont-crash-with-null-gif-frames.html
+++ b/LayoutTests/fast/images/dont-crash-with-null-gif-frames.html
@@ -1,6 +1,6 @@
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
This tests passes if it doesn't crash.<br>
<img src=resources/quicksort.gif>
diff --git a/LayoutTests/fast/images/drag-pdf-as-image.html b/LayoutTests/fast/images/drag-pdf-as-image.html
index adc7973..681893e 100644
--- a/LayoutTests/fast/images/drag-pdf-as-image.html
+++ b/LayoutTests/fast/images/drag-pdf-as-image.html
@@ -3,10 +3,10 @@
<script type="text/javascript">
function test() {
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
- layoutTestController.dumpAsText();
+ testRunner.dumpAsText();
var dragMe = document.getElementById("dragMe");
var startX = dragMe.offsetLeft + (dragMe.offsetWidth / 2);
diff --git a/LayoutTests/fast/images/embed-does-not-propagate-dimensions-to-object-ancestor.html b/LayoutTests/fast/images/embed-does-not-propagate-dimensions-to-object-ancestor.html
index 4151abc..ed30f63 100644
--- a/LayoutTests/fast/images/embed-does-not-propagate-dimensions-to-object-ancestor.html
+++ b/LayoutTests/fast/images/embed-does-not-propagate-dimensions-to-object-ancestor.html
@@ -2,9 +2,9 @@
<head>
<!-- https://bugs.webkit.org/show_bug.cgi?id=17688 - ensure the <embed> element does not propagate its height and width to an object ancestor node -->
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function measure() {
@@ -13,7 +13,7 @@
&& document.getElementById("third").height == 100
&& document.getElementById("third").width == 100)
document.getElementById("console").innerHTML = "SUCCESS";
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
function test(){
diff --git a/LayoutTests/fast/images/embed-image.html b/LayoutTests/fast/images/embed-image.html
index 9d82e84..b6dbdf6 100644
--- a/LayoutTests/fast/images/embed-image.html
+++ b/LayoutTests/fast/images/embed-image.html
@@ -1,5 +1,5 @@
<script>
- if (window.layoutTestController)
- layoutTestController.setPluginsEnabled(false);
+ if (window.testRunner)
+ testRunner.setPluginsEnabled(false);
</script>
<embed src="../borders/resources/Balloon_8107502.tiff" width="38" height="24" type="image/tiff"></embed>
diff --git a/LayoutTests/fast/images/exif-orientation-css.html b/LayoutTests/fast/images/exif-orientation-css.html
index 838f6a1..cdd60cb 100644
--- a/LayoutTests/fast/images/exif-orientation-css.html
+++ b/LayoutTests/fast/images/exif-orientation-css.html
@@ -1,9 +1,9 @@
<html>
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.overridePreference('WebKitShouldRespectImageOrientation', 1);
- layoutTestController.dumpAsText(1);
+if (window.testRunner) {
+ testRunner.overridePreference('WebKitShouldRespectImageOrientation', 1);
+ testRunner.dumpAsText(1);
}
function log(str) {
@@ -32,7 +32,7 @@
</style>
</head>
<body onload="load()">
-<b>None of the images should be rotated. This test is only valid when run with layoutTestController (or with WebKitShouldRespectImageOrientation manually set to true).</b><br><br>
+<b>None of the images should be rotated. This test is only valid when run with testRunner (or with WebKitShouldRespectImageOrientation manually set to true).</b><br><br>
<div class="container"><div class="image" id="img1" style="content: url(resources/exif-orientation-1-ul.jpg)"></div><br>Normal</div>
<div class="container"><div class="image" id="img2" style="content: url(resources/exif-orientation-2-ur.jpg)"></div><br>Flipped horizontally</div>
<div class="container"><div class="image" id="img3" style="content: url(resources/exif-orientation-3-lr.jpg)"></div><br>Rotated 180°</div>
diff --git a/LayoutTests/fast/images/exif-orientation.html b/LayoutTests/fast/images/exif-orientation.html
index 4a8c425..f713240 100644
--- a/LayoutTests/fast/images/exif-orientation.html
+++ b/LayoutTests/fast/images/exif-orientation.html
@@ -1,9 +1,9 @@
<html>
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.overridePreference('WebKitShouldRespectImageOrientation', 1);
- layoutTestController.dumpAsText(1);
+if (window.testRunner) {
+ testRunner.overridePreference('WebKitShouldRespectImageOrientation', 1);
+ testRunner.dumpAsText(1);
}
function log(str) {
@@ -31,7 +31,7 @@
</style>
</head>
<body onload="load()">
-<b>The images should be rotated respecting their EXIF orientation. This test can only be run with layoutTestController (or by manually setting WebKitShouldRespectImageOrientation to true).</b><br><br>
+<b>The images should be rotated respecting their EXIF orientation. This test can only be run with testRunner (or by manually setting WebKitShouldRespectImageOrientation to true).</b><br><br>
<div><img id="img1" src="resources/exif-orientation-1-ul.jpg"><br>Normal</div>
<div><img id="img2" src="resources/exif-orientation-2-ur.jpg"><br>Flipped horizontally</div>
<div><img id="img3" src="resources/exif-orientation-3-lr.jpg"><br>Rotated 180°</div>
diff --git a/LayoutTests/fast/images/extra-image-in-image-document.html b/LayoutTests/fast/images/extra-image-in-image-document.html
index 5b83c7a..d59668d 100644
--- a/LayoutTests/fast/images/extra-image-in-image-document.html
+++ b/LayoutTests/fast/images/extra-image-in-image-document.html
@@ -4,17 +4,17 @@
<p id=result>Onload was not called, which is not good. But is the square below green?</p>
<iframe src="resources/test-load.jpg" width=100 height=100 frameborder=0></iframe>
<script>
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
}
function loaded()
{
if (frames[0].document.getElementById("green").naturalWidth == 16)
document.getElementById("result").innerHTML = "PASS";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function test()
diff --git a/LayoutTests/fast/images/gif-loop-count.html b/LayoutTests/fast/images/gif-loop-count.html
index 5ad3a63..de2d0820 100644
--- a/LayoutTests/fast/images/gif-loop-count.html
+++ b/LayoutTests/fast/images/gif-loop-count.html
@@ -2,16 +2,16 @@
<head>
<script>
function step2() {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function step1() {
document.getElementById('replaceme').src = 'resources/gif-loop-count.gif';
setTimeout("step2()", 200);
}
function test() {
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
}
setTimeout("step1()", 200);
}
diff --git a/LayoutTests/fast/images/image-empty-data.html b/LayoutTests/fast/images/image-empty-data.html
index bc7aa50..1edb4da 100644
--- a/LayoutTests/fast/images/image-empty-data.html
+++ b/LayoutTests/fast/images/image-empty-data.html
@@ -2,8 +2,8 @@
<head>
<title></title>
<script type="text/javascript">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/images/image-invalid-data.html b/LayoutTests/fast/images/image-invalid-data.html
index 5313b8e..9de10c4 100644
--- a/LayoutTests/fast/images/image-invalid-data.html
+++ b/LayoutTests/fast/images/image-invalid-data.html
@@ -1,8 +1,8 @@
<html>
<head>
<script type="text/javascript">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/images/image-load-event-in-fragment.html b/LayoutTests/fast/images/image-load-event-in-fragment.html
index 20b8551..5291a1d 100644
--- a/LayoutTests/fast/images/image-load-event-in-fragment.html
+++ b/LayoutTests/fast/images/image-load-event-in-fragment.html
@@ -6,9 +6,9 @@
<!-- Preload an image, possibly making second load synchronous -->
<img src="resources/boston.gif" style="visibility:hidden">
<script>
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
}
function test()
{
@@ -25,8 +25,8 @@
{
// There is code on the Web expecting that an image is in the document by the time its load event fires.
document.getElementById("result").innerHTML = (document.getElementById("new")) ? "PASS" : "FAIL";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
</body>
diff --git a/LayoutTests/fast/images/image-map-multiple-xhtml.xhtml b/LayoutTests/fast/images/image-map-multiple-xhtml.xhtml
index c9ba624..b42b07c 100644
--- a/LayoutTests/fast/images/image-map-multiple-xhtml.xhtml
+++ b/LayoutTests/fast/images/image-map-multiple-xhtml.xhtml
@@ -63,7 +63,7 @@
document.getElementById("log").textContent = "To run the test manually, click " + numClicks + " times in the image rectangle.\n";
return;
}
- layoutTestController.dumpAsText();
+ testRunner.dumpAsText();
eventSender.mouseMoveTo(50, 50);
for (var click = 0; numClicks > click; ++click) {
eventSender.mouseDown();
diff --git a/LayoutTests/fast/images/image-map-multiple.html b/LayoutTests/fast/images/image-map-multiple.html
index 0fea520..1e8aeda 100644
--- a/LayoutTests/fast/images/image-map-multiple.html
+++ b/LayoutTests/fast/images/image-map-multiple.html
@@ -59,7 +59,7 @@
document.getElementById("log").textContent = "To run the test manually, click " + numClicks + " times in the image rectangle.\n";
return;
}
- layoutTestController.dumpAsText();
+ testRunner.dumpAsText();
eventSender.mouseMoveTo(50, 50);
for (var click = 0; click < numClicks; ++click) {
eventSender.mouseDown();
diff --git a/LayoutTests/fast/images/image-map-zoom.html b/LayoutTests/fast/images/image-map-zoom.html
index 187be2e..6592132 100644
--- a/LayoutTests/fast/images/image-map-zoom.html
+++ b/LayoutTests/fast/images/image-map-zoom.html
@@ -9,7 +9,7 @@
if (!window.eventSender)
return;
- layoutTestController.dumpAsText();
+ testRunner.dumpAsText();
eventSender.mouseMoveTo(340, 140);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/images/imagemap-scroll.html b/LayoutTests/fast/images/imagemap-scroll.html
index 833f6d1..12ebaa3 100644
--- a/LayoutTests/fast/images/imagemap-scroll.html
+++ b/LayoutTests/fast/images/imagemap-scroll.html
@@ -9,8 +9,8 @@
}
function runTest()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
if (document.body.scrollTop == 0)
log("PASS: Document is starting scrolled to top.");
else
diff --git a/LayoutTests/fast/images/jpeg-with-color-profile.html b/LayoutTests/fast/images/jpeg-with-color-profile.html
index d632a8a..d655bc7 100644
--- a/LayoutTests/fast/images/jpeg-with-color-profile.html
+++ b/LayoutTests/fast/images/jpeg-with-color-profile.html
@@ -1,6 +1,6 @@
The red sector of the image should be at the 12 o'clock position.</p>
<img src="resources/red-at-12-oclock-with-color-profile.jpg" width="400px">
<script>
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText(pixelTest = true);
+if (window.testRunner)
+ window.testRunner.dumpAsText(pixelTest = true);
</script>
diff --git a/LayoutTests/fast/images/large-size-image-crash.html b/LayoutTests/fast/images/large-size-image-crash.html
index fa32d5f..152e204 100644
--- a/LayoutTests/fast/images/large-size-image-crash.html
+++ b/LayoutTests/fast/images/large-size-image-crash.html
@@ -1,8 +1,8 @@
<html>
<head>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/images/link-body-content-imageDimensionChanged-crash.html b/LayoutTests/fast/images/link-body-content-imageDimensionChanged-crash.html
index 2cd9703..63ea493 100644
--- a/LayoutTests/fast/images/link-body-content-imageDimensionChanged-crash.html
+++ b/LayoutTests/fast/images/link-body-content-imageDimensionChanged-crash.html
@@ -8,8 +8,8 @@
}
</style>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<p> Bug <a href="http://webkit.org/b/85912">85912</a>: Crash in computedCSSPadding* functions due to RenderImage::imageDimensionsChanged called during attachment</p>
diff --git a/LayoutTests/fast/images/load-img-with-empty-src.html b/LayoutTests/fast/images/load-img-with-empty-src.html
index 6407ae4..891d3d9 100644
--- a/LayoutTests/fast/images/load-img-with-empty-src.html
+++ b/LayoutTests/fast/images/load-img-with-empty-src.html
@@ -10,8 +10,8 @@
document.getElementById("console").appendChild(paragraph);
}
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
}
var results = [true, true, false, false];
diff --git a/LayoutTests/fast/images/paletted-png-with-color-profile.html b/LayoutTests/fast/images/paletted-png-with-color-profile.html
index 543168d..3e97707 100644
--- a/LayoutTests/fast/images/paletted-png-with-color-profile.html
+++ b/LayoutTests/fast/images/paletted-png-with-color-profile.html
@@ -1,5 +1,5 @@
<img src="resources/palatted-color-png-gamma-one-color-profile.png">
<script>
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText(pixelTest = true);
+if (window.testRunner)
+ window.testRunner.dumpAsText(pixelTest = true);
</script>
diff --git a/LayoutTests/fast/images/percent-height-image.html b/LayoutTests/fast/images/percent-height-image.html
index 884041d..7322ada 100644
--- a/LayoutTests/fast/images/percent-height-image.html
+++ b/LayoutTests/fast/images/percent-height-image.html
@@ -8,9 +8,9 @@
</div>
<pre></pre>
<script>
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
}
function check() {
@@ -21,6 +21,6 @@
out.textContent = "PASS";
else
out.textContent = "FAIL: image height was " + actual + " expected " + expected;
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/fast/images/png-extra-row-crash.html b/LayoutTests/fast/images/png-extra-row-crash.html
index 6d05101..5856ac6 100644
--- a/LayoutTests/fast/images/png-extra-row-crash.html
+++ b/LayoutTests/fast/images/png-extra-row-crash.html
@@ -1,8 +1,8 @@
<html>
<head>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function loaded()
{
var p = document.createElement("p");
diff --git a/LayoutTests/fast/images/png-suite/test.html b/LayoutTests/fast/images/png-suite/test.html
index 5eefbc7..da3c522 100644
--- a/LayoutTests/fast/images/png-suite/test.html
+++ b/LayoutTests/fast/images/png-suite/test.html
@@ -184,6 +184,6 @@
<img src=samples/z06n2c08.png>
<img src=samples/z09n2c08.png>
<script>
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText(pixelTest = true);
+if (window.testRunner)
+ window.testRunner.dumpAsText(pixelTest = true);
</script>
diff --git a/LayoutTests/fast/images/png-with-color-profile.html b/LayoutTests/fast/images/png-with-color-profile.html
index 604021c..0e99abf 100644
--- a/LayoutTests/fast/images/png-with-color-profile.html
+++ b/LayoutTests/fast/images/png-with-color-profile.html
@@ -1,6 +1,6 @@
The red sector of the image should be at the 12 o'clock position.</p>
<img src="resources/red-at-12-oclock-with-color-profile.png" width="400px">
<script>
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText(pixelTest = true);
+if (window.testRunner)
+ window.testRunner.dumpAsText(pixelTest = true);
</script>
diff --git a/LayoutTests/fast/images/read-past-end-of-buffer.html b/LayoutTests/fast/images/read-past-end-of-buffer.html
index 432a224..f53a825 100644
--- a/LayoutTests/fast/images/read-past-end-of-buffer.html
+++ b/LayoutTests/fast/images/read-past-end-of-buffer.html
@@ -1,6 +1,6 @@
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
This test passes if no heap errors are detected during decoding.<br>
<img src=resources/wrong-block-length.gif>
diff --git a/LayoutTests/fast/images/rgb-jpeg-endian-pixels.html b/LayoutTests/fast/images/rgb-jpeg-endian-pixels.html
index 68cf940..a56a5b3 100644
--- a/LayoutTests/fast/images/rgb-jpeg-endian-pixels.html
+++ b/LayoutTests/fast/images/rgb-jpeg-endian-pixels.html
@@ -9,9 +9,9 @@
<pre id="log">PASS</pre>
<script>
-if (window.layoutTestController) {
- window.layoutTestController.waitUntilDone();
- window.layoutTestController.dumpAsText();
+if (window.testRunner) {
+ window.testRunner.waitUntilDone();
+ window.testRunner.dumpAsText();
}
function log(message)
@@ -70,7 +70,7 @@
log('FAIL: ' + e.message);
}
- if (window.layoutTestController)
- window.layoutTestController.notifyDone();
+ if (window.testRunner)
+ window.testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/fast/images/rgb-jpeg-with-adobe-marker-only.html b/LayoutTests/fast/images/rgb-jpeg-with-adobe-marker-only.html
index 24ba960..9aeaf43 100644
--- a/LayoutTests/fast/images/rgb-jpeg-with-adobe-marker-only.html
+++ b/LayoutTests/fast/images/rgb-jpeg-with-adobe-marker-only.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<img src="resources/rgb-jpeg-with-adobe-marker-only.jpg">
<script>
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText(pixelTest = true);
+if (window.testRunner)
+ window.testRunner.dumpAsText(pixelTest = true);
</script>
diff --git a/LayoutTests/fast/images/rgb-png-with-cmyk-color-profile.html b/LayoutTests/fast/images/rgb-png-with-cmyk-color-profile.html
index 0febef4..a9523b2 100644
--- a/LayoutTests/fast/images/rgb-png-with-cmyk-color-profile.html
+++ b/LayoutTests/fast/images/rgb-png-with-cmyk-color-profile.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<img src="resources/rgb-png-with-cmyk-color-profile.png" width="600px" height="213px">
<script>
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText(pixelTest = true);
+if (window.testRunner)
+ window.testRunner.dumpAsText(pixelTest = true);
</script>
diff --git a/LayoutTests/fast/images/script-counter-imageDimensionChanged-crash.html b/LayoutTests/fast/images/script-counter-imageDimensionChanged-crash.html
index a5820c2..385d2f7 100644
--- a/LayoutTests/fast/images/script-counter-imageDimensionChanged-crash.html
+++ b/LayoutTests/fast/images/script-counter-imageDimensionChanged-crash.html
@@ -12,8 +12,8 @@
}
</style>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<p> Bug <a href="http://webkit.org/b/85912">85912</a>: Crash in computedCSSPadding* functions due to RenderImage::imageDimensionsChanged called during attachment</p>
diff --git a/LayoutTests/fast/images/script-tests/move-image-to-new-document.js b/LayoutTests/fast/images/script-tests/move-image-to-new-document.js
index 0b070f2..b85ec29 100644
--- a/LayoutTests/fast/images/script-tests/move-image-to-new-document.js
+++ b/LayoutTests/fast/images/script-tests/move-image-to-new-document.js
@@ -1,7 +1,7 @@
description("Test that when images are moved to a new document, a new load fires.");
-if (window.layoutTestController)
- layoutTestController.setPluginsEnabled(false);
+if (window.testRunner)
+ testRunner.setPluginsEnabled(false);
jsTestIsAsync = true;
diff --git a/LayoutTests/fast/images/size-failure.html b/LayoutTests/fast/images/size-failure.html
index 28d48dd..6985ebc 100644
--- a/LayoutTests/fast/images/size-failure.html
+++ b/LayoutTests/fast/images/size-failure.html
@@ -1,8 +1,8 @@
<html>
<head>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
diff --git a/LayoutTests/fast/images/style-access-during-imageChanged-crash.html b/LayoutTests/fast/images/style-access-during-imageChanged-crash.html
index 6ddd729..f213950 100644
--- a/LayoutTests/fast/images/style-access-during-imageChanged-crash.html
+++ b/LayoutTests/fast/images/style-access-during-imageChanged-crash.html
@@ -17,8 +17,8 @@
document.getElementById("target").src = "data:text/plain,2";
}
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
test();
</script>
diff --git a/LayoutTests/fast/images/style-access-during-imageChanged-style-freeze.html b/LayoutTests/fast/images/style-access-during-imageChanged-style-freeze.html
index ee05259..f2c544a 100644
--- a/LayoutTests/fast/images/style-access-during-imageChanged-style-freeze.html
+++ b/LayoutTests/fast/images/style-access-during-imageChanged-style-freeze.html
@@ -12,8 +12,8 @@
<div id="result"></div>
<script>
onload = function() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
document.body.offsetTop;
var container = document.getElementById("container");
diff --git a/LayoutTests/fast/images/support-broken-image-delegate.html b/LayoutTests/fast/images/support-broken-image-delegate.html
index 062f50f..0b5170e 100644
--- a/LayoutTests/fast/images/support-broken-image-delegate.html
+++ b/LayoutTests/fast/images/support-broken-image-delegate.html
@@ -2,11 +2,11 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpResourceLoadCallbacks();
- layoutTestController.dumpAsText();
- layoutTestController.setShouldPaintBrokenImage(false);
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpResourceLoadCallbacks();
+ testRunner.dumpAsText();
+ testRunner.setShouldPaintBrokenImage(false);
+ testRunner.waitUntilDone();
}
function loaded() {
@@ -14,9 +14,9 @@
var img = document.getElementById('img');
// The default broken image height in mac is 20.
result.innerHTML = img.offsetHeight >= 10 ? "FAIL" : "PASS";
- if (window.layoutTestController) {
- layoutTestController.setShouldPaintBrokenImage(true);
- layoutTestController.notifyDone();
+ if (window.testRunner) {
+ testRunner.setShouldPaintBrokenImage(true);
+ testRunner.notifyDone();
}
}
@@ -24,9 +24,9 @@
var result = document.getElementById('result');
// Report 'FAIL' if WebCore didn't report onError on broken image.
result.innerHTML = "FAIL";
- if (window.layoutTestController) {
- layoutTestController.setShouldPaintBrokenImage(true);
- layoutTestController.notifyDone();
+ if (window.testRunner) {
+ testRunner.setShouldPaintBrokenImage(true);
+ testRunner.notifyDone();
}
}
</script>
diff --git a/LayoutTests/fast/images/text-content-crash-2.html b/LayoutTests/fast/images/text-content-crash-2.html
index 341cf57..7dbf6cf 100644
--- a/LayoutTests/fast/images/text-content-crash-2.html
+++ b/LayoutTests/fast/images/text-content-crash-2.html
@@ -2,8 +2,8 @@
<head>
<title></title>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/images/text-content-crash.html b/LayoutTests/fast/images/text-content-crash.html
index 2a5c950..52011ae 100644
--- a/LayoutTests/fast/images/text-content-crash.html
+++ b/LayoutTests/fast/images/text-content-crash.html
@@ -2,8 +2,8 @@
<head>
<title></title>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/images/webp-image-decoding.html b/LayoutTests/fast/images/webp-image-decoding.html
index 8f37eef..36caecf 100644
--- a/LayoutTests/fast/images/webp-image-decoding.html
+++ b/LayoutTests/fast/images/webp-image-decoding.html
@@ -1,8 +1,8 @@
<html>
<body>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
window.onload = function() {
document.getElementById('results').innerHTML =
diff --git a/LayoutTests/fast/images/ycbcr-with-cmyk-color-profile.html b/LayoutTests/fast/images/ycbcr-with-cmyk-color-profile.html
index b60de67..b270056 100644
--- a/LayoutTests/fast/images/ycbcr-with-cmyk-color-profile.html
+++ b/LayoutTests/fast/images/ycbcr-with-cmyk-color-profile.html
@@ -2,6 +2,6 @@
<img src="resources/ycbcr-with-cmyk-color-profile.jpg" width="350" height="350">
<img src="resources/ycbcr-with-no-color-profile.jpg" width="350" height="350">
<script>
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText(pixelTest = true);
+if (window.testRunner)
+ window.testRunner.dumpAsText(pixelTest = true);
</script>
diff --git a/LayoutTests/fast/images/zoomed-img-size.html b/LayoutTests/fast/images/zoomed-img-size.html
index 4e6a26d..a4338d0 100644
--- a/LayoutTests/fast/images/zoomed-img-size.html
+++ b/LayoutTests/fast/images/zoomed-img-size.html
@@ -2,8 +2,8 @@
<html>
<head>
<script type="text/javascript">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function update() {
// These arrays will become unnecessary if we fix the rounding issues that make us not always report "37x33".
