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/hidpi/broken-image-icon-hidpi.html b/LayoutTests/fast/hidpi/broken-image-icon-hidpi.html
index da4d837..923b69a 100644
--- a/LayoutTests/fast/hidpi/broken-image-icon-hidpi.html
+++ b/LayoutTests/fast/hidpi/broken-image-icon-hidpi.html
@@ -1,14 +1,14 @@
<html>
<script>
function startTest() {
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, finishTest);
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, finishTest);
}
}
function finishTest() {
- setTimeout(function() { layoutTestController.notifyDone(); }, 0);
+ setTimeout(function() { testRunner.notifyDone(); }, 0);
}
</script>
</head>
diff --git a/LayoutTests/fast/hidpi/broken-image-with-size-hidpi.html b/LayoutTests/fast/hidpi/broken-image-with-size-hidpi.html
index 54956e4..547636c 100644
--- a/LayoutTests/fast/hidpi/broken-image-with-size-hidpi.html
+++ b/LayoutTests/fast/hidpi/broken-image-with-size-hidpi.html
@@ -1,14 +1,14 @@
<html>
<script>
function startTest() {
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, finishTest);
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, finishTest);
}
}
function finishTest() {
- setTimeout(function() { layoutTestController.notifyDone(); }, 0);
+ setTimeout(function() { testRunner.notifyDone(); }, 0);
}
</script>
</head>
diff --git a/LayoutTests/fast/hidpi/clip-text-in-hidpi.html b/LayoutTests/fast/hidpi/clip-text-in-hidpi.html
index 229ccae..df76785 100644
--- a/LayoutTests/fast/hidpi/clip-text-in-hidpi.html
+++ b/LayoutTests/fast/hidpi/clip-text-in-hidpi.html
@@ -2,16 +2,16 @@
<head>
<script>
function startTest() {
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, finishTest);
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, finishTest);
}
}
function finishTest() {
var test = document.getElementById("test");
test.innerHTML = window.devicePixelRatio;
- setTimeout(function() { layoutTestController.notifyDone(); }, 0);
+ setTimeout(function() { testRunner.notifyDone(); }, 0);
}
</script>
</head>
diff --git a/LayoutTests/fast/hidpi/device-scale-factor-paint.html b/LayoutTests/fast/hidpi/device-scale-factor-paint.html
index 8c47e91..4a7adca 100644
--- a/LayoutTests/fast/hidpi/device-scale-factor-paint.html
+++ b/LayoutTests/fast/hidpi/device-scale-factor-paint.html
@@ -2,14 +2,14 @@
<html>
<script>
function startTest() {
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, finishTest);
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, finishTest);
}
}
function finishTest() {
- setTimeout(function() { layoutTestController.notifyDone() }, 0);
+ setTimeout(function() { testRunner.notifyDone() }, 0);
}
</script>
</head>
diff --git a/LayoutTests/fast/hidpi/focus-rings.html b/LayoutTests/fast/hidpi/focus-rings.html
index 8afd3cb..26a2f0c 100644
--- a/LayoutTests/fast/hidpi/focus-rings.html
+++ b/LayoutTests/fast/hidpi/focus-rings.html
@@ -1,16 +1,16 @@
<html>
<script>
function startTest() {
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, finishTest);
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, finishTest);
}
}
function finishTest() {
var div = document.getElementById("div");
div.focus();
- setTimeout(function() { layoutTestController.notifyDone(); }, 0);
+ setTimeout(function() { testRunner.notifyDone(); }, 0);
}
</script>
</head>
diff --git a/LayoutTests/fast/hidpi/image-set-as-background.html b/LayoutTests/fast/hidpi/image-set-as-background.html
index 382c402..5627194 100644
--- a/LayoutTests/fast/hidpi/image-set-as-background.html
+++ b/LayoutTests/fast/hidpi/image-set-as-background.html
@@ -2,18 +2,18 @@
<head>
<script>
function runTest() {
- if (!window.layoutTestController || !window.sessionStorage)
+ if (!window.testRunner || !window.sessionStorage)
return;
if (!sessionStorage.scaleFactorIsSet) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, scaleFactorIsSet);
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, scaleFactorIsSet);
}
if (sessionStorage.pageReloaded && sessionStorage.scaleFactorIsSet) {
delete sessionStorage.pageReloaded;
delete sessionStorage.scaleFactorIsSet;
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
} else {
// Right now there is a bug that image-set does not properly deal with dynamic changes to the scale factor,
// so to work around that, we must reload the page to get the 2x image.
diff --git a/LayoutTests/fast/hidpi/image-set-background-dynamic.html b/LayoutTests/fast/hidpi/image-set-background-dynamic.html
index b70065d..22db17b 100644
--- a/LayoutTests/fast/hidpi/image-set-background-dynamic.html
+++ b/LayoutTests/fast/hidpi/image-set-background-dynamic.html
@@ -3,16 +3,16 @@
<head>
<script>
function startTest() {
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, finishTest);
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, finishTest);
}
}
function finishTest() {
var test = document.getElementById("foo");
test.innerHTML = window.devicePixelRatio;
- setTimeout(function() { layoutTestController.notifyDone(); }, 0);
+ setTimeout(function() { testRunner.notifyDone(); }, 0);
}
</script>
diff --git a/LayoutTests/fast/hidpi/image-set-background-repeat-without-size.html b/LayoutTests/fast/hidpi/image-set-background-repeat-without-size.html
index 867acf2..a8d2cec 100644
--- a/LayoutTests/fast/hidpi/image-set-background-repeat-without-size.html
+++ b/LayoutTests/fast/hidpi/image-set-background-repeat-without-size.html
@@ -2,18 +2,18 @@
<head>
<script>
function runTest() {
- if (!window.layoutTestController || !window.sessionStorage)
+ if (!window.testRunner || !window.sessionStorage)
return;
if (!sessionStorage.scaleFactorIsSet) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, scaleFactorIsSet);
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, scaleFactorIsSet);
}
if (sessionStorage.pageReloaded && sessionStorage.scaleFactorIsSet) {
delete sessionStorage.pageReloaded;
delete sessionStorage.scaleFactorIsSet;
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
} else {
// Right now there is a bug that image-set does not properly deal with dynamic changes to the scale factor,
// so to work around that, we must reload the page to get the 2x image.
diff --git a/LayoutTests/fast/hidpi/image-set-background-repeat.html b/LayoutTests/fast/hidpi/image-set-background-repeat.html
index b51716d..2ddea70 100644
--- a/LayoutTests/fast/hidpi/image-set-background-repeat.html
+++ b/LayoutTests/fast/hidpi/image-set-background-repeat.html
@@ -2,18 +2,18 @@
<head>
<script>
function runTest() {
- if (!window.layoutTestController || !window.sessionStorage)
+ if (!window.testRunner || !window.sessionStorage)
return;
if (!sessionStorage.scaleFactorIsSet) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, scaleFactorIsSet);
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, scaleFactorIsSet);
}
if (sessionStorage.pageReloaded && sessionStorage.scaleFactorIsSet) {
delete sessionStorage.pageReloaded;
delete sessionStorage.scaleFactorIsSet;
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
} else {
// Right now there is a bug that image-set does not properly deal with dynamic changes to the scale factor,
// so to work around that, we must reload the page to get the 2x image.
diff --git a/LayoutTests/fast/hidpi/image-set-border-image-comparison.html b/LayoutTests/fast/hidpi/image-set-border-image-comparison.html
index b28c5c8..64eeb3b 100644
--- a/LayoutTests/fast/hidpi/image-set-border-image-comparison.html
+++ b/LayoutTests/fast/hidpi/image-set-border-image-comparison.html
@@ -2,14 +2,14 @@
<head>
<script>
function startTest() {
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, finishTest);
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, finishTest);
}
}
function finishTest() {
- setTimeout(function() { layoutTestController.notifyDone(); }, 0);
+ setTimeout(function() { testRunner.notifyDone(); }, 0);
}
</script>
diff --git a/LayoutTests/fast/hidpi/image-set-border-image-dynamic.html b/LayoutTests/fast/hidpi/image-set-border-image-dynamic.html
index 3b976bf..a3835d0 100644
--- a/LayoutTests/fast/hidpi/image-set-border-image-dynamic.html
+++ b/LayoutTests/fast/hidpi/image-set-border-image-dynamic.html
@@ -3,16 +3,16 @@
<head>
<script>
function startTest() {
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, finishTest);
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, finishTest);
}
}
function finishTest() {
var test = document.getElementById("foo");
test.innerHTML = window.devicePixelRatio;
- setTimeout(function() { layoutTestController.notifyDone(); }, 0);
+ setTimeout(function() { testRunner.notifyDone(); }, 0);
}
</script>
diff --git a/LayoutTests/fast/hidpi/image-set-border-image-simple.html b/LayoutTests/fast/hidpi/image-set-border-image-simple.html
index 211f50d..d805982 100644
--- a/LayoutTests/fast/hidpi/image-set-border-image-simple.html
+++ b/LayoutTests/fast/hidpi/image-set-border-image-simple.html
@@ -2,18 +2,18 @@
<head>
<script>
function runTest() {
- if (!window.layoutTestController || !window.sessionStorage)
+ if (!window.testRunner || !window.sessionStorage)
return;
if (!sessionStorage.scaleFactorIsSet) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, scaleFactorIsSet);
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, scaleFactorIsSet);
}
if (sessionStorage.pageReloaded && sessionStorage.scaleFactorIsSet) {
delete sessionStorage.pageReloaded;
delete sessionStorage.scaleFactorIsSet;
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
} else {
// Right now there is a bug that image-set does not properly deal with dynamic changes to the scale factor,
// so to work around that, we must reload the page to get the 2x image.
diff --git a/LayoutTests/fast/hidpi/image-set-in-content-dynamic.html b/LayoutTests/fast/hidpi/image-set-in-content-dynamic.html
index 040b6bd..5f5ec50b 100644
--- a/LayoutTests/fast/hidpi/image-set-in-content-dynamic.html
+++ b/LayoutTests/fast/hidpi/image-set-in-content-dynamic.html
@@ -3,16 +3,16 @@
<head>
<script>
function startTest() {
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, finishTest);
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, finishTest);
}
}
function finishTest() {
var test = document.getElementById("foo");
test.innerHTML = window.devicePixelRatio;
- setTimeout(function() { layoutTestController.notifyDone(); }, 0);
+ setTimeout(function() { testRunner.notifyDone(); }, 0);
}
</script>
diff --git a/LayoutTests/fast/hidpi/image-set-out-of-order.html b/LayoutTests/fast/hidpi/image-set-out-of-order.html
index 670c652..313de5f 100644
--- a/LayoutTests/fast/hidpi/image-set-out-of-order.html
+++ b/LayoutTests/fast/hidpi/image-set-out-of-order.html
@@ -2,18 +2,18 @@
<head>
<script>
function runTest() {
- if (!window.layoutTestController || !window.sessionStorage)
+ if (!window.testRunner || !window.sessionStorage)
return;
if (!sessionStorage.scaleFactorIsSet) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, scaleFactorIsSet);
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, scaleFactorIsSet);
}
if (sessionStorage.pageReloaded && sessionStorage.scaleFactorIsSet) {
delete sessionStorage.pageReloaded;
delete sessionStorage.scaleFactorIsSet;
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
} else {
// Right now there is a bug that image-set does not properly deal with dynamic changes to the scale factor,
// so to work around that, we must reload the page to get the 2x image.
diff --git a/LayoutTests/fast/hidpi/image-set-simple.html b/LayoutTests/fast/hidpi/image-set-simple.html
index 1b12b8d..2c83a69 100644
--- a/LayoutTests/fast/hidpi/image-set-simple.html
+++ b/LayoutTests/fast/hidpi/image-set-simple.html
@@ -2,18 +2,18 @@
<head>
<script>
function runTest() {
- if (!window.layoutTestController || !window.sessionStorage)
+ if (!window.testRunner || !window.sessionStorage)
return;
if (!sessionStorage.scaleFactorIsSet) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, scaleFactorIsSet);
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, scaleFactorIsSet);
}
if (sessionStorage.pageReloaded && sessionStorage.scaleFactorIsSet) {
delete sessionStorage.pageReloaded;
delete sessionStorage.scaleFactorIsSet;
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
} else {
// Right now there is a bug that image-set does not properly deal with dynamic changes to the scale factor,
// so to work around that, we must reload the page to get the 2x image.
diff --git a/LayoutTests/fast/hidpi/image-set-without-specified-width.html b/LayoutTests/fast/hidpi/image-set-without-specified-width.html
index b808547..8ecac49 100644
--- a/LayoutTests/fast/hidpi/image-set-without-specified-width.html
+++ b/LayoutTests/fast/hidpi/image-set-without-specified-width.html
@@ -2,18 +2,18 @@
<head>
<script>
function runTest() {
- if (!window.layoutTestController || !window.sessionStorage)
+ if (!window.testRunner || !window.sessionStorage)
return;
if (!sessionStorage.scaleFactorIsSet) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, scaleFactorIsSet);
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, scaleFactorIsSet);
}
if (sessionStorage.pageReloaded && sessionStorage.scaleFactorIsSet) {
delete sessionStorage.pageReloaded;
delete sessionStorage.scaleFactorIsSet;
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
} else {
// Right now there is a bug that image-set does not properly deal with dynamic changes to the scale factor,
// so to work around that, we must reload the page to get the 2x image.
diff --git a/LayoutTests/fast/hidpi/resize-corner-hidpi.html b/LayoutTests/fast/hidpi/resize-corner-hidpi.html
index ebd37f5..3d57d50 100644
--- a/LayoutTests/fast/hidpi/resize-corner-hidpi.html
+++ b/LayoutTests/fast/hidpi/resize-corner-hidpi.html
@@ -1,14 +1,14 @@
<html>
<script>
function startTest() {
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, finishTest);
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, finishTest);
}
}
function finishTest() {
- setTimeout(function() { layoutTestController.notifyDone(); }, 0);
+ setTimeout(function() { testRunner.notifyDone(); }, 0);
}
</script>
</head>
diff --git a/LayoutTests/fast/hidpi/video-controls-in-hidpi.html b/LayoutTests/fast/hidpi/video-controls-in-hidpi.html
index 4b2eb02..896522a 100644
--- a/LayoutTests/fast/hidpi/video-controls-in-hidpi.html
+++ b/LayoutTests/fast/hidpi/video-controls-in-hidpi.html
@@ -1,14 +1,14 @@
<html>
<script>
function startTest() {
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.setBackingScaleFactor(2, finishTest);
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.setBackingScaleFactor(2, finishTest);
}
}
function finishTest() {
- setTimeout(function() { layoutTestController.notifyDone(); }, 0);
+ setTimeout(function() { testRunner.notifyDone(); }, 0);
}
</script>
</head>
diff --git a/LayoutTests/fast/history/back-forward-reset-after-error-handling.html b/LayoutTests/fast/history/back-forward-reset-after-error-handling.html
index 7f26c2c..43d663a 100644
--- a/LayoutTests/fast/history/back-forward-reset-after-error-handling.html
+++ b/LayoutTests/fast/history/back-forward-reset-after-error-handling.html
@@ -20,11 +20,11 @@
" console.innerHTML = 'FAIL'; "+
"}";
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
- layoutTestController.handleErrorPages();
- layoutTestController.dumpBackForwardList();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+ testRunner.handleErrorPages();
+ testRunner.dumpBackForwardList();
}
function onPageShow(evt)
@@ -32,11 +32,11 @@
if (!evt.persisted) {
// this is the first time the page has been loaded, then setup the
// to-be-tested scenario.
- layoutTestController.queueLoad("./non-existent.html");
- layoutTestController.queueBackNavigation(1);
- layoutTestController.queueForwardNavigation(1);
- layoutTestController.queueBackNavigation(1);
- layoutTestController.queueNonLoadingScript("eval(\"" + isOkToContinue + "\")");
+ testRunner.queueLoad("./non-existent.html");
+ testRunner.queueBackNavigation(1);
+ testRunner.queueForwardNavigation(1);
+ testRunner.queueBackNavigation(1);
+ testRunner.queueNonLoadingScript("eval(\"" + isOkToContinue + "\")");
}
}
diff --git a/LayoutTests/fast/history/form-submit-in-frame-via-onclick.html b/LayoutTests/fast/history/form-submit-in-frame-via-onclick.html
index cf56544..d108a5e 100644
--- a/LayoutTests/fast/history/form-submit-in-frame-via-onclick.html
+++ b/LayoutTests/fast/history/form-submit-in-frame-via-onclick.html
@@ -8,11 +8,11 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
- layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
}
var formSubmitted = false;
diff --git a/LayoutTests/fast/history/form-submit-in-frame.html b/LayoutTests/fast/history/form-submit-in-frame.html
index 77f1cc6..7ac0d82 100644
--- a/LayoutTests/fast/history/form-submit-in-frame.html
+++ b/LayoutTests/fast/history/form-submit-in-frame.html
@@ -8,11 +8,11 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
- layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
}
var formSubmitted = false;
diff --git a/LayoutTests/fast/history/forward-during-load.html b/LayoutTests/fast/history/forward-during-load.html
index 5dfe832..e2ecdf5 100644
--- a/LayoutTests/fast/history/forward-during-load.html
+++ b/LayoutTests/fast/history/forward-during-load.html
@@ -1,8 +1,8 @@
<html>
<head>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
history.forward();
</script>
</head>
diff --git a/LayoutTests/fast/history/gesture-before-onload-form-submit.html b/LayoutTests/fast/history/gesture-before-onload-form-submit.html
index a2d1aec..0a34939 100644
--- a/LayoutTests/fast/history/gesture-before-onload-form-submit.html
+++ b/LayoutTests/fast/history/gesture-before-onload-form-submit.html
@@ -7,9 +7,9 @@
<div id="manual-explanation" style="display: none; color: blue">When running this test outside of DRT, please click on the "Navigate" button.</div>
</body>
<script>
- if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.waitUntilDone();
}
if (window.eventSender) {
diff --git a/LayoutTests/fast/history/gesture-before-onload-location-href.html b/LayoutTests/fast/history/gesture-before-onload-location-href.html
index 4c5754a..319548e 100644
--- a/LayoutTests/fast/history/gesture-before-onload-location-href.html
+++ b/LayoutTests/fast/history/gesture-before-onload-location-href.html
@@ -5,9 +5,9 @@
<div id="manual-explanation" style="display: none; color: blue">When running this test outside of DRT, please click on the "Navigate" button.</div>
</body>
<script>
- if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.waitUntilDone();
}
if (window.eventSender) {
diff --git a/LayoutTests/fast/history/go-back-to-changed-name.html b/LayoutTests/fast/history/go-back-to-changed-name.html
index 9c8d705..286bd9c 100644
--- a/LayoutTests/fast/history/go-back-to-changed-name.html
+++ b/LayoutTests/fast/history/go-back-to-changed-name.html
@@ -2,8 +2,8 @@
var tmp = window.name;
window.name = "crash";
- layoutTestController.dumpAsText();
- layoutTestController.queueLoad("resources/go-back-to-changed-name2.html?" + tmp);
- layoutTestController.queueLoad("resources/go-back-to-changed-name3.html");
- layoutTestController.queueBackNavigation(1);
+ testRunner.dumpAsText();
+ testRunner.queueLoad("resources/go-back-to-changed-name2.html?" + tmp);
+ testRunner.queueLoad("resources/go-back-to-changed-name3.html");
+ testRunner.queueBackNavigation(1);
</script>
diff --git a/LayoutTests/fast/history/history-back-initial-vs-final-url.html b/LayoutTests/fast/history/history-back-initial-vs-final-url.html
index 04055c5..d0fb192 100644
--- a/LayoutTests/fast/history/history-back-initial-vs-final-url.html
+++ b/LayoutTests/fast/history/history-back-initial-vs-final-url.html
@@ -14,11 +14,11 @@
<iframe a width="200" height="200" onunload="" src="resources/frame-initial-url.html"></iframe>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpChildFramesAsText();
- layoutTestController.waitUntilDone();
- layoutTestController.dumpBackForwardList();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
+ testRunner.waitUntilDone();
+ testRunner.dumpBackForwardList();
} else {
// Disable page cache when not running under the DRT.
onunload = function() {};
@@ -28,8 +28,8 @@
{
if (sessionStorage.didNav) {
delete sessionStorage.didNav;
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
} else {
// Navigate a timeout to make sure we generate a history entry that we can go back to.
setTimeout(function() {location.href = 'data:text/html,<script>alert("Going back.");history.back();</' + 'script>';}, 0);
diff --git a/LayoutTests/fast/history/history-back-twice-with-subframes-assert.html b/LayoutTests/fast/history/history-back-twice-with-subframes-assert.html
index 52edc83..2d2bafd 100644
--- a/LayoutTests/fast/history/history-back-twice-with-subframes-assert.html
+++ b/LayoutTests/fast/history/history-back-twice-with-subframes-assert.html
@@ -1,8 +1,8 @@
<!DOCTYPE html>
<script>
-if (layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function runTest() {
@@ -24,8 +24,8 @@
return;
}
- if (layoutTestController)
- layoutTestController.notifyDone();
+ if (testRunner)
+ testRunner.notifyDone();
}
frame1.src = frame2.src = 'data:text/html,navigated';
diff --git a/LayoutTests/fast/history/history-back-within-subframe-hash.html b/LayoutTests/fast/history/history-back-within-subframe-hash.html
index b127e70..acbd1c8 100644
--- a/LayoutTests/fast/history/history-back-within-subframe-hash.html
+++ b/LayoutTests/fast/history/history-back-within-subframe-hash.html
@@ -1,9 +1,9 @@
<body>
<script>
onload = function() {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
}
</script>
diff --git a/LayoutTests/fast/history/history-back-within-subframe-url.html b/LayoutTests/fast/history/history-back-within-subframe-url.html
index 508264e..c8c8fbf 100644
--- a/LayoutTests/fast/history/history-back-within-subframe-url.html
+++ b/LayoutTests/fast/history/history-back-within-subframe-url.html
@@ -1,10 +1,10 @@
<body>
<script>
onload = function() {
- if (window.layoutTestController)
+ if (window.testRunner)
{
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
}
@@ -15,8 +15,8 @@
wentBack = true;
history.back();
document.getElementById('result').innerText = 'PASS';
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
<iframe src="resources/history-back-within-subframe-url-2.html"></iframe>
diff --git a/LayoutTests/fast/history/history-length.html b/LayoutTests/fast/history/history-length.html
index 94f507d..8c92c6f 100644
--- a/LayoutTests/fast/history/history-length.html
+++ b/LayoutTests/fast/history/history-length.html
@@ -2,10 +2,10 @@
onload = function() {
if (location.search.substring(1).length == 0) {
sessionStorage.testStage = 0;
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.clearBackForwardList();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.clearBackForwardList();
+ testRunner.waitUntilDone();
}
}
@@ -31,8 +31,8 @@
document.body.innerHTML = "PASS";
else
document.body.innerHTML = "FAIL: initialLength=" + sessionStorage.initialLength + ", history.length=" + history.length;
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
break;
}
}, 0);
diff --git a/LayoutTests/fast/history/history-replace-updates-current-item.html b/LayoutTests/fast/history/history-replace-updates-current-item.html
index a06a516..c9a93d5 100644
--- a/LayoutTests/fast/history/history-replace-updates-current-item.html
+++ b/LayoutTests/fast/history/history-replace-updates-current-item.html
@@ -1,8 +1,8 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpBackForwardList();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpBackForwardList();
+ testRunner.waitUntilDone();
}
onunload = function() {
diff --git a/LayoutTests/fast/history/history-subframe-with-name.html b/LayoutTests/fast/history/history-subframe-with-name.html
index ac3c499..793aab2 100644
--- a/LayoutTests/fast/history/history-subframe-with-name.html
+++ b/LayoutTests/fast/history/history-subframe-with-name.html
@@ -11,10 +11,10 @@
onload = function()
{
- if (window.layoutTestController) {
- layoutTestController.setCanOpenWindows();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.setCanOpenWindows();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
testWindow = window.open('resources/history-subframe-with-name-container.html');
@@ -62,8 +62,8 @@
if (currentState == 4) {
testPassed('Complete: navigated through all the states');
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
</script>
diff --git a/LayoutTests/fast/history/history_reload.html b/LayoutTests/fast/history/history_reload.html
index aa3a12b..2cc8cac 100644
--- a/LayoutTests/fast/history/history_reload.html
+++ b/LayoutTests/fast/history/history_reload.html
@@ -3,10 +3,10 @@
<script>
var i = 0;
function test() {
- if (window.layoutTestController) {
- layoutTestController.setCanOpenWindows();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.setCanOpenWindows();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
var button = document.getElementById("button");
eventSender.mouseMoveTo(button.offsetParent.offsetLeft + button.offsetLeft + button.offsetWidth / 2, button.offsetParent.offsetTop + button.offsetTop + button.offsetHeight / 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/history/location-replace-hash.html b/LayoutTests/fast/history/location-replace-hash.html
index 99da8f3..1c8f871 100644
--- a/LayoutTests/fast/history/location-replace-hash.html
+++ b/LayoutTests/fast/history/location-replace-hash.html
@@ -13,10 +13,10 @@
onload = function()
{
- if (window.layoutTestController) {
- layoutTestController.setCanOpenWindows();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.setCanOpenWindows();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
testWindow = window.open('resources/location-replace-hash-1.html');
diff --git a/LayoutTests/fast/history/multiple-classes-visited.html b/LayoutTests/fast/history/multiple-classes-visited.html
index fd0919a..9650861 100644
--- a/LayoutTests/fast/history/multiple-classes-visited.html
+++ b/LayoutTests/fast/history/multiple-classes-visited.html
@@ -1,16 +1,16 @@
<html>
<head>
<script>
-if (window.layoutTestController) {
- window.layoutTestController.keepWebHistory();
- window.layoutTestController.dumpAsText();
+if (window.testRunner) {
+ window.testRunner.keepWebHistory();
+ window.testRunner.dumpAsText();
}
function compareStyles()
{
- if (window.layoutTestController) {
- var firstStyle = window.layoutTestController.computedStyleIncludingVisitedInfo(document.getElementById('one'));
- var secondStyle = window.layoutTestController.computedStyleIncludingVisitedInfo(document.getElementById('two'));
+ if (window.testRunner) {
+ var firstStyle = window.testRunner.computedStyleIncludingVisitedInfo(document.getElementById('one'));
+ var secondStyle = window.testRunner.computedStyleIncludingVisitedInfo(document.getElementById('two'));
if (firstStyle.color != secondStyle.color) {
document.getElementById('result').innerHTML = 'FAIL';
return;
diff --git a/LayoutTests/fast/history/nested-visited-test.html b/LayoutTests/fast/history/nested-visited-test.html
index 32b2411..3f30518 100644
--- a/LayoutTests/fast/history/nested-visited-test.html
+++ b/LayoutTests/fast/history/nested-visited-test.html
@@ -1,9 +1,9 @@
<html>
<head>
<script>
-if (window.layoutTestController) {
- window.layoutTestController.keepWebHistory();
- window.layoutTestController.dumpAsText();
+if (window.testRunner) {
+ window.testRunner.keepWebHistory();
+ window.testRunner.dumpAsText();
}
function compareStyles()
@@ -14,9 +14,9 @@
anchor.innerHTML = "One";
document.getElementById('enclosure').appendChild(anchor);
- if (window.layoutTestController) {
- var firstStyle = window.layoutTestController.computedStyleIncludingVisitedInfo(document.getElementById('one'));
- var secondStyle = window.layoutTestController.computedStyleIncludingVisitedInfo(document.getElementById('two'));
+ if (window.testRunner) {
+ var firstStyle = window.testRunner.computedStyleIncludingVisitedInfo(document.getElementById('one'));
+ var secondStyle = window.testRunner.computedStyleIncludingVisitedInfo(document.getElementById('two'));
if (firstStyle.color == secondStyle.color) {
document.getElementById('result').innerHTML = 'FAIL';
return;
diff --git a/LayoutTests/fast/history/redirect-via-iframe.html b/LayoutTests/fast/history/redirect-via-iframe.html
index 2588169..1b8ace9 100644
--- a/LayoutTests/fast/history/redirect-via-iframe.html
+++ b/LayoutTests/fast/history/redirect-via-iframe.html
@@ -3,9 +3,9 @@
<body onload="onload()">
</body>
<script>
- if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.waitUntilDone();
}
function onload() {
diff --git a/LayoutTests/fast/history/resources/clicked-link-is-visited-2.html b/LayoutTests/fast/history/resources/clicked-link-is-visited-2.html
index eb60a65..76d6678 100644
--- a/LayoutTests/fast/history/resources/clicked-link-is-visited-2.html
+++ b/LayoutTests/fast/history/resources/clicked-link-is-visited-2.html
@@ -2,8 +2,8 @@
<head>
<script>
function runTest() {
- if (window.layoutTestController) {
- layoutTestController.notifyDone();
+ if (window.testRunner) {
+ testRunner.notifyDone();
}
}
</script>
diff --git a/LayoutTests/fast/history/resources/history-back-within-subframe-hash-2.html b/LayoutTests/fast/history/resources/history-back-within-subframe-hash-2.html
index 1f20cc1..39f3da1 100644
--- a/LayoutTests/fast/history/resources/history-back-within-subframe-hash-2.html
+++ b/LayoutTests/fast/history/resources/history-back-within-subframe-hash-2.html
@@ -10,8 +10,8 @@
}
if (location.hash == "") {
parent.document.getElementById("result").innerText = "PASS";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
</script>
diff --git a/LayoutTests/fast/history/resources/history-replace-updates-current-item-done.html b/LayoutTests/fast/history/resources/history-replace-updates-current-item-done.html
index 18e64c8..8cb7b78 100644
--- a/LayoutTests/fast/history/resources/history-replace-updates-current-item-done.html
+++ b/LayoutTests/fast/history/resources/history-replace-updates-current-item-done.html
@@ -1,7 +1,7 @@
<script>
onload = function() {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
<body>PASS</body>
diff --git a/LayoutTests/fast/history/resources/history_reload_window.html b/LayoutTests/fast/history/resources/history_reload_window.html
index d88e903..bd89a3e 100644
--- a/LayoutTests/fast/history/resources/history_reload_window.html
+++ b/LayoutTests/fast/history/resources/history_reload_window.html
@@ -22,8 +22,8 @@
function closed()
{
if (window.opener.i == 2)
- if (window.layoutTestController)
- opener.setTimeout("layoutTestController.notifyDone()", 0);
+ if (window.testRunner)
+ opener.setTimeout("testRunner.notifyDone()", 0);
}
</script>
</head>
diff --git a/LayoutTests/fast/history/resources/redirect-target.html b/LayoutTests/fast/history/resources/redirect-target.html
index 2f43ec9..ef550f8 100644
--- a/LayoutTests/fast/history/resources/redirect-target.html
+++ b/LayoutTests/fast/history/resources/redirect-target.html
@@ -22,11 +22,11 @@
}
window.addEventListener("load", function () {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
testHistoryItemCount();
- layoutTestController.dumpBackForwardList();
- layoutTestController.notifyDone();
+ testRunner.dumpBackForwardList();
+ testRunner.notifyDone();
} else {
testHistoryItemCount();
}
diff --git a/LayoutTests/fast/history/same-document-iframes-changing-fragment.html b/LayoutTests/fast/history/same-document-iframes-changing-fragment.html
index a6b74d7..3efd919 100644
--- a/LayoutTests/fast/history/same-document-iframes-changing-fragment.html
+++ b/LayoutTests/fast/history/same-document-iframes-changing-fragment.html
@@ -15,10 +15,10 @@
description('Tests that we trigger same-document navigation when history entries are generated via fragment changes, even if the frames present in the document change between history entries.');
-if (window.layoutTestController) {
- layoutTestController.dumpChildFramesAsText();
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpBackForwardList();
+if (window.testRunner) {
+ testRunner.dumpChildFramesAsText();
+ testRunner.clearBackForwardList();
+ testRunner.dumpBackForwardList();
}
onload = function()
diff --git a/LayoutTests/fast/history/same-document-iframes-changing-pushstate.html b/LayoutTests/fast/history/same-document-iframes-changing-pushstate.html
index 72e1fc9..573a2e3 100644
--- a/LayoutTests/fast/history/same-document-iframes-changing-pushstate.html
+++ b/LayoutTests/fast/history/same-document-iframes-changing-pushstate.html
@@ -15,10 +15,10 @@
description('Tests that we trigger same-document navigation when history entries are generated via pushState, even if the frames present in the document change between history entries.');
-if (window.layoutTestController) {
- layoutTestController.dumpChildFramesAsText();
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpBackForwardList();
+if (window.testRunner) {
+ testRunner.dumpChildFramesAsText();
+ testRunner.clearBackForwardList();
+ testRunner.dumpBackForwardList();
}
onload = function()
diff --git a/LayoutTests/fast/history/saves-state-after-fragment-nav.html b/LayoutTests/fast/history/saves-state-after-fragment-nav.html
index 60dec93..a5be62f 100644
--- a/LayoutTests/fast/history/saves-state-after-fragment-nav.html
+++ b/LayoutTests/fast/history/saves-state-after-fragment-nav.html
@@ -26,9 +26,9 @@
var field = document.getElementById('field');
if (hash == "") {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
// Location changes need to happen outside the onload handler to generate history entries.
setTimeout(function() {
@@ -37,8 +37,8 @@
}, 0);
} else {
document.body.innerHTML = (field.value == '') ? 'FAIL' : 'PASS';
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
diff --git a/LayoutTests/fast/history/saves-state-after-frame-nav.html b/LayoutTests/fast/history/saves-state-after-frame-nav.html
index 8202a54..bb41c7a 100644
--- a/LayoutTests/fast/history/saves-state-after-frame-nav.html
+++ b/LayoutTests/fast/history/saves-state-after-frame-nav.html
@@ -42,16 +42,16 @@
if (getTextInput().value == "test")
document.getElementById("result").innerHTML = "PASS";
- if (window.layoutTestController) {
- layoutTestController.notifyDone();
+ if (window.testRunner) {
+ testRunner.notifyDone();
}
}
}
onload = function () {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
clickLink();
}
diff --git a/LayoutTests/fast/history/self-is-visited.html b/LayoutTests/fast/history/self-is-visited.html
index 6d7a5bf..b68d5bd 100644
--- a/LayoutTests/fast/history/self-is-visited.html
+++ b/LayoutTests/fast/history/self-is-visited.html
@@ -1,16 +1,16 @@
<html>
<head>
<script>
-if (window.layoutTestController) {
- window.layoutTestController.keepWebHistory();
- window.layoutTestController.dumpAsText();
+if (window.testRunner) {
+ window.testRunner.keepWebHistory();
+ window.testRunner.dumpAsText();
}
function compareStyles()
{
- if (window.layoutTestController) {
- var firstStyle = window.layoutTestController.computedStyleIncludingVisitedInfo(document.getElementById('one'));
- var secondStyle = window.layoutTestController.computedStyleIncludingVisitedInfo(document.getElementById('two'));
+ if (window.testRunner) {
+ var firstStyle = window.testRunner.computedStyleIncludingVisitedInfo(document.getElementById('one'));
+ var secondStyle = window.testRunner.computedStyleIncludingVisitedInfo(document.getElementById('two'));
if (firstStyle.color == secondStyle.color || firstStyle.backgroundColor == secondStyle.backgroundColor) {
document.getElementById('result').innerHTML = 'FAIL';
return;
diff --git a/LayoutTests/fast/history/sibling-visited-test.html b/LayoutTests/fast/history/sibling-visited-test.html
index 2901806..1f52cb6 100644
--- a/LayoutTests/fast/history/sibling-visited-test.html
+++ b/LayoutTests/fast/history/sibling-visited-test.html
@@ -1,16 +1,16 @@
<html>
<head>
<script>
-if (window.layoutTestController) {
- window.layoutTestController.keepWebHistory();
- window.layoutTestController.dumpAsText();
+if (window.testRunner) {
+ window.testRunner.keepWebHistory();
+ window.testRunner.dumpAsText();
}
function compareStyles()
{
- if (window.layoutTestController) {
- var firstStyle = window.layoutTestController.computedStyleIncludingVisitedInfo(document.getElementById('one'));
- var secondStyle = window.layoutTestController.computedStyleIncludingVisitedInfo(document.getElementById('two'));
+ if (window.testRunner) {
+ var firstStyle = window.testRunner.computedStyleIncludingVisitedInfo(document.getElementById('one'));
+ var secondStyle = window.testRunner.computedStyleIncludingVisitedInfo(document.getElementById('two'));
if (firstStyle.color == secondStyle.color) {
document.getElementById('result').innerHTML = 'FAIL';
return;
diff --git a/LayoutTests/fast/history/timed-refresh-in-cached-frame.html b/LayoutTests/fast/history/timed-refresh-in-cached-frame.html
index 33fab3c..6e9688b 100644
--- a/LayoutTests/fast/history/timed-refresh-in-cached-frame.html
+++ b/LayoutTests/fast/history/timed-refresh-in-cached-frame.html
@@ -1,15 +1,15 @@
<body onload="redirect()">
<!-- Needs to take two seconds, because a faster refresh would result in not creating a b/f item for the navigation -->
-<iframe src='data:text/html,<meta http-equiv="Refresh" content="2; URL=about:blank"><script>if (window.layoutTestController) { window.onpagehide=function(e){alert('pagehide ' + e.persisted)}; }</script>'></iframe>
+<iframe src='data:text/html,<meta http-equiv="Refresh" content="2; URL=about:blank"><script>if (window.testRunner) { window.onpagehide=function(e){alert('pagehide ' + e.persisted)}; }</script>'></iframe>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
}
function redirect()
{
- location='data:text/html,<p>PASSED if didn't crash in two seconds.</p><script>if (window.layoutTestController) setTimeout("layoutTestController.notifyDone()", 2500); </scr' + 'ipt>';
+ location='data:text/html,<p>PASSED if didn't crash in two seconds.</p><script>if (window.testRunner) setTimeout("testRunner.notifyDone()", 2500); </scr' + 'ipt>';
}
</script>
diff --git a/LayoutTests/fast/history/visited-generated-content-test.html b/LayoutTests/fast/history/visited-generated-content-test.html
index c482304..9b1f77c 100644
--- a/LayoutTests/fast/history/visited-generated-content-test.html
+++ b/LayoutTests/fast/history/visited-generated-content-test.html
@@ -12,10 +12,10 @@
</head>
<body onload="init()">
<script>
- if (window.layoutTestController) {
- window.layoutTestController.keepWebHistory();
- window.layoutTestController.dumpAsText();
- window.layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ window.testRunner.keepWebHistory();
+ window.testRunner.dumpAsText();
+ window.testRunner.waitUntilDone();
}
var oVisitedLink, oUnvisitedLink;
function init() {
@@ -29,8 +29,8 @@
document.body.appendChild(document.createElement('strong')).appendChild(document.createTextNode(sDifferent));
oVisitedLink.style.display = 'none';
oUnvisitedLink.style.display = 'none';
- if (window.layoutTestController)
- window.layoutTestController.notifyDone();
+ if (window.testRunner)
+ window.testRunner.notifyDone();
}, 0);
}
function createInvisibleLink(sUrl) {
diff --git a/LayoutTests/fast/history/visited-link-background-color.html b/LayoutTests/fast/history/visited-link-background-color.html
index c6e85ff..449e709 100644
--- a/LayoutTests/fast/history/visited-link-background-color.html
+++ b/LayoutTests/fast/history/visited-link-background-color.html
@@ -9,8 +9,8 @@
}
</style>
<script>
-if (window.layoutTestController)
- window.layoutTestController.keepWebHistory();
+if (window.testRunner)
+ window.testRunner.keepWebHistory();
</script>
<body>
<iframe src="resources/dummy.html" style="display:none"></iframe>
diff --git a/LayoutTests/fast/history/window-open.html b/LayoutTests/fast/history/window-open.html
index 4916b6a..f148297 100644
--- a/LayoutTests/fast/history/window-open.html
+++ b/LayoutTests/fast/history/window-open.html
@@ -13,12 +13,12 @@
<p id="result">
</p>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.keepWebHistory();
- layoutTestController.waitUntilDone();
- layoutTestController.setCanOpenWindows(true);
- layoutTestController.setCloseRemainingWindowsWhenComplete(true);
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.keepWebHistory();
+ testRunner.waitUntilDone();
+ testRunner.setCanOpenWindows(true);
+ testRunner.setCloseRemainingWindowsWhenComplete(true);
document.getElementById("result").innerText = "FAIL: Test did not complete";
var button = document.getElementById("button");
eventSender.mouseMoveTo(button.offsetParent.offsetLeft + button.offsetLeft + button.offsetWidth / 2, button.offsetParent.offsetTop + button.offsetTop + button.offsetHeight / 2);
@@ -29,9 +29,9 @@
function childLoaded()
{
childWindow.close();
- if (window.layoutTestController) {
- document.getElementById("result").innerText = layoutTestController.webHistoryItemCount === 1 ? "PASS" : "FAIL";
- layoutTestController.notifyDone();
+ if (window.testRunner) {
+ document.getElementById("result").innerText = testRunner.webHistoryItemCount === 1 ? "PASS" : "FAIL";
+ testRunner.notifyDone();
}
}
</script>
diff --git a/LayoutTests/fast/html/adopt-parent-frame.html b/LayoutTests/fast/html/adopt-parent-frame.html
index c3550c0..69dd625 100644
--- a/LayoutTests/fast/html/adopt-parent-frame.html
+++ b/LayoutTests/fast/html/adopt-parent-frame.html
@@ -6,8 +6,8 @@
<div>Adopting grandparent frame: <span id="grandchild"></span></div>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function createFrame(id, parent) {
var iframe = document.createElement('iframe');
diff --git a/LayoutTests/fast/html/body-offset-properties.html b/LayoutTests/fast/html/body-offset-properties.html
index b4ae018..d3c01e6 100644
--- a/LayoutTests/fast/html/body-offset-properties.html
+++ b/LayoutTests/fast/html/body-offset-properties.html
@@ -3,8 +3,8 @@
</pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var console = document.getElementById("console");
console.appendChild(document.createTextNode("body.offsetParent = " + document.body.offsetParent + "\n"));
console.appendChild(document.createTextNode("body.offsetLeft = " + document.body.offsetLeft + "\n"));
diff --git a/LayoutTests/fast/html/crash-style-first-letter.html b/LayoutTests/fast/html/crash-style-first-letter.html
index fde9860..6fe9964 100644
--- a/LayoutTests/fast/html/crash-style-first-letter.html
+++ b/LayoutTests/fast/html/crash-style-first-letter.html
@@ -1 +1 @@
-<svg><p>Test for https://bugs.webkit.org/show_bug.cgi?id=49316: The test PASSED if it did not crash.</p><script>if (window.layoutTestController) layoutTestController.dumpAsText();</script><use><style>:first-letter{margin-right:auto}<i><style>
+<svg><p>Test for https://bugs.webkit.org/show_bug.cgi?id=49316: The test PASSED if it did not crash.</p><script>if (window.testRunner) testRunner.dumpAsText();</script><use><style>:first-letter{margin-right:auto}<i><style>
diff --git a/LayoutTests/fast/html/details-add-summary-1-and-click.html b/LayoutTests/fast/html/details-add-summary-1-and-click.html
index ee0d506..def40a8 100644
--- a/LayoutTests/fast/html/details-add-summary-1-and-click.html
+++ b/LayoutTests/fast/html/details-add-summary-1-and-click.html
@@ -10,7 +10,7 @@
var runTests = function () {
document.getElementById("dt1").appendChild(createNewElement("summary", "new1", "new 1"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-add-summary-10-and-click.html b/LayoutTests/fast/html/details-add-summary-10-and-click.html
index ed29e5b..49e82d0 100644
--- a/LayoutTests/fast/html/details-add-summary-10-and-click.html
+++ b/LayoutTests/fast/html/details-add-summary-10-and-click.html
@@ -10,7 +10,7 @@
var runTests = function () {
document.getElementById("dt1").insertBefore(createNewElement("summary", "new1", "new 1"), document.getElementById("summary1"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-add-summary-2-and-click.html b/LayoutTests/fast/html/details-add-summary-2-and-click.html
index 0be6358..40ca5fe 100644
--- a/LayoutTests/fast/html/details-add-summary-2-and-click.html
+++ b/LayoutTests/fast/html/details-add-summary-2-and-click.html
@@ -11,7 +11,7 @@
document.getElementById("dt1").appendChild(createNewElement("summary", "new1", "new 1"));
document.getElementById("dt1").appendChild(createNewElement("summary", "new2", "new 2"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-add-summary-3-and-click.html b/LayoutTests/fast/html/details-add-summary-3-and-click.html
index 1de8096..98230c8 100644
--- a/LayoutTests/fast/html/details-add-summary-3-and-click.html
+++ b/LayoutTests/fast/html/details-add-summary-3-and-click.html
@@ -12,7 +12,7 @@
document.getElementById("dt1").appendChild(createNewElement("summary", "new1", "new 1"));
document.getElementById("dt1").insertBefore(createNewElement("summary", "new2", "new 2"), document.getElementById("new1"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-add-summary-4-and-click.html b/LayoutTests/fast/html/details-add-summary-4-and-click.html
index 1512688..72e19cc 100644
--- a/LayoutTests/fast/html/details-add-summary-4-and-click.html
+++ b/LayoutTests/fast/html/details-add-summary-4-and-click.html
@@ -10,7 +10,7 @@
var runTests = function () {
document.getElementById("dt1").appendChild(createNewElement("summary", "new1", "new 1"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-add-summary-5-and-click.html b/LayoutTests/fast/html/details-add-summary-5-and-click.html
index 74720a2..0eb1c02 100644
--- a/LayoutTests/fast/html/details-add-summary-5-and-click.html
+++ b/LayoutTests/fast/html/details-add-summary-5-and-click.html
@@ -10,7 +10,7 @@
var runTests = function () {
document.getElementById("dt1").insertBefore(createNewElement("summary", "new1", "new 1"), document.getElementById("summary1"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-add-summary-6-and-click.html b/LayoutTests/fast/html/details-add-summary-6-and-click.html
index 9f1a153..a9f9da9 100644
--- a/LayoutTests/fast/html/details-add-summary-6-and-click.html
+++ b/LayoutTests/fast/html/details-add-summary-6-and-click.html
@@ -10,7 +10,7 @@
var runTests = function () {
document.getElementById("dt1").appendChild(createNewElement("summary", "new1", "new 1"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-add-summary-7-and-click.html b/LayoutTests/fast/html/details-add-summary-7-and-click.html
index 43f1c23..a64648c 100644
--- a/LayoutTests/fast/html/details-add-summary-7-and-click.html
+++ b/LayoutTests/fast/html/details-add-summary-7-and-click.html
@@ -11,7 +11,7 @@
document.getElementById("dt1").appendChild(createNewElement("summary", "new1", "new 1"));
document.getElementById("dt1").appendChild(createNewElement("summary", "new2", "new 2"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-add-summary-8-and-click.html b/LayoutTests/fast/html/details-add-summary-8-and-click.html
index db633d0..07843e9 100644
--- a/LayoutTests/fast/html/details-add-summary-8-and-click.html
+++ b/LayoutTests/fast/html/details-add-summary-8-and-click.html
@@ -12,7 +12,7 @@
document.getElementById("dt1").appendChild(createNewElement("summary", "new1", "new 1"));
document.getElementById("dt1").insertBefore(createNewElement("summary", "new2", "new 2"), document.getElementById("new1"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-add-summary-9-and-click.html b/LayoutTests/fast/html/details-add-summary-9-and-click.html
index 6104fe7f..f19358a 100644
--- a/LayoutTests/fast/html/details-add-summary-9-and-click.html
+++ b/LayoutTests/fast/html/details-add-summary-9-and-click.html
@@ -10,7 +10,7 @@
var runTests = function () {
document.getElementById("dt1").appendChild(createNewElement("summary", "new1", "new 1"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-children-merge-crash.html b/LayoutTests/fast/html/details-children-merge-crash.html
index 6e82056..0b72017 100644
--- a/LayoutTests/fast/html/details-children-merge-crash.html
+++ b/LayoutTests/fast/html/details-children-merge-crash.html
@@ -3,11 +3,11 @@
var runTests = function () {
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
var d = document.getElementById("d1");
@@ -17,7 +17,7 @@
d.open = true;
setTimeout(function () {
d.open = false;
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}, 1);
}, 1);
}, 1);
diff --git a/LayoutTests/fast/html/details-element-render-inline-crash.html b/LayoutTests/fast/html/details-element-render-inline-crash.html
index 159cf0d..5d6e4dd 100644
--- a/LayoutTests/fast/html/details-element-render-inline-crash.html
+++ b/LayoutTests/fast/html/details-element-render-inline-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/html/details-mouse-click.html b/LayoutTests/fast/html/details-mouse-click.html
index 1a6d309..9967660 100644
--- a/LayoutTests/fast/html/details-mouse-click.html
+++ b/LayoutTests/fast/html/details-mouse-click.html
@@ -61,10 +61,10 @@
var runTests = function () {
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
- layoutTestController.dumpAsText();
+ testRunner.dumpAsText();
testElement(0);
testElement(1);
diff --git a/LayoutTests/fast/html/details-remove-summary-1-and-click.html b/LayoutTests/fast/html/details-remove-summary-1-and-click.html
index 03a558a..3925100 100644
--- a/LayoutTests/fast/html/details-remove-summary-1-and-click.html
+++ b/LayoutTests/fast/html/details-remove-summary-1-and-click.html
@@ -3,7 +3,7 @@
var runTests = function () {
document.getElementById("dt1").removeChild(document.getElementById("summary1"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-remove-summary-2-and-click.html b/LayoutTests/fast/html/details-remove-summary-2-and-click.html
index f5bf997..d35db84 100644
--- a/LayoutTests/fast/html/details-remove-summary-2-and-click.html
+++ b/LayoutTests/fast/html/details-remove-summary-2-and-click.html
@@ -3,7 +3,7 @@
var runTests = function () {
document.getElementById("dt1").removeChild(document.getElementById("summary1"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-remove-summary-3-and-click.html b/LayoutTests/fast/html/details-remove-summary-3-and-click.html
index 59b2131..b37aca1 100644
--- a/LayoutTests/fast/html/details-remove-summary-3-and-click.html
+++ b/LayoutTests/fast/html/details-remove-summary-3-and-click.html
@@ -3,7 +3,7 @@
var runTests = function () {
document.getElementById("dt1").removeChild(document.getElementById("summary2"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-remove-summary-4-and-click.html b/LayoutTests/fast/html/details-remove-summary-4-and-click.html
index f0ed242..1fe5869 100644
--- a/LayoutTests/fast/html/details-remove-summary-4-and-click.html
+++ b/LayoutTests/fast/html/details-remove-summary-4-and-click.html
@@ -3,7 +3,7 @@
var runTests = function () {
document.getElementById("dt1").removeChild(document.getElementById("summary1"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-remove-summary-5-and-click.html b/LayoutTests/fast/html/details-remove-summary-5-and-click.html
index a136032..e15a108 100644
--- a/LayoutTests/fast/html/details-remove-summary-5-and-click.html
+++ b/LayoutTests/fast/html/details-remove-summary-5-and-click.html
@@ -3,7 +3,7 @@
var runTests = function () {
document.getElementById("dt1").removeChild(document.getElementById("summary1"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-remove-summary-6-and-click.html b/LayoutTests/fast/html/details-remove-summary-6-and-click.html
index a7b2905..b26883b 100644
--- a/LayoutTests/fast/html/details-remove-summary-6-and-click.html
+++ b/LayoutTests/fast/html/details-remove-summary-6-and-click.html
@@ -3,7 +3,7 @@
var runTests = function () {
document.getElementById("dt1").removeChild(document.getElementById("summary2"));
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
eventSender.mouseMoveTo(2, 2);
eventSender.mouseDown();
diff --git a/LayoutTests/fast/html/details-replace-summary-child.html b/LayoutTests/fast/html/details-replace-summary-child.html
index 11dd06e..53c6dd4 100644
--- a/LayoutTests/fast/html/details-replace-summary-child.html
+++ b/LayoutTests/fast/html/details-replace-summary-child.html
@@ -15,7 +15,7 @@
function runTest()
{
- if (window.layoutTestController)
+ if (window.testRunner)
document.getElementById("run").click();
}
</script>
diff --git a/LayoutTests/fast/html/details-replace-text.html b/LayoutTests/fast/html/details-replace-text.html
index c447bfc..94d7cbc 100644
--- a/LayoutTests/fast/html/details-replace-text.html
+++ b/LayoutTests/fast/html/details-replace-text.html
@@ -13,7 +13,7 @@
function runTest()
{
- if (window.layoutTestController)
+ if (window.testRunner)
document.getElementById("run").click();
}
</script>
diff --git a/LayoutTests/fast/html/details-summary-document-child.html b/LayoutTests/fast/html/details-summary-document-child.html
index 77dbe74..df92138 100644
--- a/LayoutTests/fast/html/details-summary-document-child.html
+++ b/LayoutTests/fast/html/details-summary-document-child.html
@@ -1,8 +1,8 @@
<html>
<body onload="test()">
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function test() {
document.open();
diff --git a/LayoutTests/fast/html/draggable.html b/LayoutTests/fast/html/draggable.html
index df5d487..abc7d5a 100644
--- a/LayoutTests/fast/html/draggable.html
+++ b/LayoutTests/fast/html/draggable.html
@@ -32,8 +32,8 @@
pre.textContent = s;
document.body.appendChild(pre);
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
};
document.ondragstart = function(e)
diff --git a/LayoutTests/fast/html/empty-fragment-id-goto-top.html b/LayoutTests/fast/html/empty-fragment-id-goto-top.html
index a4bdc7c..bd31139 100644
--- a/LayoutTests/fast/html/empty-fragment-id-goto-top.html
+++ b/LayoutTests/fast/html/empty-fragment-id-goto-top.html
@@ -2,8 +2,8 @@
<head>
<script type="text/javascript">
function test() {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
window.scrollTo(0, 1000);
diff --git a/LayoutTests/fast/html/font-face-empty-should-not-crash.html b/LayoutTests/fast/html/font-face-empty-should-not-crash.html
index 3983190..b23b31c 100644
--- a/LayoutTests/fast/html/font-face-empty-should-not-crash.html
+++ b/LayoutTests/fast/html/font-face-empty-should-not-crash.html
@@ -2,8 +2,8 @@
<html>
<head>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/html/marquee-scrollamount.html b/LayoutTests/fast/html/marquee-scrollamount.html
index d1a3b567..de66072 100644
--- a/LayoutTests/fast/html/marquee-scrollamount.html
+++ b/LayoutTests/fast/html/marquee-scrollamount.html
@@ -1,8 +1,8 @@
<body>
<p>This is a regression test for https://bugs.webkit.org/show_bug.cgi?id=50434. It verifies that a marquee does not animate when scrollAmount is set to 0 by script.</p>
<script>
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+ if (window.testRunner)
+ testRunner.waitUntilDone();
var marquee = document.createElement("marquee");
marquee.innerHTML = "Test";
marquee.width = "100px";
@@ -10,9 +10,9 @@
document.body.appendChild(marquee);
setTimeout(function() {
marquee.scrollAmount = 0;
- if (window.layoutTestController) {
+ if (window.testRunner) {
setTimeout(function() {
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}, 55);
}
}, 0);
diff --git a/LayoutTests/fast/html/nav-element.html b/LayoutTests/fast/html/nav-element.html
index 573e416..733900e 100644
--- a/LayoutTests/fast/html/nav-element.html
+++ b/LayoutTests/fast/html/nav-element.html
@@ -4,8 +4,8 @@
<title>Test of HTML5 nav element</title>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<style>
diff --git a/LayoutTests/fast/html/object-image-nested-fallback.html b/LayoutTests/fast/html/object-image-nested-fallback.html
index 78f0225..132a282 100644
--- a/LayoutTests/fast/html/object-image-nested-fallback.html
+++ b/LayoutTests/fast/html/object-image-nested-fallback.html
@@ -1,7 +1,7 @@
<html>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<body>
<object type="image/png" data="this.object.does.not.exist.dtd">
diff --git a/LayoutTests/fast/html/pending-stylesheet-crash.html b/LayoutTests/fast/html/pending-stylesheet-crash.html
index efc1e9b..597c9a47 100644
--- a/LayoutTests/fast/html/pending-stylesheet-crash.html
+++ b/LayoutTests/fast/html/pending-stylesheet-crash.html
@@ -4,8 +4,8 @@
</head>
<body>
<script>
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText();
+if (window.testRunner)
+ window.testRunner.dumpAsText();
var link = document.createElement('link');
link.setAttribute('type', 'text/css');
diff --git a/LayoutTests/fast/html/process-end-tag-for-inbody-crash.html b/LayoutTests/fast/html/process-end-tag-for-inbody-crash.html
index c2430d3..72ed45c 100644
--- a/LayoutTests/fast/html/process-end-tag-for-inbody-crash.html
+++ b/LayoutTests/fast/html/process-end-tag-for-inbody-crash.html
@@ -1,7 +1,7 @@
<rt>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
document.body.innerHTML = "PASS";
</script>
diff --git a/LayoutTests/fast/html/script-allowed-types-languages.html b/LayoutTests/fast/html/script-allowed-types-languages.html
index 342cd90..0dbe798 100644
--- a/LayoutTests/fast/html/script-allowed-types-languages.html
+++ b/LayoutTests/fast/html/script-allowed-types-languages.html
@@ -43,8 +43,8 @@
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var types = [
null,
diff --git a/LayoutTests/fast/html/select-dropdown-consistent-background-color.html b/LayoutTests/fast/html/select-dropdown-consistent-background-color.html
index 454ac52..ab738eb 100644
--- a/LayoutTests/fast/html/select-dropdown-consistent-background-color.html
+++ b/LayoutTests/fast/html/select-dropdown-consistent-background-color.html
@@ -20,8 +20,8 @@
$('result').textContent =
(default_color == size0_color && default_color == size1_color) ? "PASS"
: "FAIL";
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
}
</script>
<body onload='test();'>
diff --git a/LayoutTests/fast/html/set-text-direction.html b/LayoutTests/fast/html/set-text-direction.html
index fe21fbe..842a623 100644
--- a/LayoutTests/fast/html/set-text-direction.html
+++ b/LayoutTests/fast/html/set-text-direction.html
@@ -49,7 +49,7 @@
expected = 'rtl';
sentInputEvent = false;
textarea.focus();
-layoutTestController.setTextDirection('rtl');
+testRunner.setTextDirection('rtl');
shouldBeTrue('sentInputEvent');
// Change the text direction of the textarea element to LTR.
@@ -57,14 +57,14 @@
expected = 'ltr';
sentInputEvent = false;
textarea.focus();
-layoutTestController.setTextDirection('ltr');
+testRunner.setTextDirection('ltr');
shouldBeTrue('sentInputEvent');
// Change the text direction of the input element to RTL.
expected = 'rtl';
sentInputEvent = false;
input.focus();
-layoutTestController.setTextDirection('rtl');
+testRunner.setTextDirection('rtl');
shouldBeTrue('sentInputEvent');
// Change the text direction of the input element to LTR.
@@ -72,7 +72,7 @@
expected = 'ltr';
sentInputEvent = false;
input.focus();
-layoutTestController.setTextDirection('ltr');
+testRunner.setTextDirection('ltr');
shouldBeTrue('sentInputEvent');
</script>
<script src="../../fast/js/resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/html/tab-order.html b/LayoutTests/fast/html/tab-order.html
index 123cd1e..fda62c0 100644
--- a/LayoutTests/fast/html/tab-order.html
+++ b/LayoutTests/fast/html/tab-order.html
@@ -39,8 +39,8 @@
function test()
{
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
}
var inputs = document.getElementsByTagName('input');
diff --git a/LayoutTests/fast/html/tabindex-removal.html b/LayoutTests/fast/html/tabindex-removal.html
index f64a543..a8278e4 100644
--- a/LayoutTests/fast/html/tabindex-removal.html
+++ b/LayoutTests/fast/html/tabindex-removal.html
@@ -1,8 +1,8 @@
<div id="a" tabindex="1">PASS</div>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
}
var a = document.getElementById('a');
a.removeAttribute('tabindex');
diff --git a/LayoutTests/fast/html/text-field-input-types.html b/LayoutTests/fast/html/text-field-input-types.html
index e682f2e..809a051 100644
--- a/LayoutTests/fast/html/text-field-input-types.html
+++ b/LayoutTests/fast/html/text-field-input-types.html
@@ -7,7 +7,7 @@
<script type="text/javascript">
function test()
{
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
const items = [ "email", "password", "tel", "text" , "url" ];
@@ -27,7 +27,7 @@
document.getElementById('result').innerHTML = result;
- layoutTestController.dumpAsText();
+ testRunner.dumpAsText();
}
</script>
</head>
diff --git a/LayoutTests/fast/html/xhtml-serialize.html b/LayoutTests/fast/html/xhtml-serialize.html
index 8d650bf..bfde40d 100644
--- a/LayoutTests/fast/html/xhtml-serialize.html
+++ b/LayoutTests/fast/html/xhtml-serialize.html
@@ -6,8 +6,8 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
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".
diff --git a/LayoutTests/fast/inline-block/anonymous-block-crash.html b/LayoutTests/fast/inline-block/anonymous-block-crash.html
index ff6ce54..fd6ee01 100644
--- a/LayoutTests/fast/inline-block/anonymous-block-crash.html
+++ b/LayoutTests/fast/inline-block/anonymous-block-crash.html
@@ -24,8 +24,8 @@
<div id="console"></div>
</body>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
document.getElementById("console").appendChild(document.createTextNode("PASS"));;
</script>
</html>
diff --git a/LayoutTests/fast/inline-block/inline-block-vertical-align-2.html b/LayoutTests/fast/inline-block/inline-block-vertical-align-2.html
index c50dff9..71e8ee4 100644
--- a/LayoutTests/fast/inline-block/inline-block-vertical-align-2.html
+++ b/LayoutTests/fast/inline-block/inline-block-vertical-align-2.html
@@ -25,8 +25,8 @@
</p>
<p id="result"></p>
<script type="text/javascript">
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText();
+if (window.testRunner)
+ window.testRunner.dumpAsText();
var result = document.getElementById('result');
var outer = document.getElementById('outer');
var inner = document.getElementById('inner');
diff --git a/LayoutTests/fast/inline-block/relative-positioned-rtl-crash.html b/LayoutTests/fast/inline-block/relative-positioned-rtl-crash.html
index 9e300a3..388092c 100644
--- a/LayoutTests/fast/inline-block/relative-positioned-rtl-crash.html
+++ b/LayoutTests/fast/inline-block/relative-positioned-rtl-crash.html
@@ -1,6 +1,6 @@
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<body style="direction: rtl;">
<div style="display: inline-block; width: 100px; position: relative; height: 10px;">
diff --git a/LayoutTests/fast/inline/boundingBox-with-continuation.html b/LayoutTests/fast/inline/boundingBox-with-continuation.html
index 6433cbe..cb98fe7 100644
--- a/LayoutTests/fast/inline/boundingBox-with-continuation.html
+++ b/LayoutTests/fast/inline/boundingBox-with-continuation.html
@@ -1,7 +1,7 @@
<!doctype html> <html> <head>
<script>
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText()
+if (window.testRunner)
+ window.testRunner.dumpAsText()
function runTest()
{
diff --git a/LayoutTests/fast/inline/clean-after-removing-temp-boxes.html b/LayoutTests/fast/inline/clean-after-removing-temp-boxes.html
index 7ac6ab7..2c495c0 100644
--- a/LayoutTests/fast/inline/clean-after-removing-temp-boxes.html
+++ b/LayoutTests/fast/inline/clean-after-removing-temp-boxes.html
@@ -1,6 +1,6 @@
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<p>
This tests that having a <wbr> element or a positioned element and a float
diff --git a/LayoutTests/fast/inline/continuation-positioned-reparenting.html b/LayoutTests/fast/inline/continuation-positioned-reparenting.html
index b65a082..e43d79c 100644
--- a/LayoutTests/fast/inline/continuation-positioned-reparenting.html
+++ b/LayoutTests/fast/inline/continuation-positioned-reparenting.html
@@ -13,8 +13,8 @@
document.getElementById("target").style.display = "block";
document.getElementById("positioned").style.display = "none";
}
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
document.body.offsetTop;
test();
diff --git a/LayoutTests/fast/inline/crash-new-continuation-with-outline.html b/LayoutTests/fast/inline/crash-new-continuation-with-outline.html
index 753b15b..5ed5f5b 100755
--- a/LayoutTests/fast/inline/crash-new-continuation-with-outline.html
+++ b/LayoutTests/fast/inline/crash-new-continuation-with-outline.html
@@ -15,8 +15,8 @@
<body>
<p>Test case for bug <a href="https://bugs.webkit.org/show_bug.cgi?id=84774">84774</a>: NULL-deref in RenderBox::clippedOverflowRectForRepaint</p>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var objectElement = document.createElement("object");
newContent = document.createTextNode("Lorem");
diff --git a/LayoutTests/fast/inline/dirtyLinesForInline.html b/LayoutTests/fast/inline/dirtyLinesForInline.html
index 4270826..507e8f5 100644
--- a/LayoutTests/fast/inline/dirtyLinesForInline.html
+++ b/LayoutTests/fast/inline/dirtyLinesForInline.html
@@ -27,9 +27,9 @@
</div>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
if (window.eventSender) {
eventSender.mouseMoveTo(50,75);
eventSender.mouseDown();
@@ -53,7 +53,7 @@
eventSender.mouseDown();
eventSender.mouseUp();
}
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/fast/inline/inline-body-crash.html b/LayoutTests/fast/inline/inline-body-crash.html
index a66959d..aac5932 100644
--- a/LayoutTests/fast/inline/inline-body-crash.html
+++ b/LayoutTests/fast/inline/inline-body-crash.html
@@ -2,8 +2,8 @@
<head>
<title>inline body causes crash</title>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
diff --git a/LayoutTests/fast/inline/inline-body-with-scrollbar-crash.html b/LayoutTests/fast/inline/inline-body-with-scrollbar-crash.html
index 1eeb0fd..3a2efed 100644
--- a/LayoutTests/fast/inline/inline-body-with-scrollbar-crash.html
+++ b/LayoutTests/fast/inline/inline-body-with-scrollbar-crash.html
@@ -5,8 +5,8 @@
::-webkit-scrollbar { width: 5px; height: 5px; }
</style>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
diff --git a/LayoutTests/fast/inline/inline-box-adjust-position-crash.html b/LayoutTests/fast/inline/inline-box-adjust-position-crash.html
index 6bafbb9..a69d1c2 100644
--- a/LayoutTests/fast/inline/inline-box-adjust-position-crash.html
+++ b/LayoutTests/fast/inline/inline-box-adjust-position-crash.html
@@ -14,8 +14,8 @@
PASS
</div>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
document.designMode = "on";
document.execCommand("SelectAll");
diff --git a/LayoutTests/fast/inline/inline-box-adjust-position-crash2.html b/LayoutTests/fast/inline/inline-box-adjust-position-crash2.html
index ddc9ca1..439f678 100644
--- a/LayoutTests/fast/inline/inline-box-adjust-position-crash2.html
+++ b/LayoutTests/fast/inline/inline-box-adjust-position-crash2.html
@@ -8,7 +8,7 @@
}
</style>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</html>
diff --git a/LayoutTests/fast/inline/inline-child-height-width-calc-crash.html b/LayoutTests/fast/inline/inline-child-height-width-calc-crash.html
index ac03b71..f60e97a 100644
--- a/LayoutTests/fast/inline/inline-child-height-width-calc-crash.html
+++ b/LayoutTests/fast/inline/inline-child-height-width-calc-crash.html
@@ -1,10 +1,10 @@
<html>
<head>
<script>
- if (window.layoutTestController)
+ if (window.testRunner)
{
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function runTest() {
@@ -14,8 +14,8 @@
document.appendChild(brElement);
alert('PASS');
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 0);
}
</script>
diff --git a/LayoutTests/fast/inline/inline-destroy-dirty-lines-crash.html b/LayoutTests/fast/inline/inline-destroy-dirty-lines-crash.html
index b8add8f..36f417e 100644
--- a/LayoutTests/fast/inline/inline-destroy-dirty-lines-crash.html
+++ b/LayoutTests/fast/inline/inline-destroy-dirty-lines-crash.html
@@ -2,8 +2,8 @@
<body onload="runTest()">
Test passes it it does not crash.
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function runTest()
{
diff --git a/LayoutTests/fast/inline/inline-marquee-crash.html b/LayoutTests/fast/inline/inline-marquee-crash.html
index 1435e4b..6ee825c 100644
--- a/LayoutTests/fast/inline/inline-marquee-crash.html
+++ b/LayoutTests/fast/inline/inline-marquee-crash.html
@@ -2,8 +2,8 @@
<head>
<title>inline marquee causes crashes</title>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
diff --git a/LayoutTests/fast/inline/relative-positioned-overflow.html b/LayoutTests/fast/inline/relative-positioned-overflow.html
index d79d384..05dbcf0 100644
--- a/LayoutTests/fast/inline/relative-positioned-overflow.html
+++ b/LayoutTests/fast/inline/relative-positioned-overflow.html
@@ -6,8 +6,8 @@
});
document.body.offsetTop;
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
eventSender.mouseMoveTo(50, 50);
eventSender.mouseDown();
eventSender.mouseUp();
diff --git a/LayoutTests/fast/inline/skipped-whitespace-boundingBox.html b/LayoutTests/fast/inline/skipped-whitespace-boundingBox.html
index 65702f5..a89af99 100644
--- a/LayoutTests/fast/inline/skipped-whitespace-boundingBox.html
+++ b/LayoutTests/fast/inline/skipped-whitespace-boundingBox.html
@@ -2,8 +2,8 @@
<html>
<head>
<script>
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText()
+if (window.testRunner)
+ window.testRunner.dumpAsText()
function runTest()
{
diff --git a/LayoutTests/fast/inline/skipped-whitespace-client-rect.html b/LayoutTests/fast/inline/skipped-whitespace-client-rect.html
index f85c832..d638f68 100644
--- a/LayoutTests/fast/inline/skipped-whitespace-client-rect.html
+++ b/LayoutTests/fast/inline/skipped-whitespace-client-rect.html
@@ -2,8 +2,8 @@
<html>
<head>
<script>
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText()
+if (window.testRunner)
+ window.testRunner.dumpAsText()
function runTest()
{
diff --git a/LayoutTests/fast/inline/update-always-create-line-boxes-full-layout-crash.html b/LayoutTests/fast/inline/update-always-create-line-boxes-full-layout-crash.html
index 7e01717..cddce6e 100644
--- a/LayoutTests/fast/inline/update-always-create-line-boxes-full-layout-crash.html
+++ b/LayoutTests/fast/inline/update-always-create-line-boxes-full-layout-crash.html
@@ -4,9 +4,9 @@
.table:nth-last-child(even) { line-height: 100%; }
</style>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function runTest()
@@ -14,8 +14,8 @@
var test = document.getElementById('test');
test.parentNode.removeChild(test);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
setTimeout("runTest()", 0);
diff --git a/LayoutTests/fast/innerHTML/004-expected.txt b/LayoutTests/fast/innerHTML/004-expected.txt
index df37b9d..6f51f04 100644
--- a/LayoutTests/fast/innerHTML/004-expected.txt
+++ b/LayoutTests/fast/innerHTML/004-expected.txt
@@ -18,8 +18,8 @@
</svg>
<script>
window.addEventListener ("load", function() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
document.getElementById("content").firstChild.nodeValue = document.documentElement.innerHTML;
}, false);
diff --git a/LayoutTests/fast/innerHTML/004.xhtml b/LayoutTests/fast/innerHTML/004.xhtml
index 40e199e..905590d 100644
--- a/LayoutTests/fast/innerHTML/004.xhtml
+++ b/LayoutTests/fast/innerHTML/004.xhtml
@@ -21,8 +21,8 @@
</svg>
<script>
window.addEventListener ("load", function() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
document.getElementById("content").firstChild.nodeValue = document.documentElement.innerHTML;
}, false);
diff --git a/LayoutTests/fast/innerHTML/005-expected.txt b/LayoutTests/fast/innerHTML/005-expected.txt
index 7304cd0..d0f04b0 100644
--- a/LayoutTests/fast/innerHTML/005-expected.txt
+++ b/LayoutTests/fast/innerHTML/005-expected.txt
@@ -11,8 +11,8 @@
<b>test</b>
<br>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
document.getElementById("content").firstChild.nodeValue = document.documentElement.innerHTML;
</script></body>
test
diff --git a/LayoutTests/fast/innerHTML/005.html b/LayoutTests/fast/innerHTML/005.html
index 9ad618e..864aa74 100644
--- a/LayoutTests/fast/innerHTML/005.html
+++ b/LayoutTests/fast/innerHTML/005.html
@@ -12,8 +12,8 @@
<b>test</b>
<br>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
document.getElementById("content").firstChild.nodeValue = document.documentElement.innerHTML;
</script>
</body>
diff --git a/LayoutTests/fast/innerHTML/additional-inline-style.html b/LayoutTests/fast/innerHTML/additional-inline-style.html
index 6e7fdf6..14d4930 100644
--- a/LayoutTests/fast/innerHTML/additional-inline-style.html
+++ b/LayoutTests/fast/innerHTML/additional-inline-style.html
@@ -7,8 +7,8 @@
<script>
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var result = document.getElementById("result");
var target = document.getElementById("target");
diff --git a/LayoutTests/fast/innerHTML/innerHTML-case.html b/LayoutTests/fast/innerHTML/innerHTML-case.html
index fb9261e..000badc 100644
--- a/LayoutTests/fast/innerHTML/innerHTML-case.html
+++ b/LayoutTests/fast/innerHTML/innerHTML-case.html
@@ -5,8 +5,8 @@
<div id="console"></div>
<script language="javascript">
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText();
+if (window.testRunner)
+ window.testRunner.dumpAsText();
function log(message) {
var console = document.getElementById("console");
diff --git a/LayoutTests/fast/innerHTML/innerHTML-changing-document-properties.xhtml b/LayoutTests/fast/innerHTML/innerHTML-changing-document-properties.xhtml
index 279f285..861f92d 100644
--- a/LayoutTests/fast/innerHTML/innerHTML-changing-document-properties.xhtml
+++ b/LayoutTests/fast/innerHTML/innerHTML-changing-document-properties.xhtml
@@ -3,8 +3,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<div id="log"></div>
<script><![CDATA[
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var xhtmlNS = "http://www.w3.org/1999/xhtml";
diff --git a/LayoutTests/fast/innerHTML/innerHTML-custom-tag.html b/LayoutTests/fast/innerHTML/innerHTML-custom-tag.html
index 888fbd1..8b7df31 100644
--- a/LayoutTests/fast/innerHTML/innerHTML-custom-tag.html
+++ b/LayoutTests/fast/innerHTML/innerHTML-custom-tag.html
@@ -6,8 +6,8 @@
<title>HTML innerHTML test, including custom tags</title>
<script>
function test() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var n = document.getElementsByTagName("emptyCustomTag")[0];
n.parentNode.insertBefore(document.createElementNS("http://webkit.org/test", "anotherEmptyCustomTag"), n.nextSibling);
n.parentNode.insertBefore(document.createTextNode("\n"), n.nextSibling);
diff --git a/LayoutTests/fast/innerHTML/innerHTML-iframe.html b/LayoutTests/fast/innerHTML/innerHTML-iframe.html
index a4a8343..bdcdff5 100644
--- a/LayoutTests/fast/innerHTML/innerHTML-iframe.html
+++ b/LayoutTests/fast/innerHTML/innerHTML-iframe.html
@@ -1,12 +1,12 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
setTimeout(function(){
document.body.innerHTML = "<b>PASS:</b> body and iframe cleared without crashing.";
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}, 0);
</script>
<body onload='document.getElementById("x").innerHTML = 1'>
diff --git a/LayoutTests/fast/innerHTML/innerHTML-nbsp.xhtml b/LayoutTests/fast/innerHTML/innerHTML-nbsp.xhtml
index ccf93f7..b764e6a 100644
--- a/LayoutTests/fast/innerHTML/innerHTML-nbsp.xhtml
+++ b/LayoutTests/fast/innerHTML/innerHTML-nbsp.xhtml
@@ -6,8 +6,8 @@
<div id="console"></div>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function log(message) {
var console = document.getElementById("console");
diff --git a/LayoutTests/fast/innerHTML/innerHTML-script-tag-crash.xhtml b/LayoutTests/fast/innerHTML/innerHTML-script-tag-crash.xhtml
index 3cfaf05..5d5f769 100644
--- a/LayoutTests/fast/innerHTML/innerHTML-script-tag-crash.xhtml
+++ b/LayoutTests/fast/innerHTML/innerHTML-script-tag-crash.xhtml
@@ -3,8 +3,8 @@
<head>
<script>
<