Use testRunner instead of layoutTestController in fast/js, layers, leaks, line-grid, lists, loader, loading, media, mediastream, multicol, and mutation tests
https://bugs.webkit.org/show_bug.cgi?id=91315
Reviewed by Adam Barth.
* fast/js/:
* fast/layers/add-layer-with-nested-stacking.html:
* fast/layers/assert-RenderLayer-update-positions.html:
* fast/layers/clip-rects-assertion.html:
* fast/layers/clip-rects-transformed-2.html:
* fast/layers/clip-rects-transformed.html:
* fast/layers/generated-layer-scrollbar-crash.html:
* fast/layers/inline-dirty-z-order-lists.html:
* fast/layers/layer-content-visibility-change.html:
* fast/layers/layer-visibility.html:
* fast/layers/nested-layers-1.html:
* fast/layers/nested-layers-2.html:
* fast/layers/nested-layers-3.html:
* fast/layers/nested-layers-4.html:
* fast/layers/remove-layer-with-nested-stacking.html:
* fast/layers/remove-only-this-layer-update.html:
* fast/layers/removed-by-scroll-handler.html:
* fast/layers/resize-layer-deletion-crash.html:
* fast/layers/scroll-with-transform-composited-layer.html:
* fast/layers/scroll-with-transform-layer.html:
* fast/layers/scrollByLines-overflow-no-layer.html:
* fast/layers/visible-layer-with-hidden-parent.html:
* fast/layers/zindex-hit-test.html:
* fast/leaks/001.html:
* fast/leaks/002.html:
* fast/leaks/003.html-disabled:
* fast/line-grid/line-grid-nested.html:
* fast/lists/alpha-boundary-values.html:
* fast/lists/alpha-list-wrap.html:
* fast/lists/calc-width-with-space.html:
* fast/lists/decimal-leading-zero.html:
* fast/lists/drag-into-marker.html:
* fast/lists/item-not-in-list-line-wrapping.html:
* fast/lists/li-values.html:
* fast/lists/list-style-type-dynamic-change.html:
* fast/lists/ol-nested-items-dynamic-insert.html:
* fast/lists/ol-nested-items-dynamic-remove.html:
* fast/lists/ol-nested-items.html:
* fast/lists/ol-nested-list-dynamic-insert.html:
* fast/lists/ol-nested-list-dynamic-remove.html:
* fast/lists/ol-nested-list.html:
* fast/lists/ol-reversed-dynamic-simple.html:
* fast/lists/ol-reversed-dynamic.html:
* fast/lists/ol-reversed-nested-items.html:
* fast/lists/ol-reversed-nested-list.html:
* fast/lists/ol-reversed-simple.html:
* fast/lists/ol-reversed-simple.xhtml:
* fast/lists/ol-start-roman.html:
* fast/lists/parent-box-not-box-crash.html:
* fast/lists/positioned-count-crash.html:
* fast/lists/remove-listmarker-from-anonblock-with-continuation-crash.html:
* fast/lists/resources/dump-list.js:
(dumpListItemAsHTML):
(testListItemMarkerEqualsListItemText):
* fast/lists/w3-css3-list-styles-alphabetic.html:
* fast/lists/w3-css3-list-styles-fallback-style.html:
* fast/lists/w3-css3-list-styles-numeric.html:
* fast/lists/w3-css3-list-styles-symbolic.html:
* fast/lists/w3-css3-lower-armenian.html:
* fast/lists/w3-css3-upper-armenian.html:
* fast/lists/w3-list-styles.html:
* fast/loader/:
* fast/media/color-does-not-include-alpha.html:
* fast/media/invalid-lengths.html:
* fast/media/lifetime.html:
* fast/media/matchmedium-query-api.html:
* fast/media/media-query-list-01.html:
* fast/media/media-query-list-02.html:
* fast/media/media-query-list-03.html:
* fast/media/media-query-list-04.html:
* fast/media/media-query-list-05.html:
* fast/media/media-query-list-06.html:
* fast/media/media-query-list-07.html:
* fast/media/media-query-list-callback.html:
* fast/media/media-svg-crash.html:
* fast/media/mq-pointer.html:
* fast/media/print-restores-previous-mediatype.html:
* fast/media/update-media-query-css-parser.html:
* fast/media/view-mode-media-feature.html:
* fast/multicol/:
* fast/mutation/end-of-task-delivery.html:
* fast/mutation/inline-event-listener.html:
* fast/mutation/mutation-callback-non-element-crash.html:
* platform/chromium/fast/loader/create-view-target-blank.html:
* platform/chromium/fast/loader/resources/done.html:
* platform/gtk/fast/loader/crash-display-local-directory.html:
* platform/mac/fast/loader/file-url-mimetypes-2.html:
* platform/mac/fast/loader/file-url-mimetypes-3.html:
* platform/mac/fast/loader/file-url-mimetypes.html:
* platform/mac/fast/loader/non-html-load-event.html:
* platform/mac/fast/loader/webarchive-encoding-respected.html:
* platform/qt/fast/loader/user-stylesheet-qrc-path.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@122687 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7c89470d..d159e0f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,103 @@
+2012-07-14 Ryosuke Niwa <rniwa@webkit.org>
+
+ Use testRunner instead of layoutTestController in fast/js, layers, leaks, line-grid, lists, loader, loading, media, mediastream, multicol, and mutation tests
+ https://bugs.webkit.org/show_bug.cgi?id=91315
+
+ Reviewed by Adam Barth.
+
+ * fast/js/:
+ * fast/layers/add-layer-with-nested-stacking.html:
+ * fast/layers/assert-RenderLayer-update-positions.html:
+ * fast/layers/clip-rects-assertion.html:
+ * fast/layers/clip-rects-transformed-2.html:
+ * fast/layers/clip-rects-transformed.html:
+ * fast/layers/generated-layer-scrollbar-crash.html:
+ * fast/layers/inline-dirty-z-order-lists.html:
+ * fast/layers/layer-content-visibility-change.html:
+ * fast/layers/layer-visibility.html:
+ * fast/layers/nested-layers-1.html:
+ * fast/layers/nested-layers-2.html:
+ * fast/layers/nested-layers-3.html:
+ * fast/layers/nested-layers-4.html:
+ * fast/layers/remove-layer-with-nested-stacking.html:
+ * fast/layers/remove-only-this-layer-update.html:
+ * fast/layers/removed-by-scroll-handler.html:
+ * fast/layers/resize-layer-deletion-crash.html:
+ * fast/layers/scroll-with-transform-composited-layer.html:
+ * fast/layers/scroll-with-transform-layer.html:
+ * fast/layers/scrollByLines-overflow-no-layer.html:
+ * fast/layers/visible-layer-with-hidden-parent.html:
+ * fast/layers/zindex-hit-test.html:
+ * fast/leaks/001.html:
+ * fast/leaks/002.html:
+ * fast/leaks/003.html-disabled:
+ * fast/line-grid/line-grid-nested.html:
+ * fast/lists/alpha-boundary-values.html:
+ * fast/lists/alpha-list-wrap.html:
+ * fast/lists/calc-width-with-space.html:
+ * fast/lists/decimal-leading-zero.html:
+ * fast/lists/drag-into-marker.html:
+ * fast/lists/item-not-in-list-line-wrapping.html:
+ * fast/lists/li-values.html:
+ * fast/lists/list-style-type-dynamic-change.html:
+ * fast/lists/ol-nested-items-dynamic-insert.html:
+ * fast/lists/ol-nested-items-dynamic-remove.html:
+ * fast/lists/ol-nested-items.html:
+ * fast/lists/ol-nested-list-dynamic-insert.html:
+ * fast/lists/ol-nested-list-dynamic-remove.html:
+ * fast/lists/ol-nested-list.html:
+ * fast/lists/ol-reversed-dynamic-simple.html:
+ * fast/lists/ol-reversed-dynamic.html:
+ * fast/lists/ol-reversed-nested-items.html:
+ * fast/lists/ol-reversed-nested-list.html:
+ * fast/lists/ol-reversed-simple.html:
+ * fast/lists/ol-reversed-simple.xhtml:
+ * fast/lists/ol-start-roman.html:
+ * fast/lists/parent-box-not-box-crash.html:
+ * fast/lists/positioned-count-crash.html:
+ * fast/lists/remove-listmarker-from-anonblock-with-continuation-crash.html:
+ * fast/lists/resources/dump-list.js:
+ (dumpListItemAsHTML):
+ (testListItemMarkerEqualsListItemText):
+ * fast/lists/w3-css3-list-styles-alphabetic.html:
+ * fast/lists/w3-css3-list-styles-fallback-style.html:
+ * fast/lists/w3-css3-list-styles-numeric.html:
+ * fast/lists/w3-css3-list-styles-symbolic.html:
+ * fast/lists/w3-css3-lower-armenian.html:
+ * fast/lists/w3-css3-upper-armenian.html:
+ * fast/lists/w3-list-styles.html:
+ * fast/loader/:
+ * fast/media/color-does-not-include-alpha.html:
+ * fast/media/invalid-lengths.html:
+ * fast/media/lifetime.html:
+ * fast/media/matchmedium-query-api.html:
+ * fast/media/media-query-list-01.html:
+ * fast/media/media-query-list-02.html:
+ * fast/media/media-query-list-03.html:
+ * fast/media/media-query-list-04.html:
+ * fast/media/media-query-list-05.html:
+ * fast/media/media-query-list-06.html:
+ * fast/media/media-query-list-07.html:
+ * fast/media/media-query-list-callback.html:
+ * fast/media/media-svg-crash.html:
+ * fast/media/mq-pointer.html:
+ * fast/media/print-restores-previous-mediatype.html:
+ * fast/media/update-media-query-css-parser.html:
+ * fast/media/view-mode-media-feature.html:
+ * fast/multicol/:
+ * fast/mutation/end-of-task-delivery.html:
+ * fast/mutation/inline-event-listener.html:
+ * fast/mutation/mutation-callback-non-element-crash.html:
+ * platform/chromium/fast/loader/create-view-target-blank.html:
+ * platform/chromium/fast/loader/resources/done.html:
+ * platform/gtk/fast/loader/crash-display-local-directory.html:
+ * platform/mac/fast/loader/file-url-mimetypes-2.html:
+ * platform/mac/fast/loader/file-url-mimetypes-3.html:
+ * platform/mac/fast/loader/file-url-mimetypes.html:
+ * platform/mac/fast/loader/non-html-load-event.html:
+ * platform/mac/fast/loader/webarchive-encoding-respected.html:
+ * platform/qt/fast/loader/user-stylesheet-qrc-path.html:
+
2012-07-15 Christophe Dumez <christophe.dumez@intel.com>
[EFL] Skip fast/text/descent-clip-in-scaled-page.html
diff --git a/LayoutTests/fast/js/activation-object-function-lifetime.html b/LayoutTests/fast/js/activation-object-function-lifetime.html
index 9e118cc..6fc557b 100644
--- a/LayoutTests/fast/js/activation-object-function-lifetime.html
+++ b/LayoutTests/fast/js/activation-object-function-lifetime.html
@@ -4,8 +4,8 @@
<pre id="console"></pre>
<script>
-if (this.layoutTestController)
- layoutTestController.dumpAsText();
+if (this.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/add-to-primitive.html b/LayoutTests/fast/js/add-to-primitive.html
index 7b9d0c8..21a1de4 100644
--- a/LayoutTests/fast/js/add-to-primitive.html
+++ b/LayoutTests/fast/js/add-to-primitive.html
@@ -16,8 +16,8 @@
log("FAIL: " + aDescription + " should be " + b + " but instead is " + a + ".");
}
-if (this.layoutTestController)
- layoutTestController.dumpAsText();
+if (this.testRunner)
+ testRunner.dumpAsText();
var valueOfIsZero = {
valueOf: function valueOf() { return 0; },
diff --git a/LayoutTests/fast/js/array-foreach.html b/LayoutTests/fast/js/array-foreach.html
index 1c35034..9e21996 100644
--- a/LayoutTests/fast/js/array-foreach.html
+++ b/LayoutTests/fast/js/array-foreach.html
@@ -6,8 +6,8 @@
document.writeln(str+"<br/>");
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/js/array-indexof.html b/LayoutTests/fast/js/array-indexof.html
index e5cec39..00646eb 100644
--- a/LayoutTests/fast/js/array-indexof.html
+++ b/LayoutTests/fast/js/array-indexof.html
@@ -19,8 +19,8 @@
var testArray5 = [5, 5, 5, undefined];
delete testArray5[3];
var testArray6 = new Array(20);
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
// -->
</script>
diff --git a/LayoutTests/fast/js/array-map.html b/LayoutTests/fast/js/array-map.html
index 77e591b..0dbc0dc 100644
--- a/LayoutTests/fast/js/array-map.html
+++ b/LayoutTests/fast/js/array-map.html
@@ -6,8 +6,8 @@
document.writeln(str+"<br/>");
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/js/array-some.html b/LayoutTests/fast/js/array-some.html
index b51f59b..a66cbe1 100644
--- a/LayoutTests/fast/js/array-some.html
+++ b/LayoutTests/fast/js/array-some.html
@@ -6,8 +6,8 @@
document.writeln(str+"<br/>");
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/js/bitwise-and-on-undefined.html b/LayoutTests/fast/js/bitwise-and-on-undefined.html
index 889a281..15aa4fc 100644
--- a/LayoutTests/fast/js/bitwise-and-on-undefined.html
+++ b/LayoutTests/fast/js/bitwise-and-on-undefined.html
@@ -10,7 +10,7 @@
</style>
<script type="text/javascript">
- if (window.layoutTestController) layoutTestController.dumpAsText();
+ if (window.testRunner) testRunner.dumpAsText();
function log(msg) {
document.getElementById("log").innerHTML += msg;
diff --git a/LayoutTests/fast/js/construct-global-object.html b/LayoutTests/fast/js/construct-global-object.html
index f201797..7f38ea7 100644
--- a/LayoutTests/fast/js/construct-global-object.html
+++ b/LayoutTests/fast/js/construct-global-object.html
@@ -20,8 +20,8 @@
log("FAIL: " + aDescription + " should be " + b + " but instead is " + a + ".");
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
frames[0].document.open();
frames[0].document.write("<\script>function O() { }</script\>");
diff --git a/LayoutTests/fast/js/delete-function-parameter.html b/LayoutTests/fast/js/delete-function-parameter.html
index ac64df9..e040d37 100644
--- a/LayoutTests/fast/js/delete-function-parameter.html
+++ b/LayoutTests/fast/js/delete-function-parameter.html
@@ -1,8 +1,8 @@
<p>This page verifies that function parameters cannot be deleted.</p>
<pre id="console"></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/direct-entry-to-function-code.html b/LayoutTests/fast/js/direct-entry-to-function-code.html
index 36d76c1..944c9e5 100644
--- a/LayoutTests/fast/js/direct-entry-to-function-code.html
+++ b/LayoutTests/fast/js/direct-entry-to-function-code.html
@@ -1,5 +1,5 @@
<!-- This test covers re-entry to global code from a function node, without ever executing global code prior to the first function call.
-->
-<body id="bodyNode" onload="document.write('<script' + '>' + 'var x = 0; var y = 1; var z = 2; if (window.layoutTestController) layoutTestController.dumpAsText(); document.write(\'<div>This test ensures that we can directly enter JS function code and re-enter globally without any initial global code being executed.</div>\')' + '</script' + '>');">
+<body id="bodyNode" onload="document.write('<script' + '>' + 'var x = 0; var y = 1; var z = 2; if (window.testRunner) testRunner.dumpAsText(); document.write(\'<div>This test ensures that we can directly enter JS function code and re-enter globally without any initial global code being executed.</div>\')' + '</script' + '>');">
This test makes sure JS can enter a function directly without first executing global code.
</body>
diff --git a/LayoutTests/fast/js/do-while-expression-value.html b/LayoutTests/fast/js/do-while-expression-value.html
index e3d5701..eb75baf 100644
--- a/LayoutTests/fast/js/do-while-expression-value.html
+++ b/LayoutTests/fast/js/do-while-expression-value.html
@@ -2,8 +2,8 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/do-while-without-semicolon.html b/LayoutTests/fast/js/do-while-without-semicolon.html
index 3aba2ef..dec3861 100644
--- a/LayoutTests/fast/js/do-while-without-semicolon.html
+++ b/LayoutTests/fast/js/do-while-without-semicolon.html
@@ -8,8 +8,8 @@
document.getElementById("console").innerHTML = "PASS: Script following do/while statement executed.";
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
do{}while(false)pass();
</script>
diff --git a/LayoutTests/fast/js/encode-URI-test.html b/LayoutTests/fast/js/encode-URI-test.html
index 900ba7a..9184e3f 100644
--- a/LayoutTests/fast/js/encode-URI-test.html
+++ b/LayoutTests/fast/js/encode-URI-test.html
@@ -11,7 +11,7 @@
<script type="text/javascript">
-if (window.layoutTestController) layoutTestController.dumpAsText();
+if (window.testRunner) testRunner.dumpAsText();
// --------
diff --git a/LayoutTests/fast/js/eval-cross-window.html b/LayoutTests/fast/js/eval-cross-window.html
index 043cf63..08c6363 100644
--- a/LayoutTests/fast/js/eval-cross-window.html
+++ b/LayoutTests/fast/js/eval-cross-window.html
@@ -12,8 +12,8 @@
<iframe style="width:0; height:0"></iframe>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var topEval = eval;
var frameEval = frames[0].eval;
diff --git a/LayoutTests/fast/js/eval-keyword-vs-function.html b/LayoutTests/fast/js/eval-keyword-vs-function.html
index 40c97fb..cac4579 100644
--- a/LayoutTests/fast/js/eval-keyword-vs-function.html
+++ b/LayoutTests/fast/js/eval-keyword-vs-function.html
@@ -12,8 +12,8 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var globalEval = eval;
diff --git a/LayoutTests/fast/js/eval-overriding.html b/LayoutTests/fast/js/eval-overriding.html
index a0d7181..795da37 100644
--- a/LayoutTests/fast/js/eval-overriding.html
+++ b/LayoutTests/fast/js/eval-overriding.html
@@ -4,8 +4,8 @@
<hr>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var x = "built-in eval";
diff --git a/LayoutTests/fast/js/exception-codegen-crash.html b/LayoutTests/fast/js/exception-codegen-crash.html
index 71f03e1..4575e38 100644
--- a/LayoutTests/fast/js/exception-codegen-crash.html
+++ b/LayoutTests/fast/js/exception-codegen-crash.html
@@ -4,8 +4,8 @@
</p>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var scripts = [
"(1++).x;",
diff --git a/LayoutTests/fast/js/exception-sequencing-binops.js b/LayoutTests/fast/js/exception-sequencing-binops.js
index 7324432..b7d4321 100644
--- a/LayoutTests/fast/js/exception-sequencing-binops.js
+++ b/LayoutTests/fast/js/exception-sequencing-binops.js
@@ -1,5 +1,5 @@
-if (this.layoutTestController)
- layoutTestController.dumpAsText();
+if (this.testRunner)
+ testRunner.dumpAsText();
if (this.document) {
log = function(msg) {document.getElementById("log").innerHTML += msg + "<br />";};
diff --git a/LayoutTests/fast/js/exception-sequencing.html b/LayoutTests/fast/js/exception-sequencing.html
index 81fe4b4..bba620f 100644
--- a/LayoutTests/fast/js/exception-sequencing.html
+++ b/LayoutTests/fast/js/exception-sequencing.html
@@ -6,8 +6,8 @@
</ul>
<div id="log"></div>
<script>
-if (this.layoutTestController)
- layoutTestController.dumpAsText();
+if (this.testRunner)
+ testRunner.dumpAsText();
if (this.document) {
log = function(msg) {document.getElementById("log").innerHTML += msg + "<br />";};
diff --git a/LayoutTests/fast/js/exception-thrown-from-equal.html b/LayoutTests/fast/js/exception-thrown-from-equal.html
index 7892c5f..a65495f 100644
--- a/LayoutTests/fast/js/exception-thrown-from-equal.html
+++ b/LayoutTests/fast/js/exception-thrown-from-equal.html
@@ -18,8 +18,8 @@
log("FAIL: " + expression + " should throw a " + exception + ", but didn't.");
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var o = {
valueOf: function() {
diff --git a/LayoutTests/fast/js/exception-thrown-from-eval-inside-closure.html b/LayoutTests/fast/js/exception-thrown-from-eval-inside-closure.html
index 712f652..2203f85 100644
--- a/LayoutTests/fast/js/exception-thrown-from-eval-inside-closure.html
+++ b/LayoutTests/fast/js/exception-thrown-from-eval-inside-closure.html
@@ -20,8 +20,8 @@
}
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
// Create a function with an activation.
(function () {
diff --git a/LayoutTests/fast/js/exception-thrown-from-function-with-lazy-activation.html b/LayoutTests/fast/js/exception-thrown-from-function-with-lazy-activation.html
index 3717d8c..317b686 100644
--- a/LayoutTests/fast/js/exception-thrown-from-function-with-lazy-activation.html
+++ b/LayoutTests/fast/js/exception-thrown-from-function-with-lazy-activation.html
@@ -20,8 +20,8 @@
}
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
try {
// Lazily create an activation for a function that otherwise wouldn't need one, then throw.
diff --git a/LayoutTests/fast/js/exception-thrown-from-new.html b/LayoutTests/fast/js/exception-thrown-from-new.html
index 88ac6b8..9924051 100644
--- a/LayoutTests/fast/js/exception-thrown-from-new.html
+++ b/LayoutTests/fast/js/exception-thrown-from-new.html
@@ -20,8 +20,8 @@
log ("FAIL: " + aDescription + " should be '" + String(b) + "' but instead is '" + String(a) + "'.");
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
(function () {
try {
diff --git a/LayoutTests/fast/js/exceptions-thrown-in-callbacks.html b/LayoutTests/fast/js/exceptions-thrown-in-callbacks.html
index 221fe00..ae52d53 100644
--- a/LayoutTests/fast/js/exceptions-thrown-in-callbacks.html
+++ b/LayoutTests/fast/js/exceptions-thrown-in-callbacks.html
@@ -1,8 +1,8 @@
This test ensures that exceptions are handled correctly by the various callback mechanisms present in WebCore.
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var db = openDatabase("exception-info-test", "1.0", "Test for exception information thrown by callbacks and timers", 1);
@@ -36,8 +36,8 @@
}
function timerTest() {
- if (window.layoutTestController)
- setTimeout("layoutTestController.notifyDone()", 0);
+ if (window.testRunner)
+ setTimeout("testRunner.notifyDone()", 0);
throw errorObject("timer");
}
diff --git a/LayoutTests/fast/js/exec-state-marking.html b/LayoutTests/fast/js/exec-state-marking.html
index e801336..f3fe914 100644
--- a/LayoutTests/fast/js/exec-state-marking.html
+++ b/LayoutTests/fast/js/exec-state-marking.html
@@ -91,8 +91,8 @@
return v1 + v2 + v3 + v4 + v5;
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
shouldBe(f(), "f()", "12345");
</script>
diff --git a/LayoutTests/fast/js/floating-point-truncate-rshift.html b/LayoutTests/fast/js/floating-point-truncate-rshift.html
index 3074663..3109c3a 100644
--- a/LayoutTests/fast/js/floating-point-truncate-rshift.html
+++ b/LayoutTests/fast/js/floating-point-truncate-rshift.html
@@ -1,8 +1,8 @@
<body>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var largeNeg = -2715228072;
if ((largeNeg >>> 5) == 49366850)
diff --git a/LayoutTests/fast/js/function-argument-evaluation-before-exception.html b/LayoutTests/fast/js/function-argument-evaluation-before-exception.html
index da60cba..7a29895 100644
--- a/LayoutTests/fast/js/function-argument-evaluation-before-exception.html
+++ b/LayoutTests/fast/js/function-argument-evaluation-before-exception.html
@@ -4,8 +4,8 @@
<pre id="console">FAIL: arguments were not evaluated.</pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
window.__defineGetter__("x", function() { document.getElementById("console").innerHTML = "PASS: arguments were evaluated"; });
diff --git a/LayoutTests/fast/js/function-argument-evaluation.html b/LayoutTests/fast/js/function-argument-evaluation.html
index 37d023b..3d4f675 100644
--- a/LayoutTests/fast/js/function-argument-evaluation.html
+++ b/LayoutTests/fast/js/function-argument-evaluation.html
@@ -35,8 +35,8 @@
};
(function () {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var callback = function callback(x) {
return x;
diff --git a/LayoutTests/fast/js/function-declarations.html b/LayoutTests/fast/js/function-declarations.html
index a297f9d..7e001b4 100644
--- a/LayoutTests/fast/js/function-declarations.html
+++ b/LayoutTests/fast/js/function-declarations.html
@@ -2,8 +2,8 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/function-dot-arguments-and-caller.html b/LayoutTests/fast/js/function-dot-arguments-and-caller.html
index 1ed7e0e..d540155 100644
--- a/LayoutTests/fast/js/function-dot-arguments-and-caller.html
+++ b/LayoutTests/fast/js/function-dot-arguments-and-caller.html
@@ -10,8 +10,8 @@
document.getElementById("console").appendChild(document.createTextNode(s + "\n"));
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function f() { return this.eval('f.arguments instanceof Object ? "PASS" : "FAIL"'); }
diff --git a/LayoutTests/fast/js/function-dot-arguments2.html b/LayoutTests/fast/js/function-dot-arguments2.html
index a8eaf78..d4aa312 100644
--- a/LayoutTests/fast/js/function-dot-arguments2.html
+++ b/LayoutTests/fast/js/function-dot-arguments2.html
@@ -23,8 +23,8 @@
log("FAIL: " + aDescription + " should be " + b + " but instead is " + a + ".");
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
// eval should lazily create 'arguments'.
function f1() {
diff --git a/LayoutTests/fast/js/function-prototype.html b/LayoutTests/fast/js/function-prototype.html
index 789aceb..bbf9456 100644
--- a/LayoutTests/fast/js/function-prototype.html
+++ b/LayoutTests/fast/js/function-prototype.html
@@ -2,9 +2,9 @@
<head>
<script src="../js/resources/js-test-pre.js"></script>
<script>
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
}
</script>
</head>
@@ -34,8 +34,8 @@
</script>
<script src="../js/resources/js-test-post.js"></script>
<script>
-if (window.layoutTestController)
- layoutTestController.notifyDone();
+if (window.testRunner)
+ testRunner.notifyDone();
</script>
</body>
</html>
diff --git a/LayoutTests/fast/js/global-recursion-on-full-stack.html b/LayoutTests/fast/js/global-recursion-on-full-stack.html
index ae725b5..086b741 100644
--- a/LayoutTests/fast/js/global-recursion-on-full-stack.html
+++ b/LayoutTests/fast/js/global-recursion-on-full-stack.html
@@ -1,8 +1,8 @@
This tests global code recursion when the JS stack is full.
<div id="result">PASS: Entering global code with a full JS stack did not crash, and did not allow continued recursion.</id>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var depth = 0;
function f(a, b, c, d) {
diff --git a/LayoutTests/fast/js/global-var-limit.html b/LayoutTests/fast/js/global-var-limit.html
index c25475a..440d7ca 100644
--- a/LayoutTests/fast/js/global-var-limit.html
+++ b/LayoutTests/fast/js/global-var-limit.html
@@ -4,8 +4,8 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var pass = "PASS: Existing global var survived.\n";
diff --git a/LayoutTests/fast/js/implicit-global-to-global-reentry.html b/LayoutTests/fast/js/implicit-global-to-global-reentry.html
index 5510300..5a006a9 100644
--- a/LayoutTests/fast/js/implicit-global-to-global-reentry.html
+++ b/LayoutTests/fast/js/implicit-global-to-global-reentry.html
@@ -1,7 +1,7 @@
This test ensure that global-to-global re-entry works correctly and does not clobber anything. This passes if it does not crash.
<script>
-if (this.layoutTestController)
- layoutTestController.dumpAsText();
+if (this.testRunner)
+ testRunner.dumpAsText();
try {
// The important part of the test is the global reentry from the document.write passed implicitly to eval
// the rest is just to ensure the test crahes reliably (errr... or something) if something goes wrong with
diff --git a/LayoutTests/fast/js/invalid-syntax-for-function.html b/LayoutTests/fast/js/invalid-syntax-for-function.html
index 799e237..6099c76 100644
--- a/LayoutTests/fast/js/invalid-syntax-for-function.html
+++ b/LayoutTests/fast/js/invalid-syntax-for-function.html
@@ -3,6 +3,6 @@
https://bugs.webkit.org/show_bug.cgi?id=19025
</body>
<script>
-if (this.layoutTestController)
- layoutTestController.dumpAsText();
+if (this.testRunner)
+ testRunner.dumpAsText();
</script>
diff --git a/LayoutTests/fast/js/lexical-lookup-in-function-constructor.html b/LayoutTests/fast/js/lexical-lookup-in-function-constructor.html
index feeff28..0319dbc 100644
--- a/LayoutTests/fast/js/lexical-lookup-in-function-constructor.html
+++ b/LayoutTests/fast/js/lexical-lookup-in-function-constructor.html
@@ -1,6 +1,6 @@
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
message = "FAILURE (Bad lookup)";
function doTest() {
diff --git a/LayoutTests/fast/js/missing-style-end-tag-js.html b/LayoutTests/fast/js/missing-style-end-tag-js.html
index 058560f..273b784 100644
--- a/LayoutTests/fast/js/missing-style-end-tag-js.html
+++ b/LayoutTests/fast/js/missing-style-end-tag-js.html
@@ -3,9 +3,9 @@
<style>
.different { color: #0000ff; }
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpPixels();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpPixels();
}
</script>
<script src="resources/js-test-pre.js"></script>
diff --git a/LayoutTests/fast/js/mozilla/resources/js-test-post-async.js b/LayoutTests/fast/js/mozilla/resources/js-test-post-async.js
index 76777aa..afa3e18 100644
--- a/LayoutTests/fast/js/mozilla/resources/js-test-post-async.js
+++ b/LayoutTests/fast/js/mozilla/resources/js-test-post-async.js
@@ -1,5 +1,5 @@
shouldBeTrue("successfullyParsed");
debug('<br /><span class="pass">TEST COMPLETE</span>');
-if (window.layoutTestController)
- layoutTestController.notifyDone();
+if (window.testRunner)
+ testRunner.notifyDone();
diff --git a/LayoutTests/fast/js/mozilla/resources/js-test-post.js b/LayoutTests/fast/js/mozilla/resources/js-test-post.js
index 11a9e5f..7bf7404 100644
--- a/LayoutTests/fast/js/mozilla/resources/js-test-post.js
+++ b/LayoutTests/fast/js/mozilla/resources/js-test-post.js
@@ -1,8 +1,8 @@
wasPostTestScriptParsed = true;
if (window.jsTestIsAsync) {
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+ if (window.testRunner)
+ testRunner.waitUntilDone();
if (window.wasFinishJSTestCalled)
finishJSTest();
} else
diff --git a/LayoutTests/fast/js/mozilla/resources/js-test-pre.js b/LayoutTests/fast/js/mozilla/resources/js-test-pre.js
index 3e03b54..c3d6bfc 100644
--- a/LayoutTests/fast/js/mozilla/resources/js-test-pre.js
+++ b/LayoutTests/fast/js/mozilla/resources/js-test-pre.js
@@ -1,6 +1,6 @@
// svg/dynamic-updates tests set enablePixelTesting=true, as we want to dump text + pixel results
-if (window.layoutTestController)
- layoutTestController.dumpAsText(window.enablePixelTesting);
+if (window.testRunner)
+ testRunner.dumpAsText(window.enablePixelTesting);
function description(msg)
{
@@ -302,8 +302,8 @@
return;
shouldBeTrue("successfullyParsed");
debug('<br /><span class="pass">TEST COMPLETE</span>');
- if (window.jsTestIsAsync && window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.jsTestIsAsync && window.testRunner)
+ testRunner.notifyDone();
}
// shadow print()
diff --git a/LayoutTests/fast/js/navigator-language.html b/LayoutTests/fast/js/navigator-language.html
index 7bd56aa..6703ab2 100644
--- a/LayoutTests/fast/js/navigator-language.html
+++ b/LayoutTests/fast/js/navigator-language.html
@@ -9,9 +9,9 @@
"<pre>Check return value of navigator.language."
);
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setPOSIXLocale("en_US.iso88591");
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setPOSIXLocale("en_US.iso88591");
}
var language = navigator.language.toLowerCase();
diff --git a/LayoutTests/fast/js/navigator-plugins-crash.html b/LayoutTests/fast/js/navigator-plugins-crash.html
index c64ff94..b50b5a5 100644
--- a/LayoutTests/fast/js/navigator-plugins-crash.html
+++ b/LayoutTests/fast/js/navigator-plugins-crash.html
@@ -1,8 +1,8 @@
<html>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var plugins = new Array;
for (var i = 0; i < navigator.plugins.length; ++i) {
diff --git a/LayoutTests/fast/js/negate-overflow.html b/LayoutTests/fast/js/negate-overflow.html
index 5eeff6b..4f412c1 100644
--- a/LayoutTests/fast/js/negate-overflow.html
+++ b/LayoutTests/fast/js/negate-overflow.html
@@ -24,8 +24,8 @@
}
(function () {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
// Can be constant-folded by the parser.
var x = -(-2147483648);
diff --git a/LayoutTests/fast/js/nested-function-scope.html b/LayoutTests/fast/js/nested-function-scope.html
index 681de46..32674ca 100644
--- a/LayoutTests/fast/js/nested-function-scope.html
+++ b/LayoutTests/fast/js/nested-function-scope.html
@@ -16,8 +16,8 @@
}
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
log("Before parsing f:");
log("-----");
diff --git a/LayoutTests/fast/js/pic/cached-array-length-access.html b/LayoutTests/fast/js/pic/cached-array-length-access.html
index b0efb33..7743e6a 100644
--- a/LayoutTests/fast/js/pic/cached-array-length-access.html
+++ b/LayoutTests/fast/js/pic/cached-array-length-access.html
@@ -8,8 +8,8 @@
<script>
(function() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/pic/cached-deleted-properties.html b/LayoutTests/fast/js/pic/cached-deleted-properties.html
index b141ae3..9e990b8 100644
--- a/LayoutTests/fast/js/pic/cached-deleted-properties.html
+++ b/LayoutTests/fast/js/pic/cached-deleted-properties.html
@@ -7,8 +7,8 @@
<script>
(function() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/pic/cached-getter-dictionary-and-proto.html b/LayoutTests/fast/js/pic/cached-getter-dictionary-and-proto.html
index 560efad..167e44f 100644
--- a/LayoutTests/fast/js/pic/cached-getter-dictionary-and-proto.html
+++ b/LayoutTests/fast/js/pic/cached-getter-dictionary-and-proto.html
@@ -8,8 +8,8 @@
<script>
(function() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/pic/cached-getter-setter.html b/LayoutTests/fast/js/pic/cached-getter-setter.html
index 909ede9..6adc572 100644
--- a/LayoutTests/fast/js/pic/cached-getter-setter.html
+++ b/LayoutTests/fast/js/pic/cached-getter-setter.html
@@ -7,8 +7,8 @@
<script>
(function() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/pic/cached-named-property-getter.html b/LayoutTests/fast/js/pic/cached-named-property-getter.html
index 6aff806..3b874f6 100644
--- a/LayoutTests/fast/js/pic/cached-named-property-getter.html
+++ b/LayoutTests/fast/js/pic/cached-named-property-getter.html
@@ -7,8 +7,8 @@
<script>
(function() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/pic/cached-prototype-setter.html b/LayoutTests/fast/js/pic/cached-prototype-setter.html
index bd93743..19529fc 100644
--- a/LayoutTests/fast/js/pic/cached-prototype-setter.html
+++ b/LayoutTests/fast/js/pic/cached-prototype-setter.html
@@ -4,8 +4,8 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/pic/cached-prototype-then-immediate.html b/LayoutTests/fast/js/pic/cached-prototype-then-immediate.html
index cb6fb89..3765ed1 100644
--- a/LayoutTests/fast/js/pic/cached-prototype-then-immediate.html
+++ b/LayoutTests/fast/js/pic/cached-prototype-then-immediate.html
@@ -4,8 +4,8 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/pic/cached-single-entry-transition.html b/LayoutTests/fast/js/pic/cached-single-entry-transition.html
index 9ba78c9..5c6e849 100644
--- a/LayoutTests/fast/js/pic/cached-single-entry-transition.html
+++ b/LayoutTests/fast/js/pic/cached-single-entry-transition.html
@@ -8,8 +8,8 @@
<script>
(function() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/pic/delete-global-object.html b/LayoutTests/fast/js/pic/delete-global-object.html
index 817f16a..1f8fff0 100644
--- a/LayoutTests/fast/js/pic/delete-global-object.html
+++ b/LayoutTests/fast/js/pic/delete-global-object.html
@@ -7,8 +7,8 @@
<script>
(function() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/pic/dictionary-prototype.html b/LayoutTests/fast/js/pic/dictionary-prototype.html
index a4924b4..3b03f8c 100644
--- a/LayoutTests/fast/js/pic/dictionary-prototype.html
+++ b/LayoutTests/fast/js/pic/dictionary-prototype.html
@@ -7,8 +7,8 @@
<script>
(function() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/pic/get-empty-string.html b/LayoutTests/fast/js/pic/get-empty-string.html
index ac2fc91..a54875a 100644
--- a/LayoutTests/fast/js/pic/get-empty-string.html
+++ b/LayoutTests/fast/js/pic/get-empty-string.html
@@ -6,8 +6,8 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
(function() {
function log(s)
diff --git a/LayoutTests/fast/js/pic/get-set-proxy-object.html b/LayoutTests/fast/js/pic/get-set-proxy-object.html
index 741ae45..1c4df10 100644
--- a/LayoutTests/fast/js/pic/get-set-proxy-object.html
+++ b/LayoutTests/fast/js/pic/get-set-proxy-object.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/js/pic/rehash-poisons-structure.html b/LayoutTests/fast/js/pic/rehash-poisons-structure.html
index 0175aec..45c0352 100644
--- a/LayoutTests/fast/js/pic/rehash-poisons-structure.html
+++ b/LayoutTests/fast/js/pic/rehash-poisons-structure.html
@@ -8,8 +8,8 @@
<script>
(function() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/pic/undictionary.html b/LayoutTests/fast/js/pic/undictionary.html
index 8d6f91c..79b581d 100644
--- a/LayoutTests/fast/js/pic/undictionary.html
+++ b/LayoutTests/fast/js/pic/undictionary.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/js/regexp-caching.html b/LayoutTests/fast/js/regexp-caching.html
index 93d83ab..06ada70 100644
--- a/LayoutTests/fast/js/regexp-caching.html
+++ b/LayoutTests/fast/js/regexp-caching.html
@@ -45,8 +45,8 @@
}
function test() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
print("Properties of RegExp at startup:");
printPropertiesWithReadOnly(RegExp);
diff --git a/LayoutTests/fast/js/regexp-charclass-crash.html b/LayoutTests/fast/js/regexp-charclass-crash.html
index 3a600a8..7cae630 100644
--- a/LayoutTests/fast/js/regexp-charclass-crash.html
+++ b/LayoutTests/fast/js/regexp-charclass-crash.html
@@ -1,7 +1,7 @@
<p>Tests a crash in the regular expression engine. If this test prints a PASS message, then it succeeded.</p>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var string = "";
for (i = 0; i < 1000; ++i)
string += "[[**]]";
diff --git a/LayoutTests/fast/js/regexp-test-null-string.html b/LayoutTests/fast/js/regexp-test-null-string.html
index 5aacbc4..46bc767 100644
--- a/LayoutTests/fast/js/regexp-test-null-string.html
+++ b/LayoutTests/fast/js/regexp-test-null-string.html
@@ -20,8 +20,8 @@
log ("FAIL: " + aDescription + " should be '" + String(b) + "' but instead is '" + String(a) + "'.");
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var result = /define/.test();
shouldBe(result, "result", true);
diff --git a/LayoutTests/fast/js/resources/fs-test-post.js b/LayoutTests/fast/js/resources/fs-test-post.js
index 6d84656..e0a1f383 100644
--- a/LayoutTests/fast/js/resources/fs-test-post.js
+++ b/LayoutTests/fast/js/resources/fs-test-post.js
@@ -1,6 +1,6 @@
wasPostTestScriptParsed = true;
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
if (window.wasFinishJSTestCalled)
finishJSTest();
diff --git a/LayoutTests/fast/js/resources/garbage-collect-after-string-appends.js-disabled b/LayoutTests/fast/js/resources/garbage-collect-after-string-appends.js-disabled
index df7959d..b3730b6 100644
--- a/LayoutTests/fast/js/resources/garbage-collect-after-string-appends.js-disabled
+++ b/LayoutTests/fast/js/resources/garbage-collect-after-string-appends.js-disabled
@@ -6,8 +6,8 @@
// cost to the garbage collector. It should be improved to be less tied to these implementation details.
// <https://bugs.webkit.org/show_bug.cgi?id=20871>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
if (window.GCController)
GCController.collect();
diff --git a/LayoutTests/fast/js/resources/js-test-post-async.js b/LayoutTests/fast/js/resources/js-test-post-async.js
index 4f3f4a3..c933d70 100644
--- a/LayoutTests/fast/js/resources/js-test-post-async.js
+++ b/LayoutTests/fast/js/resources/js-test-post-async.js
@@ -3,5 +3,5 @@
shouldBeTrue("successfullyParsed");
debug('<br /><span class="pass">TEST COMPLETE</span>');
-if (window.layoutTestController)
- layoutTestController.notifyDone();
+if (window.testRunner)
+ testRunner.notifyDone();
diff --git a/LayoutTests/fast/js/resources/js-test-post.js b/LayoutTests/fast/js/resources/js-test-post.js
index 11a9e5f..7bf7404 100644
--- a/LayoutTests/fast/js/resources/js-test-post.js
+++ b/LayoutTests/fast/js/resources/js-test-post.js
@@ -1,8 +1,8 @@
wasPostTestScriptParsed = true;
if (window.jsTestIsAsync) {
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+ if (window.testRunner)
+ testRunner.waitUntilDone();
if (window.wasFinishJSTestCalled)
finishJSTest();
} else
diff --git a/LayoutTests/fast/js/resources/js-test-pre.js b/LayoutTests/fast/js/resources/js-test-pre.js
index 8c14b65..f4f502f 100644
--- a/LayoutTests/fast/js/resources/js-test-pre.js
+++ b/LayoutTests/fast/js/resources/js-test-pre.js
@@ -1,6 +1,6 @@
// svg/dynamic-updates tests set enablePixelTesting=true, as we want to dump text + pixel results
-if (self.layoutTestController)
- layoutTestController.dumpAsText(self.enablePixelTesting);
+if (self.testRunner)
+ testRunner.dumpAsText(self.enablePixelTesting);
var description, debug, successfullyParsed, errorMessage;
@@ -477,8 +477,8 @@
if (!self.wasPostTestScriptParsed)
return;
isSuccessfullyParsed();
- if (self.jsTestIsAsync && self.layoutTestController)
- layoutTestController.notifyDone();
+ if (self.jsTestIsAsync && self.testRunner)
+ testRunner.notifyDone();
}
function startWorker(testScriptURL, shared)
diff --git a/LayoutTests/fast/js/same-origin-subframe-about-blank.html b/LayoutTests/fast/js/same-origin-subframe-about-blank.html
index 4a815bb..1928db6 100644
--- a/LayoutTests/fast/js/same-origin-subframe-about-blank.html
+++ b/LayoutTests/fast/js/same-origin-subframe-about-blank.html
@@ -1,16 +1,16 @@
<html>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var target;
function check_blank() {
var x = target.location.private;
result.innerHTML = "Test PASSED";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function reload_blank() {
diff --git a/LayoutTests/fast/js/script-tests/cross-global-object-inline-global-var.js b/LayoutTests/fast/js/script-tests/cross-global-object-inline-global-var.js
index 23fefd1..02b60d8 100644
--- a/LayoutTests/fast/js/script-tests/cross-global-object-inline-global-var.js
+++ b/LayoutTests/fast/js/script-tests/cross-global-object-inline-global-var.js
@@ -2,8 +2,8 @@
"This tests that function inlining in the DFG JIT doesn't get confused by different global objects."
);
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
var b = 321;
@@ -19,7 +19,7 @@
testPassed("done() called with " + expected);
else
testFailed("done() called with " + value + ", but expected " + expected);
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
function doit() {
diff --git a/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal-with-variables.js b/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal-with-variables.js
index 09f135a..30ed8e0 100644
--- a/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal-with-variables.js
+++ b/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal-with-variables.js
@@ -2,8 +2,8 @@
"This tests that function inlining in the DFG JIT doesn't get confused about the global object to use for array allocation."
);
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
function foo(x) {
return [x, x + 1, x * 2];
@@ -17,7 +17,7 @@
testPassed("done() called with " + expected);
else
testFailed("done() called with " + value + ", but expected " + expected);
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
function doit() {
diff --git a/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal.js b/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal.js
index bd888c6..8426afc 100644
--- a/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal.js
+++ b/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal.js
@@ -2,8 +2,8 @@
"This tests that function inlining in the DFG JIT doesn't get confused about the global object to use for array allocation."
);
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
function foo() {
return [1, 2, 3];
@@ -17,7 +17,7 @@
testPassed("done() called with " + expected);
else
testFailed("done() called with " + value + ", but expected " + expected);
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
function doit() {
diff --git a/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-elements.js b/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-elements.js
index 74bf420..d67c459 100644
--- a/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-elements.js
+++ b/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-elements.js
@@ -2,8 +2,8 @@
"This tests that function inlining in the DFG JIT doesn't get confused about the global object to use for array allocation."
);
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
function foo() {
return new Array(1, 2, 3);
@@ -17,7 +17,7 @@
testPassed("done() called with " + expected);
else
testFailed("done() called with " + value + ", but expected " + expected);
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
function doit() {
diff --git a/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-size.js b/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-size.js
index c3d96c7..e860cfe 100644
--- a/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-size.js
+++ b/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-size.js
@@ -2,8 +2,8 @@
"This tests that function inlining in the DFG JIT doesn't get confused about the global object to use for array allocation."
);
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
function foo() {
return new Array(1000);
@@ -17,7 +17,7 @@
testPassed("done() called with " + expected);
else
testFailed("done() called with " + value + ", but expected " + expected);
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
function doit() {
diff --git a/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array.js b/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array.js
index 6d4bee8..9064d14 100644
--- a/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array.js
+++ b/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array.js
@@ -2,8 +2,8 @@
"This tests that function inlining in the DFG JIT doesn't get confused about the global object to use for array allocation."
);
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
function foo() {
return new Array();
@@ -17,7 +17,7 @@
testPassed("done() called with " + expected);
else
testFailed("done() called with " + value + ", but expected " + expected);
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
function doit() {
diff --git a/LayoutTests/fast/js/string-replace-exception-crash.html b/LayoutTests/fast/js/string-replace-exception-crash.html
index b542c54..bc18866 100644
--- a/LayoutTests/fast/js/string-replace-exception-crash.html
+++ b/LayoutTests/fast/js/string-replace-exception-crash.html
@@ -13,8 +13,8 @@
document.getElementById("console").appendChild(document.createTextNode(s + "\n"));
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
// these should not crash
diff --git a/LayoutTests/fast/js/text-field-resize.html b/LayoutTests/fast/js/text-field-resize.html
index 8decfa3..1bfb3a2 100644
--- a/LayoutTests/fast/js/text-field-resize.html
+++ b/LayoutTests/fast/js/text-field-resize.html
@@ -1,8 +1,8 @@
<HTML>
<HEAD>
<SCRIPT>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/throw-from-array-sort.html b/LayoutTests/fast/js/throw-from-array-sort.html
index 64e24a9..a78b742 100644
--- a/LayoutTests/fast/js/throw-from-array-sort.html
+++ b/LayoutTests/fast/js/throw-from-array-sort.html
@@ -9,8 +9,8 @@
document.getElementById("console").innerHTML = s + "\n";
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
var passed = true;
diff --git a/LayoutTests/fast/js/toString-and-valueOf-override.html b/LayoutTests/fast/js/toString-and-valueOf-override.html
index 5a98d63..efcd5ca 100644
--- a/LayoutTests/fast/js/toString-and-valueOf-override.html
+++ b/LayoutTests/fast/js/toString-and-valueOf-override.html
@@ -69,8 +69,8 @@
function runTests()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
test('span', document.createElement('span'));
diff --git a/LayoutTests/fast/js/toString-dontEnum.html b/LayoutTests/fast/js/toString-dontEnum.html
index 1c5ba81..d376d53 100644
--- a/LayoutTests/fast/js/toString-dontEnum.html
+++ b/LayoutTests/fast/js/toString-dontEnum.html
@@ -21,8 +21,8 @@
function runTests()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
// DOM objects with custom toString() functions
test(document.createElement('a'), "HTMLAnchorElement");
diff --git a/LayoutTests/fast/js/trivial-functions.html b/LayoutTests/fast/js/trivial-functions.html
index 79275db..cd990f3 100644
--- a/LayoutTests/fast/js/trivial-functions.html
+++ b/LayoutTests/fast/js/trivial-functions.html
@@ -27,8 +27,8 @@
function f1(a, b) { return a[b]; }
function f2(a, b, c) { return a[b] = c; }
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
shouldBe("f1(0, 0)", f1(0, 0), undefined);
shouldBe("f2(0, 0, 0)", f2(0, 0, 0), 0);
diff --git a/LayoutTests/fast/js/try-catch-crash.html b/LayoutTests/fast/js/try-catch-crash.html
index bfde9d8..94cc974 100644
--- a/LayoutTests/fast/js/try-catch-crash.html
+++ b/LayoutTests/fast/js/try-catch-crash.html
@@ -1,8 +1,8 @@
This test checks whether funky scope chains created by catch blocks
are properly protected from GC. It should not crash.
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function Test_Error() {
for( var i = 0; i <= 5000; i++ ) {
diff --git a/LayoutTests/fast/js/uncaught-exception-line-number.html b/LayoutTests/fast/js/uncaught-exception-line-number.html
index 96a3f36..82ef0212 100644
--- a/LayoutTests/fast/js/uncaught-exception-line-number.html
+++ b/LayoutTests/fast/js/uncaught-exception-line-number.html
@@ -5,7 +5,7 @@
look in the JS console for an uncaught exception on line 11.<br>
<script>
-if (window.layoutTestController) layoutTestController.dumpAsText();
+if (window.testRunner) testRunner.dumpAsText();
function foo() {
throw 'uh oh, an exception!';
diff --git a/LayoutTests/fast/js/var-declarations-shadowing.html b/LayoutTests/fast/js/var-declarations-shadowing.html
index b83981c..722c716 100644
--- a/LayoutTests/fast/js/var-declarations-shadowing.html
+++ b/LayoutTests/fast/js/var-declarations-shadowing.html
@@ -10,8 +10,8 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/var-declarations.html b/LayoutTests/fast/js/var-declarations.html
index eb9d804..e5d884b 100644
--- a/LayoutTests/fast/js/var-declarations.html
+++ b/LayoutTests/fast/js/var-declarations.html
@@ -2,8 +2,8 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/vardecl-preserve-parameters.html b/LayoutTests/fast/js/vardecl-preserve-parameters.html
index 672999d..12d83e4 100644
--- a/LayoutTests/fast/js/vardecl-preserve-parameters.html
+++ b/LayoutTests/fast/js/vardecl-preserve-parameters.html
@@ -3,8 +3,8 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/vardecl-preserve-vardecl.html b/LayoutTests/fast/js/vardecl-preserve-vardecl.html
index 0a2d599..eefee44 100644
--- a/LayoutTests/fast/js/vardecl-preserve-vardecl.html
+++ b/LayoutTests/fast/js/vardecl-preserve-vardecl.html
@@ -2,8 +2,8 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/while-expression-value.html b/LayoutTests/fast/js/while-expression-value.html
index 5a560bc..d92e13f 100644
--- a/LayoutTests/fast/js/while-expression-value.html
+++ b/LayoutTests/fast/js/while-expression-value.html
@@ -2,8 +2,8 @@
<pre id="console"></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function log(s)
{
diff --git a/LayoutTests/fast/js/window-location-href-file-urls.html b/LayoutTests/fast/js/window-location-href-file-urls.html
index 04dd76a..1175fe0 100644
--- a/LayoutTests/fast/js/window-location-href-file-urls.html
+++ b/LayoutTests/fast/js/window-location-href-file-urls.html
@@ -7,8 +7,8 @@
}
function runTests() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var str = window.location.href;
diff --git a/LayoutTests/fast/layers/add-layer-with-nested-stacking.html b/LayoutTests/fast/layers/add-layer-with-nested-stacking.html
index 4b5f8cf..db5e6e9 100644
--- a/LayoutTests/fast/layers/add-layer-with-nested-stacking.html
+++ b/LayoutTests/fast/layers/add-layer-with-nested-stacking.html
@@ -19,11 +19,11 @@
document.getElementById("test").style.display = "block";
}
- if (!window.layoutTestController)
+ if (!window.testRunner)
setTimeout(test, 0);
else {
document.body.offsetTop;
- layoutTestController.display();
+ testRunner.display();
test();
}
</script>
diff --git a/LayoutTests/fast/layers/assert-RenderLayer-update-positions.html b/LayoutTests/fast/layers/assert-RenderLayer-update-positions.html
index b2d1f0b..6396c42 100755
--- a/LayoutTests/fast/layers/assert-RenderLayer-update-positions.html
+++ b/LayoutTests/fast/layers/assert-RenderLayer-update-positions.html
@@ -22,16 +22,16 @@
</div>
</div>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function assert() {
var dimensionsContainer = document.getElementById("assertTrigger");
dimensionsContainer.setAttribute("class", "");
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
// Asynchronously change the style to force a style recalc later.
diff --git a/LayoutTests/fast/layers/clip-rects-assertion.html b/LayoutTests/fast/layers/clip-rects-assertion.html
index eee90bf..3a2d358 100644
--- a/LayoutTests/fast/layers/clip-rects-assertion.html
+++ b/LayoutTests/fast/layers/clip-rects-assertion.html
@@ -24,8 +24,8 @@
}
</style>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function doTest()
{
diff --git a/LayoutTests/fast/layers/clip-rects-transformed-2.html b/LayoutTests/fast/layers/clip-rects-transformed-2.html
index 35dd055..892de28 100644
--- a/LayoutTests/fast/layers/clip-rects-transformed-2.html
+++ b/LayoutTests/fast/layers/clip-rects-transformed-2.html
@@ -1,6 +1,6 @@
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<p>
Test 2/2 for <i><a href="rdar://problem/7398987">rdar://problem/7398987</a>
diff --git a/LayoutTests/fast/layers/clip-rects-transformed.html b/LayoutTests/fast/layers/clip-rects-transformed.html
index 71edfa5..14328f1 100644
--- a/LayoutTests/fast/layers/clip-rects-transformed.html
+++ b/LayoutTests/fast/layers/clip-rects-transformed.html
@@ -1,6 +1,6 @@
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<p>
Test 1/2 for <i><a href="rdar://problem/7398987">rdar://problem/7398987</a>
diff --git a/LayoutTests/fast/layers/generated-layer-scrollbar-crash.html b/LayoutTests/fast/layers/generated-layer-scrollbar-crash.html
index c2b6693..70a152d 100644
--- a/LayoutTests/fast/layers/generated-layer-scrollbar-crash.html
+++ b/LayoutTests/fast/layers/generated-layer-scrollbar-crash.html
@@ -9,8 +9,8 @@
}
</style>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/layers/inline-dirty-z-order-lists.html b/LayoutTests/fast/layers/inline-dirty-z-order-lists.html
index c874210..aa03175 100644
--- a/LayoutTests/fast/layers/inline-dirty-z-order-lists.html
+++ b/LayoutTests/fast/layers/inline-dirty-z-order-lists.html
@@ -16,9 +16,9 @@
document.getElementById("inner").style.display = "none";
}
- if (window.layoutTestController) {
+ if (window.testRunner) {
document.body.offsetTop;
- layoutTestController.display();
+ testRunner.display();
test();
} else
setTimeout(test, 0);
diff --git a/LayoutTests/fast/layers/layer-content-visibility-change.html b/LayoutTests/fast/layers/layer-content-visibility-change.html
index 4949a27..89d8be9 100644
--- a/LayoutTests/fast/layers/layer-content-visibility-change.html
+++ b/LayoutTests/fast/layers/layer-content-visibility-change.html
@@ -9,9 +9,9 @@
{
document.getElementById("inner").style.visibility = "visible";
}
- if (window.layoutTestController) {
+ if (window.testRunner) {
document.body.offsetTop;
- layoutTestController.display();
+ testRunner.display();
test();
} else
setTimeout(test, 0);
diff --git a/LayoutTests/fast/layers/layer-visibility.html b/LayoutTests/fast/layers/layer-visibility.html
index 19e7cfe..f480caf 100644
--- a/LayoutTests/fast/layers/layer-visibility.html
+++ b/LayoutTests/fast/layers/layer-visibility.html
@@ -13,8 +13,8 @@
</style>
<script>
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+if (window.testRunner)
+ testRunner.waitUntilDone();
var node1;
var node2;
@@ -94,8 +94,8 @@
// force layout
document.body.offsetTop;
-if (window.layoutTestController)
- layoutTestController.notifyDone();
+if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/fast/layers/nested-layers-1.html b/LayoutTests/fast/layers/nested-layers-1.html
index fc96fad..7935254 100644
--- a/LayoutTests/fast/layers/nested-layers-1.html
+++ b/LayoutTests/fast/layers/nested-layers-1.html
@@ -5,9 +5,9 @@
function test()
{
document.body.offsetTop;
- if (window.layoutTestController) {
- layoutTestController.display();
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.display();
+ testRunner.dumpAsText();
finish();
} else {
window.setTimeout(finish, 50);
diff --git a/LayoutTests/fast/layers/nested-layers-2.html b/LayoutTests/fast/layers/nested-layers-2.html
index 83b7076..c2e4e15a 100644
--- a/LayoutTests/fast/layers/nested-layers-2.html
+++ b/LayoutTests/fast/layers/nested-layers-2.html
@@ -5,9 +5,9 @@
function test()
{
document.body.offsetTop;
- if (window.layoutTestController) {
- layoutTestController.display();
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.display();
+ testRunner.dumpAsText();
finish();
} else {
window.setTimeout(finish, 50);
diff --git a/LayoutTests/fast/layers/nested-layers-3.html b/LayoutTests/fast/layers/nested-layers-3.html
index 3a242aa..d4938e9 100644
--- a/LayoutTests/fast/layers/nested-layers-3.html
+++ b/LayoutTests/fast/layers/nested-layers-3.html
@@ -5,9 +5,9 @@
function test()
{
document.body.offsetTop;
- if (window.layoutTestController) {
- layoutTestController.display();
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.display();
+ testRunner.dumpAsText();
finish();
} else {
window.setTimeout(finish, 50);
diff --git a/LayoutTests/fast/layers/nested-layers-4.html b/LayoutTests/fast/layers/nested-layers-4.html
index 0e99f5d..cbec375 100644
--- a/LayoutTests/fast/layers/nested-layers-4.html
+++ b/LayoutTests/fast/layers/nested-layers-4.html
@@ -5,9 +5,9 @@
function test()
{
document.body.offsetTop;
- if (window.layoutTestController) {
- layoutTestController.display();
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.display();
+ testRunner.dumpAsText();
finish();
} else {
window.setTimeout(finish, 50);
diff --git a/LayoutTests/fast/layers/remove-layer-with-nested-stacking.html b/LayoutTests/fast/layers/remove-layer-with-nested-stacking.html
index d1efdd8..aad78d7 100644
--- a/LayoutTests/fast/layers/remove-layer-with-nested-stacking.html
+++ b/LayoutTests/fast/layers/remove-layer-with-nested-stacking.html
@@ -11,11 +11,11 @@
document.getElementById("inner").style.float = "none";
}
- if (!window.layoutTestController)
+ if (!window.testRunner)
setTimeout(test, 0);
else {
document.body.offsetTop;
- layoutTestController.display();
+ testRunner.display();
test();
}
</script>
diff --git a/LayoutTests/fast/layers/remove-only-this-layer-update.html b/LayoutTests/fast/layers/remove-only-this-layer-update.html
index d6a468e..1831a94 100644
--- a/LayoutTests/fast/layers/remove-only-this-layer-update.html
+++ b/LayoutTests/fast/layers/remove-only-this-layer-update.html
@@ -8,11 +8,11 @@
<script>
function doTest() {
document.getElementById("outer").style.opacity = 1.0;
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
+ if (window.testRunner)
+ testRunner.waitUntilDone();
// Delay until after the first paint
setTimeout(doTest, 0);
</script>
diff --git a/LayoutTests/fast/layers/removed-by-scroll-handler.html b/LayoutTests/fast/layers/removed-by-scroll-handler.html
index d2f9ac6..593617d9 100644
--- a/LayoutTests/fast/layers/removed-by-scroll-handler.html
+++ b/LayoutTests/fast/layers/removed-by-scroll-handler.html
@@ -1,7 +1,7 @@
<script>
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
}
</script>
<p>
@@ -36,8 +36,8 @@
if (scrolledFirstContainer && scrolledSecondContainer) {
document.getElementById('result').innerText = "SUCCESS";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
</script>
diff --git a/LayoutTests/fast/layers/resize-layer-deletion-crash.html b/LayoutTests/fast/layers/resize-layer-deletion-crash.html
index 102716c..1f0a0aa 100644
--- a/LayoutTests/fast/layers/resize-layer-deletion-crash.html
+++ b/LayoutTests/fast/layers/resize-layer-deletion-crash.html
@@ -3,16 +3,16 @@
<script>
function test()
{
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
- layoutTestController.dumpAsText();
+ testRunner.dumpAsText();
document.body.offsetTop;
eventSender.mouseMoveTo(50, 50);
eventSender.mouseDown();
eventSender.mouseMoveTo(125, 125);
eventSender.mouseMoveTo(135, 135);
eventSender.mouseUp();
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
</script>
</head>
diff --git a/LayoutTests/fast/layers/scroll-with-transform-composited-layer.html b/LayoutTests/fast/layers/scroll-with-transform-composited-layer.html
index 56a49b8..5100778 100644
--- a/LayoutTests/fast/layers/scroll-with-transform-composited-layer.html
+++ b/LayoutTests/fast/layers/scroll-with-transform-composited-layer.html
@@ -21,8 +21,8 @@
}
</style>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
</script>
</head>
<body>
diff --git a/LayoutTests/fast/layers/scroll-with-transform-layer.html b/LayoutTests/fast/layers/scroll-with-transform-layer.html
index 0793c84..e586fad 100644
--- a/LayoutTests/fast/layers/scroll-with-transform-layer.html
+++ b/LayoutTests/fast/layers/scroll-with-transform-layer.html
@@ -21,8 +21,8 @@
}
</style>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
</script>
</head>
<body>
diff --git a/LayoutTests/fast/layers/scrollByLines-overflow-no-layer.html b/LayoutTests/fast/layers/scrollByLines-overflow-no-layer.html
index 5fb4665..6e4b4c5 100755
--- a/LayoutTests/fast/layers/scrollByLines-overflow-no-layer.html
+++ b/LayoutTests/fast/layers/scrollByLines-overflow-no-layer.html
@@ -9,8 +9,8 @@
}
</style>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function testScrollByLine()
{
diff --git a/LayoutTests/fast/layers/visible-layer-with-hidden-parent.html b/LayoutTests/fast/layers/visible-layer-with-hidden-parent.html
index 14dd46e..4cf17ee 100644
--- a/LayoutTests/fast/layers/visible-layer-with-hidden-parent.html
+++ b/LayoutTests/fast/layers/visible-layer-with-hidden-parent.html
@@ -1,7 +1,7 @@
<script>
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
}
</script>
@@ -15,8 +15,8 @@
window.addEventListener('load', function() {
window.setTimeout(function() {
document.getElementById("container").style.visibility = "visible";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 0);
}, false);
</script>
diff --git a/LayoutTests/fast/layers/zindex-hit-test.html b/LayoutTests/fast/layers/zindex-hit-test.html
index d5bb9f7..3bfc66d 100644
--- a/LayoutTests/fast/layers/zindex-hit-test.html
+++ b/LayoutTests/fast/layers/zindex-hit-test.html
@@ -19,8 +19,8 @@
}
</style>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function runTest()
{
diff --git a/LayoutTests/fast/leaks/001.html b/LayoutTests/fast/leaks/001.html
index d3c728a..27a2d1e 100644
--- a/LayoutTests/fast/leaks/001.html
+++ b/LayoutTests/fast/leaks/001.html
@@ -8,8 +8,8 @@
span { color: black; }
</style>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/leaks/002.html b/LayoutTests/fast/leaks/002.html
index 0b0ecd2..d941dd7 100644
--- a/LayoutTests/fast/leaks/002.html
+++ b/LayoutTests/fast/leaks/002.html
@@ -8,8 +8,8 @@
<script>
window.onload = function main()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
// Repeat, to generate lots of leaks.
for (var i = 0; i < 20; i++) { //>
diff --git a/LayoutTests/fast/leaks/003.html-disabled b/LayoutTests/fast/leaks/003.html-disabled
index dc7b0ba..2c78a8c 100644
--- a/LayoutTests/fast/leaks/003.html-disabled
+++ b/LayoutTests/fast/leaks/003.html-disabled
@@ -15,13 +15,13 @@
window.onload = function main()
{
- if (!window.layoutTestController || !window.GCController) {
- log("FAIL: This test uses the layoutTestController and the GCController, so it can only run in DumpRenderTree.\n");
+ if (!window.testRunner || !window.GCController) {
+ log("FAIL: This test uses the testRunner and the GCController, so it can only run in DumpRenderTree.\n");
return;
}
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
// Start with no garbage, so GC doesn't run automatically during the test.
GCController.collect();
@@ -54,7 +54,7 @@
log("PASS: " + wiggleRoom + " garbage JS objects or fewer left uncollected after destroying a frame.\n");
}
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
setTimeout(continueTest, 10);
}
diff --git a/LayoutTests/fast/line-grid/line-grid-nested.html b/LayoutTests/fast/line-grid/line-grid-nested.html
index b611d1e..faf26cf 100644
--- a/LayoutTests/fast/line-grid/line-grid-nested.html
+++ b/LayoutTests/fast/line-grid/line-grid-nested.html
@@ -7,8 +7,8 @@
}
</style>
<script>
-if (window.layoutTestController)
- window.layoutTestController.dumpAsText()
+if (window.testRunner)
+ window.testRunner.dumpAsText()
</script>
<body>
diff --git a/LayoutTests/fast/lists/alpha-boundary-values.html b/LayoutTests/fast/lists/alpha-boundary-values.html
index ee99fe6..4d49dde 100644
--- a/LayoutTests/fast/lists/alpha-boundary-values.html
+++ b/LayoutTests/fast/lists/alpha-boundary-values.html
@@ -19,8 +19,8 @@
</ol>
<script src="resources/dump-list.js"></script>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
filterListsWithReplacement(document.querySelectorAll("ol"));
}
</script>
diff --git a/LayoutTests/fast/lists/alpha-list-wrap.html b/LayoutTests/fast/lists/alpha-list-wrap.html
index ba28393..a8c797f 100644
--- a/LayoutTests/fast/lists/alpha-list-wrap.html
+++ b/LayoutTests/fast/lists/alpha-list-wrap.html
@@ -9,8 +9,8 @@
</script>
<script src="resources/dump-list.js"></script>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
filterListsWithReplacement([document.getElementById("test")]);
}
</script>
diff --git a/LayoutTests/fast/lists/calc-width-with-space.html b/LayoutTests/fast/lists/calc-width-with-space.html
index 607d240..d811493 100644
--- a/LayoutTests/fast/lists/calc-width-with-space.html
+++ b/LayoutTests/fast/lists/calc-width-with-space.html
@@ -16,8 +16,8 @@
result.appendChild(document.createTextNode("FAILED"));
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
diff --git a/LayoutTests/fast/lists/decimal-leading-zero.html b/LayoutTests/fast/lists/decimal-leading-zero.html
index 8e79866..8f5141e 100644
--- a/LayoutTests/fast/lists/decimal-leading-zero.html
+++ b/LayoutTests/fast/lists/decimal-leading-zero.html
@@ -24,8 +24,8 @@
</ol>
<script src="resources/dump-list.js"></script>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
filterListsWithReplacement(document.querySelectorAll("ol"));
}
</script>
diff --git a/LayoutTests/fast/lists/drag-into-marker.html b/LayoutTests/fast/lists/drag-into-marker.html
index 27d816f..2813e7d 100644
--- a/LayoutTests/fast/lists/drag-into-marker.html
+++ b/LayoutTests/fast/lists/drag-into-marker.html
@@ -7,10 +7,10 @@
<script>
function runTest() {
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
- window.layoutTestController.waitUntilDone();
+ window.testRunner.waitUntilDone();
var spanToDrag = document.getElementById("spanToDrag");
var x = spanToDrag.offsetLeft + spanToDrag.offsetWidth / 2;
@@ -40,7 +40,7 @@
eventSender.mouseMoveTo(x, y);
eventSender.mouseUp();
- window.layoutTestController.notifyDone();
+ window.testRunner.notifyDone();
}
runTest();
diff --git a/LayoutTests/fast/lists/item-not-in-list-line-wrapping.html b/LayoutTests/fast/lists/item-not-in-list-line-wrapping.html
index 43286a4..9bb336c 100644
--- a/LayoutTests/fast/lists/item-not-in-list-line-wrapping.html
+++ b/LayoutTests/fast/lists/item-not-in-list-line-wrapping.html
@@ -25,8 +25,8 @@
else
result.innerHTML = "FAILED: text.offsetWidth=" + text.offsetWidth;
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</body>
</html>
diff --git a/LayoutTests/fast/lists/li-values.html b/LayoutTests/fast/lists/li-values.html
index 7840366..ff2b3e6 100644
--- a/LayoutTests/fast/lists/li-values.html
+++ b/LayoutTests/fast/lists/li-values.html
@@ -6,15 +6,15 @@
document.getElementById("removeMyValue").removeAttribute("value");
document.getElementById("changeMyValue").setAttribute("value", "-5");
filterListsWithReplacement(document.querySelectorAll("ol"));
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function init()
{
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
setTimeout(finishTest, 0);
}
diff --git a/LayoutTests/fast/lists/list-style-type-dynamic-change.html b/LayoutTests/fast/lists/list-style-type-dynamic-change.html
index 0254c05..b2c9b19 100644
--- a/LayoutTests/fast/lists/list-style-type-dynamic-change.html
+++ b/LayoutTests/fast/lists/list-style-type-dynamic-change.html
@@ -21,8 +21,8 @@
</script>
<script src="resources/dump-list.js"></script>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
filterListsWithReplacement([document.getElementById("list")]);
}
</script>
diff --git a/LayoutTests/fast/lists/ol-nested-items-dynamic-insert.html b/LayoutTests/fast/lists/ol-nested-items-dynamic-insert.html
index 0b948d5..d07a2df 100644
--- a/LayoutTests/fast/lists/ol-nested-items-dynamic-insert.html
+++ b/LayoutTests/fast/lists/ol-nested-items-dynamic-insert.html
@@ -4,8 +4,8 @@
<script>
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var list = document.getElementById("list");
list.offsetTop; // Force a relayout.
diff --git a/LayoutTests/fast/lists/ol-nested-items-dynamic-remove.html b/LayoutTests/fast/lists/ol-nested-items-dynamic-remove.html
index 49d3a25..cf48c83 100644
--- a/LayoutTests/fast/lists/ol-nested-items-dynamic-remove.html
+++ b/LayoutTests/fast/lists/ol-nested-items-dynamic-remove.html
@@ -4,8 +4,8 @@
<script>
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var list = document.getElementById("list");
list.offsetTop; // Force a relayout.
diff --git a/LayoutTests/fast/lists/ol-nested-items.html b/LayoutTests/fast/lists/ol-nested-items.html
index 72e3192..1a9c2e0 100644
--- a/LayoutTests/fast/lists/ol-nested-items.html
+++ b/LayoutTests/fast/lists/ol-nested-items.html
@@ -4,8 +4,8 @@
<script>
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var list = document.getElementById("list");
document.getElementById("console").innerHTML = dumpList(list);
diff --git a/LayoutTests/fast/lists/ol-nested-list-dynamic-insert.html b/LayoutTests/fast/lists/ol-nested-list-dynamic-insert.html
index 9ebb938..6a97e2a 100644
--- a/LayoutTests/fast/lists/ol-nested-list-dynamic-insert.html
+++ b/LayoutTests/fast/lists/ol-nested-list-dynamic-insert.html
@@ -4,8 +4,8 @@
<script>
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var list = document.getElementById("list");
list.offsetTop; // Force a relayout.
diff --git a/LayoutTests/fast/lists/ol-nested-list-dynamic-remove.html b/LayoutTests/fast/lists/ol-nested-list-dynamic-remove.html
index 74ffdb5..d0841fd 100644
--- a/LayoutTests/fast/lists/ol-nested-list-dynamic-remove.html
+++ b/LayoutTests/fast/lists/ol-nested-list-dynamic-remove.html
@@ -4,8 +4,8 @@
<script>
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var list = document.getElementById("list");
list.offsetTop; // Force a relayout.
diff --git a/LayoutTests/fast/lists/ol-nested-list.html b/LayoutTests/fast/lists/ol-nested-list.html
index c2979ed..a0528ac 100644
--- a/LayoutTests/fast/lists/ol-nested-list.html
+++ b/LayoutTests/fast/lists/ol-nested-list.html
@@ -4,8 +4,8 @@
<script>
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var list = document.getElementById("list");
document.getElementById("console").innerHTML = dumpList(list);
diff --git a/LayoutTests/fast/lists/ol-reversed-dynamic-simple.html b/LayoutTests/fast/lists/ol-reversed-dynamic-simple.html
index 4050f88..6d2ed4a 100644
--- a/LayoutTests/fast/lists/ol-reversed-dynamic-simple.html
+++ b/LayoutTests/fast/lists/ol-reversed-dynamic-simple.html
@@ -4,8 +4,8 @@
<script>
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var list1 = document.getElementById("list1");
list1.offsetTop; // Force a relayout.
diff --git a/LayoutTests/fast/lists/ol-reversed-dynamic.html b/LayoutTests/fast/lists/ol-reversed-dynamic.html
index 1fe732e..8ef3438 100644
--- a/LayoutTests/fast/lists/ol-reversed-dynamic.html
+++ b/LayoutTests/fast/lists/ol-reversed-dynamic.html
@@ -4,8 +4,8 @@
<script>
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var list1 = document.getElementById("list1");
list1.offsetTop; // Force a relayout.
diff --git a/LayoutTests/fast/lists/ol-reversed-nested-items.html b/LayoutTests/fast/lists/ol-reversed-nested-items.html
index 5a9d5a1..4022209 100644
--- a/LayoutTests/fast/lists/ol-reversed-nested-items.html
+++ b/LayoutTests/fast/lists/ol-reversed-nested-items.html
@@ -4,8 +4,8 @@
<script>
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var list = document.getElementById("list");
document.getElementById("console").innerHTML = dumpList(list);
diff --git a/LayoutTests/fast/lists/ol-reversed-nested-list.html b/LayoutTests/fast/lists/ol-reversed-nested-list.html
index 8c46131..4bbf889 100644
--- a/LayoutTests/fast/lists/ol-reversed-nested-list.html
+++ b/LayoutTests/fast/lists/ol-reversed-nested-list.html
@@ -4,8 +4,8 @@
<script>
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var list = document.getElementById("list");
document.getElementById("console").innerHTML = dumpList(list);
diff --git a/LayoutTests/fast/lists/ol-reversed-simple.html b/LayoutTests/fast/lists/ol-reversed-simple.html
index 3cde91f..070335c 100644
--- a/LayoutTests/fast/lists/ol-reversed-simple.html
+++ b/LayoutTests/fast/lists/ol-reversed-simple.html
@@ -4,8 +4,8 @@
<script>
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var list1 = document.getElementById("list1");
document.getElementById("console1").innerHTML = dumpList(list1);
diff --git a/LayoutTests/fast/lists/ol-reversed-simple.xhtml b/LayoutTests/fast/lists/ol-reversed-simple.xhtml
index 52dcae7..a942bbe 100644
--- a/LayoutTests/fast/lists/ol-reversed-simple.xhtml
+++ b/LayoutTests/fast/lists/ol-reversed-simple.xhtml
@@ -5,8 +5,8 @@
<script>
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var list1 = document.getElementById("list1");
document.getElementById("console1").innerHTML = dumpList(list1);
diff --git a/LayoutTests/fast/lists/ol-start-roman.html b/LayoutTests/fast/lists/ol-start-roman.html
index 6a97174..a7f1e33 100644
--- a/LayoutTests/fast/lists/ol-start-roman.html
+++ b/LayoutTests/fast/lists/ol-start-roman.html
@@ -1,6 +1,6 @@
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<ol start="3888" type="i">
<li>PASS: test did not crash, bug 31652.</li>
diff --git a/LayoutTests/fast/lists/parent-box-not-box-crash.html b/LayoutTests/fast/lists/parent-box-not-box-crash.html
index 1d9272b..f102c57 100644
--- a/LayoutTests/fast/lists/parent-box-not-box-crash.html
+++ b/LayoutTests/fast/lists/parent-box-not-box-crash.html
@@ -9,8 +9,8 @@
}
</style>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/lists/positioned-count-crash.html b/LayoutTests/fast/lists/positioned-count-crash.html
index a62568a..f26a4b7 100644
--- a/LayoutTests/fast/lists/positioned-count-crash.html
+++ b/LayoutTests/fast/lists/positioned-count-crash.html
@@ -12,8 +12,8 @@
<script src="resources/dump-list.js"></script>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
document.write(testListItemMarkerEqualsListItemText(document.getElementById("test")));
}
</script>
diff --git a/LayoutTests/fast/lists/remove-listmarker-from-anonblock-with-continuation-crash.html b/LayoutTests/fast/lists/remove-listmarker-from-anonblock-with-continuation-crash.html
index 61b6430..564464d 100644
--- a/LayoutTests/fast/lists/remove-listmarker-from-anonblock-with-continuation-crash.html
+++ b/LayoutTests/fast/lists/remove-listmarker-from-anonblock-with-continuation-crash.html
@@ -20,6 +20,6 @@
document.documentElement.offsetHeight;
listItemElement.setAttribute('class', 'colSpanAll');
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
diff --git a/LayoutTests/fast/lists/resources/dump-list.js b/LayoutTests/fast/lists/resources/dump-list.js
index cc64603..6af620c 100644
--- a/LayoutTests/fast/lists/resources/dump-list.js
+++ b/LayoutTests/fast/lists/resources/dump-list.js
@@ -35,13 +35,13 @@
function dumpListItemAsHTML(listItemElement, depth)
{
- var marker = layoutTestController.markerTextForListItem(listItemElement);
+ var marker = testRunner.markerTextForListItem(listItemElement);
return marker ? indent(depth) + ' ' + marker + ' ' + listItemElement.innerText.trim() + '<br/>' : '';
}
function testListItemMarkerEqualsListItemText(listItemElement, depth)
{
- return testListItemMarkerEquals(layoutTestController.markerTextForListItem(listItemElement), listItemElement.innerText.trim());
+ return testListItemMarkerEquals(testRunner.markerTextForListItem(listItemElement), listItemElement.innerText.trim());
}
function testListItemMarkerEquals(actualMarkerText, expectedMarkerText)
diff --git a/LayoutTests/fast/lists/w3-css3-list-styles-alphabetic.html b/LayoutTests/fast/lists/w3-css3-list-styles-alphabetic.html
index df2acd13..952327b 100644
--- a/LayoutTests/fast/lists/w3-css3-list-styles-alphabetic.html
+++ b/LayoutTests/fast/lists/w3-css3-list-styles-alphabetic.html
@@ -10,10 +10,10 @@
<script>
function runTest()
{
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
- layoutTestController.dumpAsText();
+ testRunner.dumpAsText();
filterListsWithReplacement(document.querySelectorAll(".test ol"), testListItemMarkerEqualsListItemText);
document.body.removeChild(document.getElementById("description")); // Remove description when running in DRT.
}
diff --git a/LayoutTests/fast/lists/w3-css3-list-styles-fallback-style.html b/LayoutTests/fast/lists/w3-css3-list-styles-fallback-style.html
index 88a4b6b..58992e1 100644
--- a/LayoutTests/fast/lists/w3-css3-list-styles-fallback-style.html
+++ b/LayoutTests/fast/lists/w3-css3-list-styles-fallback-style.html
@@ -52,10 +52,10 @@
<script>
function runTest()
{
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
- layoutTestController.dumpAsText();
+ testRunner.dumpAsText();
filterListsWithReplacement(document.querySelectorAll(".test ol"), testListItemMarkerEqualsListItemText);
document.body.removeChild(document.getElementById("description")); // Remove description when running in DRT.
}
diff --git a/LayoutTests/fast/lists/w3-css3-list-styles-numeric.html b/LayoutTests/fast/lists/w3-css3-list-styles-numeric.html
index 061b1c0..7798b17 100644
--- a/LayoutTests/fast/lists/w3-css3-list-styles-numeric.html
+++ b/LayoutTests/fast/lists/w3-css3-list-styles-numeric.html
@@ -64,15 +64,15 @@
{
var isNegativeNumber = listItemElement.parentNode.className && listItemElement.parentNode.className.split(" ").indexOf("negative-number") > -1;
var expectedMarkerText = (isNegativeNumber ? "-" : "") + listItemElement.innerText;
- return testListItemMarkerEquals(layoutTestController.markerTextForListItem(listItemElement), expectedMarkerText);
+ return testListItemMarkerEquals(testRunner.markerTextForListItem(listItemElement), expectedMarkerText);
}
function runTest()
{
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
- layoutTestController.dumpAsText();
+ testRunner.dumpAsText();
filterListsWithReplacement(document.querySelectorAll(".test ol"), testListItemMarkerEqualsListItemText);
document.body.removeChild(document.getElementById("description")); // Remove description when running in DRT.
}
diff --git a/LayoutTests/fast/lists/w3-css3-list-styles-symbolic.html b/LayoutTests/fast/lists/w3-css3-list-styles-symbolic.html
index a237631..da3984f 100644
--- a/LayoutTests/fast/lists/w3-css3-list-styles-symbolic.html
+++ b/LayoutTests/fast/lists/w3-css3-list-styles-symbolic.html
@@ -17,10 +17,10 @@
<script>
function runTest()
{
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
- layoutTestController.dumpAsText();
+ testRunner.dumpAsText();
filterListsWithReplacement(document.querySelectorAll(".test ol"), testListItemMarkerEqualsListItemText);
document.body.removeChild(document.getElementById("description")); // Remove description when running in DRT.
}
diff --git a/LayoutTests/fast/lists/w3-css3-lower-armenian.html b/LayoutTests/fast/lists/w3-css3-lower-armenian.html
index d3ac9e4..88e0963 100644
--- a/LayoutTests/fast/lists/w3-css3-lower-armenian.html
+++ b/LayoutTests/fast/lists/w3-css3-lower-armenian.html
@@ -9,10 +9,10 @@
<script>
function runTest()
{
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
- layoutTestController.dumpAsText();
+ testRunner.dumpAsText();
filterListsWithReplacement(document.querySelectorAll(".test ol"), testListItemMarkerEqualsListItemText);
document.body.removeChild(document.getElementById("description")); // Remove description when running in DRT.
}
diff --git a/LayoutTests/fast/lists/w3-css3-upper-armenian.html b/LayoutTests/fast/lists/w3-css3-upper-armenian.html
index c1096b4..81b6a83 100644
--- a/LayoutTests/fast/lists/w3-css3-upper-armenian.html
+++ b/LayoutTests/fast/lists/w3-css3-upper-armenian.html
@@ -9,10 +9,10 @@
<script>
function runTest()
{
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
- layoutTestController.dumpAsText();
+ testRunner.dumpAsText();
filterListsWithReplacement(document.querySelectorAll(".test ol"), testListItemMarkerEqualsListItemText);
document.body.removeChild(document.getElementById("description")); // Remove description when running in DRT.
}
diff --git a/LayoutTests/fast/lists/w3-list-styles.html b/LayoutTests/fast/lists/w3-list-styles.html
index 50c9588..db0d67a 100644
--- a/LayoutTests/fast/lists/w3-list-styles.html
+++ b/LayoutTests/fast/lists/w3-list-styles.html
@@ -23,8 +23,8 @@
<script>
window.onload = function()
{
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
filterListsWithReplacement(document.querySelectorAll(".test ol"));
}
}
diff --git a/LayoutTests/fast/loader/about-blank-hash-change.html b/LayoutTests/fast/loader/about-blank-hash-change.html
index 27f2d57..bb59fcc 100644
--- a/LayoutTests/fast/loader/about-blank-hash-change.html
+++ b/LayoutTests/fast/loader/about-blank-hash-change.html
@@ -9,8 +9,8 @@
says "FAIL" then it fired two or more times. Also, the test may time out
looping on this event handler (which is also a failure). If the text says "No callback" then something else is broken :)</p>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+if (window.testRunner) {
+ testRunner.dumpAsText();
}
function onload_callback() {
diff --git a/LayoutTests/fast/loader/about-blank-hash-kept.html b/LayoutTests/fast/loader/about-blank-hash-kept.html
index 1a82e2b..39aa945 100644
--- a/LayoutTests/fast/loader/about-blank-hash-kept.html
+++ b/LayoutTests/fast/loader/about-blank-hash-kept.html
@@ -3,8 +3,8 @@
<p>See <a href="https://bugs.webkit.org/show_bug.cgi?id=35399">
https://bugs.webkit.org/show_bug.cgi?id=35399</a>.</p>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+if (window.testRunner) {
+ testRunner.dumpAsText();
}
function onload_callback() {
diff --git a/LayoutTests/fast/loader/api-test-go-to-current-back-forward-item.html-disabled b/LayoutTests/fast/loader/api-test-go-to-current-back-forward-item.html-disabled
index d3a332a..6cafc15 100644
--- a/LayoutTests/fast/loader/api-test-go-to-current-back-forward-item.html-disabled
+++ b/LayoutTests/fast/loader/api-test-go-to-current-back-forward-item.html-disabled
@@ -1,19 +1,19 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
- layoutTestController.dumpFrameLoadCallbacks();
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.dumpFrameLoadCallbacks();
if (sessionStorage.api_goto_current_bf_item) {
delete sessionStorage.api_goto_current_bf_item;
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
}
function loaded()
{
- if (window.layoutTestController) {
+ if (window.testRunner) {
sessionStorage.api_goto_current_bf_item = true;
- layoutTestController.apiTestGoToCurrentBackForwardItem();
+ testRunner.apiTestGoToCurrentBackForwardItem();
}
}
diff --git a/LayoutTests/fast/loader/api-test-new-window-data-load-base-url.html-disabled b/LayoutTests/fast/loader/api-test-new-window-data-load-base-url.html-disabled
index e34c341..ee97c32 100644
--- a/LayoutTests/fast/loader/api-test-new-window-data-load-base-url.html-disabled
+++ b/LayoutTests/fast/loader/api-test-new-window-data-load-base-url.html-disabled
@@ -1,6 +1,6 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+if (window.testRunner) {
+ testRunner.dumpAsText();
var dataURL = "<a id='anchor' href='#foo'>Hello</a><br><div id='foo'></div><s" + "cript>" +
"var evt = document.createEvent('MouseEvent');" +
@@ -8,7 +8,7 @@
"document.getElementById('anchor').dispatchEvent(evt);" +
"</s" + "cript>";
- layoutTestController.apiTestNewWindowDataLoadBaseURL(dataURL, "http://example.com/example.html");
+ testRunner.apiTestNewWindowDataLoadBaseURL(dataURL, "http://example.com/example.html");
}
</script>
<body>
diff --git a/LayoutTests/fast/loader/cancel-load-during-port-block-timer.html b/LayoutTests/fast/loader/cancel-load-during-port-block-timer.html
index 667c23c..de88335 100644
--- a/LayoutTests/fast/loader/cancel-load-during-port-block-timer.html
+++ b/LayoutTests/fast/loader/cancel-load-during-port-block-timer.html
@@ -1,14 +1,14 @@
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- layoutTestController.setCanOpenWindows();
- layoutTestController.setCloseRemainingWindowsWhenComplete();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.setCanOpenWindows();
+ testRunner.setCloseRemainingWindowsWhenComplete();
}
window.open("http://127.0.0.1:22").document.write('');
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
</script>
If this does crash, the test has passed.
diff --git a/LayoutTests/fast/loader/charset-parse.html b/LayoutTests/fast/loader/charset-parse.html
index 5cf11be..a83998d 100644
--- a/LayoutTests/fast/loader/charset-parse.html
+++ b/LayoutTests/fast/loader/charset-parse.html
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content=char>
<meta http-equiv="Content-Type" content="chcharset=windows-1255" />
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/loader/child-frame-add-after-back-forward.html b/LayoutTests/fast/loader/child-frame-add-after-back-forward.html
index f9e5adc..202c2d2 100644
--- a/LayoutTests/fast/loader/child-frame-add-after-back-forward.html
+++ b/LayoutTests/fast/loader/child-frame-add-after-back-forward.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
- layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
}
function navigate() {
diff --git a/LayoutTests/fast/loader/crash-copying-backforwardlist.html b/LayoutTests/fast/loader/crash-copying-backforwardlist.html
index 511c139..098a5eb 100644
--- a/LayoutTests/fast/loader/crash-copying-backforwardlist.html
+++ b/LayoutTests/fast/loader/crash-copying-backforwardlist.html
@@ -2,16 +2,16 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- layoutTestController.setCanOpenWindows(true);
- layoutTestController.setNewWindowsCopyBackForwardList(true);
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.setCanOpenWindows(true);
+ testRunner.setNewWindowsCopyBackForwardList(true);
}
</script>
</head>
-<body onload="window.open('data:text/html,<script>if (window.layoutTestController) layoutTestController.notifyDone();</script>');">
+<body onload="window.open('data:text/html,<script>if (window.testRunner) testRunner.notifyDone();</script>');">
<pre>
This test only works in DRT by tickling the [WebView _loadBackForwardListFromOtherView:] method.
If it doesn't crash, then the test passes.
diff --git a/LayoutTests/fast/loader/crash-replacing-location-before-load.html b/LayoutTests/fast/loader/crash-replacing-location-before-load.html
index d37baea..d8ffd1c 100644
--- a/LayoutTests/fast/loader/crash-replacing-location-before-load.html
+++ b/LayoutTests/fast/loader/crash-replacing-location-before-load.html
@@ -1,8 +1,8 @@
<script>
if (parent == window) {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function replaceHash(frag) {
frames[0].location.replace('#' + frag);
@@ -13,8 +13,8 @@
f.onload = function() {
delete f.onload;
replaceHash('bar');
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
document.body.appendChild(f);
replaceHash('foo');
diff --git a/LayoutTests/fast/loader/create-frame-in-DOMContentLoaded.html b/LayoutTests/fast/loader/create-frame-in-DOMContentLoaded.html
index 3f0988c..2e3d2a1 100644
--- a/LayoutTests/fast/loader/create-frame-in-DOMContentLoaded.html
+++ b/LayoutTests/fast/loader/create-frame-in-DOMContentLoaded.html
@@ -22,8 +22,8 @@
print("D) Exiting load event handler function.");
print("Test passed if messages A, B, C, D were all in order and there was no crash.");
}
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
addEventListener("load", handleLoadEvent);
addEventListener("DOMContentLoaded", handleDOMContentLoadedEvent);
</script>
diff --git a/LayoutTests/fast/loader/data-url-encoding-html.html b/LayoutTests/fast/loader/data-url-encoding-html.html
index 5b8e6ef..dc4d14e 100644
--- a/LayoutTests/fast/loader/data-url-encoding-html.html
+++ b/LayoutTests/fast/loader/data-url-encoding-html.html
@@ -3,8 +3,8 @@
<p>Test that non-ASCII data: URLs are handled correctly.</p>
<pre id=result></pre>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function test() {
document.getElementById("result").innerHTML += "1. " + (window.frames[0].document.body.innerHTML == "ðÒÏ×ÅÒËÁ" ? "SUCCESS" : "FAILURE") + ".\r";
diff --git a/LayoutTests/fast/loader/data-url-encoding-svg.html b/LayoutTests/fast/loader/data-url-encoding-svg.html
index 8c6a950..2528219 100644
--- a/LayoutTests/fast/loader/data-url-encoding-svg.html
+++ b/LayoutTests/fast/loader/data-url-encoding-svg.html
@@ -1,8 +1,8 @@
<meta charset="koi8-r">
<body onload="test()">
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function result(i) {
return window.frames[i].document.documentElement.getAttribute("test");
diff --git a/LayoutTests/fast/loader/document-destruction-within-unload.html b/LayoutTests/fast/loader/document-destruction-within-unload.html
index b9c7677..e1a6cd8 100644
--- a/LayoutTests/fast/loader/document-destruction-within-unload.html
+++ b/LayoutTests/fast/loader/document-destruction-within-unload.html
@@ -1,14 +1,14 @@
<html>
<body>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function done() {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
<iframe src="resources/document-destruction-within-unload-iframe.html"></iframe>
diff --git a/LayoutTests/fast/loader/document-with-fragment-url-1.html b/LayoutTests/fast/loader/document-with-fragment-url-1.html
index 13cd245..5f9a5c5 100644
--- a/LayoutTests/fast/loader/document-with-fragment-url-1.html
+++ b/LayoutTests/fast/loader/document-with-fragment-url-1.html
@@ -5,9 +5,9 @@
else
delete sessionStorage.in_document_with_fragment_url_1;
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function documentURLHash()
@@ -42,8 +42,8 @@
eventSender.mouseUp();
} else {
alert("Second load complete. URL's current hash is " + documentURLHash());
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
diff --git a/LayoutTests/fast/loader/document-with-fragment-url-2.html b/LayoutTests/fast/loader/document-with-fragment-url-2.html
index 25929c2..f48ed65 100644
--- a/LayoutTests/fast/loader/document-with-fragment-url-2.html
+++ b/LayoutTests/fast/loader/document-with-fragment-url-2.html
@@ -1,7 +1,7 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
}
location = "resources/document-with-fragment-url-test.html#foo";
diff --git a/LayoutTests/fast/loader/document-with-fragment-url-3.html b/LayoutTests/fast/loader/document-with-fragment-url-3.html
index c5d296e..f3bc342 100644
--- a/LayoutTests/fast/loader/document-with-fragment-url-3.html
+++ b/LayoutTests/fast/loader/document-with-fragment-url-3.html
@@ -5,9 +5,9 @@
else
delete sessionStorage.in_document_with_fragment_url_3;
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function documentURLHash()
@@ -35,8 +35,8 @@
eventSender.mouseUp();
} else {
alert("Second load complete. URL's current hash is " + documentURLHash());
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
diff --git a/LayoutTests/fast/loader/document-with-fragment-url-4.html b/LayoutTests/fast/loader/document-with-fragment-url-4.html
index 91be256..503ecc5 100644
--- a/LayoutTests/fast/loader/document-with-fragment-url-4.html
+++ b/LayoutTests/fast/loader/document-with-fragment-url-4.html
@@ -5,9 +5,9 @@
else
delete sessionStorage.in_document_with_fragment_url_4;
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function documentURLHash()
@@ -35,8 +35,8 @@
eventSender.mouseUp();
} else {
alert("Second load complete. URL's current hash is " + documentURLHash());
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
diff --git a/LayoutTests/fast/loader/dynamic-iframe-extra-back-forward-item.html b/LayoutTests/fast/loader/dynamic-iframe-extra-back-forward-item.html
index 3573a81..fa2e63d 100644
--- a/LayoutTests/fast/loader/dynamic-iframe-extra-back-forward-item.html
+++ b/LayoutTests/fast/loader/dynamic-iframe-extra-back-forward-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();
}
function loaded()
diff --git a/LayoutTests/fast/loader/early-load-cancel.html b/LayoutTests/fast/loader/early-load-cancel.html
index 0f299d6..25d7ba4 100644
--- a/LayoutTests/fast/loader/early-load-cancel.html
+++ b/LayoutTests/fast/loader/early-load-cancel.html
@@ -7,6 +7,6 @@
bug is fixed.</p>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
diff --git a/LayoutTests/fast/loader/empty-embed-src-attribute.html b/LayoutTests/fast/loader/empty-embed-src-attribute.html
index 94e8fca..ac63431 100644
--- a/LayoutTests/fast/loader/empty-embed-src-attribute.html
+++ b/LayoutTests/fast/loader/empty-embed-src-attribute.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/loader/empty-ref-versus-no-ref.html b/LayoutTests/fast/loader/empty-ref-versus-no-ref.html
index 085eafa..36a066a 100644
--- a/LayoutTests/fast/loader/empty-ref-versus-no-ref.html
+++ b/LayoutTests/fast/loader/empty-ref-versus-no-ref.html
@@ -2,8 +2,8 @@
<head>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function runTest() {
window.location.hash = '#foobarbaz';
diff --git a/LayoutTests/fast/loader/external-script-URL-location.html b/LayoutTests/fast/loader/external-script-URL-location.html
index 194808e..0074557 100644
--- a/LayoutTests/fast/loader/external-script-URL-location.html
+++ b/LayoutTests/fast/loader/external-script-URL-location.html
@@ -1,8 +1,8 @@
<body onload="test()">
FAILURE
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function test()
{
document.write("<br>Test 1<br>File in URL: " + leafName(document.URL) + "<br><script src='resources/external-script-URL-location.js'></scr" + "ipt>");
diff --git a/LayoutTests/fast/loader/file-URL-with-port-number.html b/LayoutTests/fast/loader/file-URL-with-port-number.html
index f68f677..5b80462 100644
--- a/LayoutTests/fast/loader/file-URL-with-port-number.html
+++ b/LayoutTests/fast/loader/file-URL-with-port-number.html
@@ -3,15 +3,15 @@
function subframeLoaded()
{
document.getElementById("result").appendChild(document.createTextNode("SUCCESS: The subframe loaded."));
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function runTest()
{
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var subframeLocation = window.location + "";
diff --git a/LayoutTests/fast/loader/file-protocol-fragment.html b/LayoutTests/fast/loader/file-protocol-fragment.html
index 74ecbef..5e940e0 100644
--- a/LayoutTests/fast/loader/file-protocol-fragment.html
+++ b/LayoutTests/fast/loader/file-protocol-fragment.html
@@ -1,11 +1,11 @@
<html>
<head>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpResourceLoadCallbacks();
- if (layoutTestController.setSerializeHTTPLoads)
- layoutTestController.setSerializeHTTPLoads();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpResourceLoadCallbacks();
+ if (testRunner.setSerializeHTTPLoads)
+ testRunner.setSerializeHTTPLoads();
} else {
document.write ('This test must be run through DumpRenderTree.')
}
diff --git a/LayoutTests/fast/loader/font-face-empty.html b/LayoutTests/fast/loader/font-face-empty.html
index 3e17d2f..0ab5b5f 100644
--- a/LayoutTests/fast/loader/font-face-empty.html
+++ b/LayoutTests/fast/loader/font-face-empty.html
@@ -5,8 +5,8 @@
}
</style>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<p>This is a test for <a href="http://bugs.webkit.org/show_bug.cgi?id=16996">Bug 16996: Crash in
createFontCustomPlatformData when loading 0-byte font via @font-face</a>.</p>
diff --git a/LayoutTests/fast/loader/for-window-event-onload-scripts.html b/LayoutTests/fast/loader/for-window-event-onload-scripts.html
index 638c6e6..927aac5 100644
--- a/LayoutTests/fast/loader/for-window-event-onload-scripts.html
+++ b/LayoutTests/fast/loader/for-window-event-onload-scripts.html
@@ -1,6 +1,6 @@
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<script for="body" event="onload()">
diff --git a/LayoutTests/fast/loader/form-events-back-forward.html-disabled b/LayoutTests/fast/loader/form-events-back-forward.html-disabled
index a9c000e..b180013 100644
--- a/LayoutTests/fast/loader/form-events-back-forward.html-disabled
+++ b/LayoutTests/fast/loader/form-events-back-forward.html-disabled
@@ -3,9 +3,9 @@
<script>
function test()
{
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
if (window.navigationController)
@@ -18,8 +18,8 @@
e.initEvent("click", true, false);
document.getElementById('button').dispatchEvent(e);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function button_onClick()
diff --git a/LayoutTests/fast/loader/form-state-restore-with-locked-back-forward-list.html b/LayoutTests/fast/loader/form-state-restore-with-locked-back-forward-list.html
index 83d5d22..e5b51af 100644
--- a/LayoutTests/fast/loader/form-state-restore-with-locked-back-forward-list.html
+++ b/LayoutTests/fast/loader/form-state-restore-with-locked-back-forward-list.html
@@ -6,9 +6,9 @@
<input name="TestName2" type="hidden" value="Bad2">
</form>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
</script>
</body>
diff --git a/LayoutTests/fast/loader/form-submission-after-beforeunload-cancel.html b/LayoutTests/fast/loader/form-submission-after-beforeunload-cancel.html
index 00cfa76..48d56e1 100644
--- a/LayoutTests/fast/loader/form-submission-after-beforeunload-cancel.html
+++ b/LayoutTests/fast/loader/form-submission-after-beforeunload-cancel.html
@@ -1,8 +1,8 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
- layoutTestController.setShouldStayOnPageAfterHandlingBeforeUnload(true);
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.setShouldStayOnPageAfterHandlingBeforeUnload(true);
}
_confirmationDialogDisplayedOnce = false;
@@ -13,13 +13,13 @@
return "Click 'Leave Page'";
window.setTimeout(function() {
- if (window.layoutTestController)
- layoutTestController.setShouldStayOnPageAfterHandlingBeforeUnload(false);
+ if (window.testRunner)
+ testRunner.setShouldStayOnPageAfterHandlingBeforeUnload(false);
window.setTimeout(function() {
document.getElementById("console").innerHTML = "FAIL";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 1000);
document.forms[0].submit();
diff --git a/LayoutTests/fast/loader/form-submission-before-load-get.html b/LayoutTests/fast/loader/form-submission-before-load-get.html
index f4da147..32d47368 100644
--- a/LayoutTests/fast/loader/form-submission-before-load-get.html
+++ b/LayoutTests/fast/loader/form-submission-before-load-get.html
@@ -1,10 +1,10 @@
<form method="get" action="resources/form-submission-before-load-page2.html"></form>
<script>
-if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.dumpBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
// Test that submitting the form, using a GET method, before the 'load' event
// results in the current session history item being replaced by the next one.
diff --git a/LayoutTests/fast/loader/form-submission-before-load-post.html b/LayoutTests/fast/loader/form-submission-before-load-post.html
index d8d5585..b5394ba 100644
--- a/LayoutTests/fast/loader/form-submission-before-load-post.html
+++ b/LayoutTests/fast/loader/form-submission-before-load-post.html
@@ -1,10 +1,10 @@
<form method="post" action="resources/form-submission-before-load-page2.html"></form>
<script>
-if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.dumpBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
// Test that submitting the form, using a POST method, before the 'load' event
// results in the current session history item being replaced by the next one.
diff --git a/LayoutTests/fast/loader/form-submit-aborts-parsing.html b/LayoutTests/fast/loader/form-submit-aborts-parsing.html
index 3abc34e..3fff14e 100644
--- a/LayoutTests/fast/loader/form-submit-aborts-parsing.html
+++ b/LayoutTests/fast/loader/form-submit-aborts-parsing.html
@@ -1,8 +1,8 @@
<form method="POST" action="resources/location-change-aborts-parsing-pass.html"></form>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
document.forms[0].submit();
</script>
diff --git a/LayoutTests/fast/loader/fragment-after-redirect-gets-back-entry.html b/LayoutTests/fast/loader/fragment-after-redirect-gets-back-entry.html
index aa9d745..608c7f5 100644
--- a/LayoutTests/fast/loader/fragment-after-redirect-gets-back-entry.html
+++ b/LayoutTests/fast/loader/fragment-after-redirect-gets-back-entry.html
@@ -1,9 +1,9 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpBackForwardList();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpBackForwardList();
+ testRunner.waitUntilDone();
}
window.location.replace('resources/click-fragment-link.html');
diff --git a/LayoutTests/fast/loader/frame-creation-removal.html b/LayoutTests/fast/loader/frame-creation-removal.html
index 844ed8a..8327343 100644
--- a/LayoutTests/fast/loader/frame-creation-removal.html
+++ b/LayoutTests/fast/loader/frame-creation-removal.html
@@ -2,8 +2,8 @@
<head>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function loaded()
{
diff --git a/LayoutTests/fast/loader/frame-location-change-not-added-to-history.html b/LayoutTests/fast/loader/frame-location-change-not-added-to-history.html
index ab96c4d..35a28ef 100644
--- a/LayoutTests/fast/loader/frame-location-change-not-added-to-history.html
+++ b/LayoutTests/fast/loader/frame-location-change-not-added-to-history.html
@@ -11,8 +11,8 @@
f.onload = function() {
document.body.innerText = "history.length = " + history.length;
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
@@ -21,11 +21,11 @@
}
onload = function() {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpBackForwardList();
- layoutTestController.clearBackForwardList();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpBackForwardList();
+ testRunner.clearBackForwardList();
+ testRunner.waitUntilDone();
}
setTimeout(runTest, 0);
}
diff --git a/LayoutTests/fast/loader/frame-src-change-added-to-history.html b/LayoutTests/fast/loader/frame-src-change-added-to-history.html
index 482a1a1..9ba60a9 100644
--- a/LayoutTests/fast/loader/frame-src-change-added-to-history.html
+++ b/LayoutTests/fast/loader/frame-src-change-added-to-history.html
@@ -2,19 +2,19 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpChildFramesAsText();
- layoutTestController.dumpBackForwardList();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
+ testRunner.dumpBackForwardList();
+ testRunner.waitUntilDone();
}
var count = 4;
function frameLoaded() {
if (count == 0) {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
} else {
document.getElementsByTagName('iframe')[0].src = "data:," + count--;
}
diff --git a/LayoutTests/fast/loader/frame-src-change-not-added-to-history.html b/LayoutTests/fast/loader/frame-src-change-not-added-to-history.html
index baa2d51..811b927 100644
--- a/LayoutTests/fast/loader/frame-src-change-not-added-to-history.html
+++ b/LayoutTests/fast/loader/frame-src-change-not-added-to-history.html
@@ -11,8 +11,8 @@
f.onload = function() {
document.body.innerText = "history.length = " + history.length;
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
@@ -21,11 +21,11 @@
}
onload = function() {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpBackForwardList();
- layoutTestController.clearBackForwardList();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpBackForwardList();
+ testRunner.clearBackForwardList();
+ testRunner.waitUntilDone();
}
setTimeout(runTest, 0);
}
diff --git a/LayoutTests/fast/loader/frames-with-unload-handlers-in-page-cache.html b/LayoutTests/fast/loader/frames-with-unload-handlers-in-page-cache.html
index 6868e13..8297733 100644
--- a/LayoutTests/fast/loader/frames-with-unload-handlers-in-page-cache.html
+++ b/LayoutTests/fast/loader/frames-with-unload-handlers-in-page-cache.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
}
window.onload = function() {
diff --git a/LayoutTests/fast/loader/goto-anchor-infinite-layout.html b/LayoutTests/fast/loader/goto-anchor-infinite-layout.html
index 7c227ac..b48baf0 100644
--- a/LayoutTests/fast/loader/goto-anchor-infinite-layout.html
+++ b/LayoutTests/fast/loader/goto-anchor-infinite-layout.html
@@ -15,8 +15,8 @@
This is the anchor.
</div>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
document.write(location.href="#anchor");
</script>
diff --git a/LayoutTests/fast/loader/grandparent-completion-starts-redirect.html b/LayoutTests/fast/loader/grandparent-completion-starts-redirect.html
index 57d6fac..ab88181 100644
--- a/LayoutTests/fast/loader/grandparent-completion-starts-redirect.html
+++ b/LayoutTests/fast/loader/grandparent-completion-starts-redirect.html
@@ -1,10 +1,10 @@
<html>
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpChildFramesAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
+ testRunner.waitUntilDone();
}
</script>
</head>
diff --git a/LayoutTests/fast/loader/hashchange-event-async.html b/LayoutTests/fast/loader/hashchange-event-async.html
index 50be67d..f4eeb8e 100644
--- a/LayoutTests/fast/loader/hashchange-event-async.html
+++ b/LayoutTests/fast/loader/hashchange-event-async.html
@@ -14,7 +14,7 @@
var failed = false;
var msgs = [];
-var lc = window.layoutTestController;
+var lc = window.testRunner;
if (lc) {
lc.dumpAsText();
lc.waitUntilDone();
diff --git a/LayoutTests/fast/loader/hashchange-event.html b/LayoutTests/fast/loader/hashchange-event.html
index e0ab208..44bbcba 100644
--- a/LayoutTests/fast/loader/hashchange-event.html
+++ b/LayoutTests/fast/loader/hashchange-event.html
@@ -17,9 +17,9 @@
sessionStorage.clear();
sessionStorage.totalEventsFired = 0;
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function startTest()
@@ -54,8 +54,8 @@
location.hash="";
location.href=location.href.substr(0, location.href.length - 1);
}
- if (testNumber == 2 && sessionStorage.totalEventsFired == targetNumberOfEventsForSecondTest && window.layoutTestController) {
- layoutTestController.notifyDone();
+ if (testNumber == 2 && sessionStorage.totalEventsFired == targetNumberOfEventsForSecondTest && window.testRunner) {
+ testRunner.notifyDone();
sessionStorage.clear();
}
}
diff --git a/LayoutTests/fast/loader/history-forward-in-head.html b/LayoutTests/fast/loader/history-forward-in-head.html
index 17941a9..bba8323 100644
--- a/LayoutTests/fast/loader/history-forward-in-head.html
+++ b/LayoutTests/fast/loader/history-forward-in-head.html
@@ -1,8 +1,8 @@
<html>
<head>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
history.forward();
</script>
diff --git a/LayoutTests/fast/loader/iframe-recursive-synchronous-load.html b/LayoutTests/fast/loader/iframe-recursive-synchronous-load.html
index a49949f..aa122cb 100644
--- a/LayoutTests/fast/loader/iframe-recursive-synchronous-load.html
+++ b/LayoutTests/fast/loader/iframe-recursive-synchronous-load.html
@@ -5,8 +5,8 @@
<p>PASS: You didn't crash.</p>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function addFrame()
{
diff --git a/LayoutTests/fast/loader/image-in-page-cache.html b/LayoutTests/fast/loader/image-in-page-cache.html
index e01a94f..4a6eaa7 100644
--- a/LayoutTests/fast/loader/image-in-page-cache.html
+++ b/LayoutTests/fast/loader/image-in-page-cache.html
@@ -6,11 +6,11 @@
<script>
var otherWindow;
function runTest() {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- layoutTestController.setCanOpenWindows();
- layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.setCanOpenWindows();
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
}
// This test open two windows. One primary window will load animated-image.html.
diff --git a/LayoutTests/fast/loader/inherit-charset-to-empty-frame.html b/LayoutTests/fast/loader/inherit-charset-to-empty-frame.html
index 7887aa2..55dff39 100644
--- a/LayoutTests/fast/loader/inherit-charset-to-empty-frame.html
+++ b/LayoutTests/fast/loader/inherit-charset-to-empty-frame.html
@@ -6,8 +6,8 @@
<p>Test that a programmatically created empty iframe inherits charset from the parent.
<p id=result>
<script type="text/javascript">
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function createEmptyIframe() {
if (!document.getElementById('containerName')) {
diff --git a/LayoutTests/fast/loader/input-element-page-cache-crash.html b/LayoutTests/fast/loader/input-element-page-cache-crash.html
index 891d941..e36db20 100644
--- a/LayoutTests/fast/loader/input-element-page-cache-crash.html
+++ b/LayoutTests/fast/loader/input-element-page-cache-crash.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
}
function runTest()
@@ -33,8 +33,8 @@
{
if (sessionStorage.finishTest) {
console.log('navigated back');
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
} else {
runTest();
}
diff --git a/LayoutTests/fast/loader/javascript-url-encoding-2.html b/LayoutTests/fast/loader/javascript-url-encoding-2.html
index ed4da69..4b0503e 100644
--- a/LayoutTests/fast/loader/javascript-url-encoding-2.html
+++ b/LayoutTests/fast/loader/javascript-url-encoding-2.html
@@ -3,11 +3,11 @@
<script>
function test()
{
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
- window.location.href="javascript:'<p foo=\"?\">Should be Cyrillic text, not U+FFFD REPLACEMENT CHARACTERS: Ïðîâåðêà</p><script>if (window.layoutTestController) layoutTestController.notifyDone()</scr" + "ipt>'";
+ window.location.href="javascript:'<p foo=\"?\">Should be Cyrillic text, not U+FFFD REPLACEMENT CHARACTERS: Ïðîâåðêà</p><script>if (window.testRunner) testRunner.notifyDone()</scr" + "ipt>'";
}
</script>
</head>
diff --git a/LayoutTests/fast/loader/javascript-url-encoding.html b/LayoutTests/fast/loader/javascript-url-encoding.html
index fe74c68..34aacc7 100644
--- a/LayoutTests/fast/loader/javascript-url-encoding.html
+++ b/LayoutTests/fast/loader/javascript-url-encoding.html
@@ -1,8 +1,8 @@
<meta charset="windows-1251">
<body onload="test()">
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function test() {
document.getElementById("result").innerHTML = "1. " + (window.frames[0].document.body.innerHTML == "SUÑÑÅSS" ? "SUCCESS" : "FAILURE: " + window.frames[0].document.body.innerHTML) + ".\r";
diff --git a/LayoutTests/fast/loader/javascript-url-hierarchical-execution.html b/LayoutTests/fast/loader/javascript-url-hierarchical-execution.html
index e1e2122..4cb1491 100644
--- a/LayoutTests/fast/loader/javascript-url-hierarchical-execution.html
+++ b/LayoutTests/fast/loader/javascript-url-hierarchical-execution.html
@@ -1,8 +1,8 @@
<html>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setCustomPolicyDelegate(true, true);
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setCustomPolicyDelegate(true, true);
}
function runTest()
diff --git a/LayoutTests/fast/loader/javascript-url-iframe-crash.html b/LayoutTests/fast/loader/javascript-url-iframe-crash.html
index 4d191ed..4bdb972 100644
--- a/LayoutTests/fast/loader/javascript-url-iframe-crash.html
+++ b/LayoutTests/fast/loader/javascript-url-iframe-crash.html
@@ -3,7 +3,7 @@
<a>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
This test passes if it doesn't crash.
diff --git a/LayoutTests/fast/loader/javascript-url-iframe-remove-on-navigate.html b/LayoutTests/fast/loader/javascript-url-iframe-remove-on-navigate.html
index 06e3322..5d75123 100644
--- a/LayoutTests/fast/loader/javascript-url-iframe-remove-on-navigate.html
+++ b/LayoutTests/fast/loader/javascript-url-iframe-remove-on-navigate.html
@@ -1,8 +1,8 @@
<iframe src="http://does.not.exist/" id="target"></iframe>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
setTimeout(function() {
@@ -11,7 +11,7 @@
window.addEventListener("popstate", function() {
document.write("PASS - Javascript URL blocked without crashing.");
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, false);
</script>
diff --git a/LayoutTests/fast/loader/javascript-url-in-embed.html b/LayoutTests/fast/loader/javascript-url-in-embed.html
index e97d103..556c745 100644
--- a/LayoutTests/fast/loader/javascript-url-in-embed.html
+++ b/LayoutTests/fast/loader/javascript-url-in-embed.html
@@ -1,6 +1,6 @@
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<p>This tests that javascript: urls in an embed tag do not get executed.</p>
<embed src="javascript:alert('FAIL - javascript: url url was executed.');"></embed>
diff --git a/LayoutTests/fast/loader/javascript-url-in-object.html b/LayoutTests/fast/loader/javascript-url-in-object.html
index 8a78e19..a77b787 100644
--- a/LayoutTests/fast/loader/javascript-url-in-object.html
+++ b/LayoutTests/fast/loader/javascript-url-in-object.html
@@ -1,6 +1,6 @@
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<p>This tests that javascript: urls in an object tag do not get executed.</p>
<object data="javascript:alert('FAIL - javascript: url was executed.');"></object>
diff --git a/LayoutTests/fast/loader/link-no-URL.html b/LayoutTests/fast/loader/link-no-URL.html
index ccc0b1be..512de87 100644
--- a/LayoutTests/fast/loader/link-no-URL.html
+++ b/LayoutTests/fast/loader/link-no-URL.html
@@ -2,8 +2,8 @@
<head>
<link type="text/css">
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/loader/loadInProgress.html b/LayoutTests/fast/loader/loadInProgress.html
index c510671..f473dd1 100644
--- a/LayoutTests/fast/loader/loadInProgress.html
+++ b/LayoutTests/fast/loader/loadInProgress.html
@@ -2,8 +2,8 @@
<head>
<link rel="stylesheet" href="fake.css" type="text/css" >
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
}
function testForm() {
if (document.LoginForm)
diff --git a/LayoutTests/fast/loader/local-CSS-from-local.html b/LayoutTests/fast/loader/local-CSS-from-local.html
index 1f8f866..9488087d 100644
--- a/LayoutTests/fast/loader/local-CSS-from-local.html
+++ b/LayoutTests/fast/loader/local-CSS-from-local.html
@@ -2,14 +2,14 @@
<head>
<script>
function test() {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var localStyleSheetLocation = "file:///tmp/LayoutTests/http/tests/security/resources/cssStyle.css";
- if (window.layoutTestController)
- localStyleSheetLocation = layoutTestController.pathToLocalResource(localStyleSheetLocation);
+ if (window.testRunner)
+ localStyleSheetLocation = testRunner.pathToLocalResource(localStyleSheetLocation);
var localLinkElement = document.createElement("link");
localLinkElement.setAttribute("type", "text/css");
@@ -21,8 +21,8 @@
// Unfortunately link tags do not have load events, so we cannot simply make a load handler.
window.setTimeout(backgroundCheck, 1);
window.setTimeout(function() {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 5000);
}
@@ -33,8 +33,8 @@
var bgColor = style.getPropertyValue("background-color");
if (bgColor[4] == 2) {
result.innerHTML = "Test Passed. Local CSS remotely loaded";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
} else {
result.innerHTML = "Test Failed: Local CSS not remotely loaded.";
window.setTimeout(backgroundCheck, 1);
diff --git a/LayoutTests/fast/loader/local-JavaScript-from-local.html b/LayoutTests/fast/loader/local-JavaScript-from-local.html
index 4e70dd5..2b93d1c 100644
--- a/LayoutTests/fast/loader/local-JavaScript-from-local.html
+++ b/LayoutTests/fast/loader/local-JavaScript-from-local.html
@@ -4,14 +4,14 @@
var secretness = 0;
function test() {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var localScriptLocation = "file:///tmp/LayoutTests/http/tests/security/resources/localScript.js";
- if (window.layoutTestController)
- localScriptLocation = layoutTestController.pathToLocalResource(localScriptLocation);
+ if (window.testRunner)
+ localScriptLocation = testRunner.pathToLocalResource(localScriptLocation);
var localScriptElement = document.createElement("script");
localScriptElement.setAttribute("src", localScriptLocation);
@@ -22,15 +22,15 @@
else
tag.innerHTML = "Test Failed. Local script loaded, but not successfully run.";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
});
localScriptElement.addEventListener("error", function() {
var tag = document.getElementById("result");
tag.innerHTML = "Test Failed: Local script not loaded.";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
});
document.body.appendChild(localScriptElement)
diff --git a/LayoutTests/fast/loader/local-css-allowed-in-strict-mode.html b/LayoutTests/fast/loader/local-css-allowed-in-strict-mode.html
index c226cf2..3a787db 100644
--- a/LayoutTests/fast/loader/local-css-allowed-in-strict-mode.html
+++ b/LayoutTests/fast/loader/local-css-allowed-in-strict-mode.html
@@ -6,8 +6,8 @@
<script>
function test()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var target = document.getElementById("target");
var style = getComputedStyle(target);
diff --git a/LayoutTests/fast/loader/local-iFrame-source-from-local.html b/LayoutTests/fast/loader/local-iFrame-source-from-local.html
index d533a4b..27d0743 100644
--- a/LayoutTests/fast/loader/local-iFrame-source-from-local.html
+++ b/LayoutTests/fast/loader/local-iFrame-source-from-local.html
@@ -2,12 +2,12 @@
<head>
<script>
function iFrameTest() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var localPageLocation = "file:///tmp/LayoutTests/http/tests/security/resources/localPage.html";
- if (window.layoutTestController)
- localPageLocation = layoutTestController.pathToLocalResource(localPageLocation);
+ if (window.testRunner)
+ localPageLocation = testRunner.pathToLocalResource(localPageLocation);
var localIframeElement = document.createElement("iFrame");
localIframeElement.setAttribute("id", "myFrame");
diff --git a/LayoutTests/fast/loader/local-image-from-local.html b/LayoutTests/fast/loader/local-image-from-local.html
index 583e12a..7e613f7 100644
--- a/LayoutTests/fast/loader/local-image-from-local.html
+++ b/LayoutTests/fast/loader/local-image-from-local.html
@@ -1,12 +1,12 @@
<html>
<head>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var localImageLocation = "file:///tmp/LayoutTests/http/tests/security/resources/compass.jpg";
- if (window.layoutTestController)
- localImageLocation = layoutTestController.pathToLocalResource(localImageLocation);
+ if (window.testRunner)
+ localImageLocation = testRunner.pathToLocalResource(localImageLocation);
var localImageElement = document.createElement("img");
localImageElement.setAttribute("id", "myImg");
diff --git a/LayoutTests/fast/loader/local-svg-parsed-as-svg.svg b/LayoutTests/fast/loader/local-svg-parsed-as-svg.svg
index ae784db..5da78ce 100644
--- a/LayoutTests/fast/loader/local-svg-parsed-as-svg.svg
+++ b/LayoutTests/fast/loader/local-svg-parsed-as-svg.svg
@@ -1,7 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg">
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var tagName = document.documentElement.tagName;
alert(tagName == "svg" ? "PASS: File parsed as SVG" : "FAIL: document.documentElement.tagName was '" + tagName + "', expected 'svg'");
</script>
diff --git a/LayoutTests/fast/loader/local-xhtml-parsed-as-xhtml.xhtml b/LayoutTests/fast/loader/local-xhtml-parsed-as-xhtml.xhtml
index 60f7964..8a33f5799 100644
--- a/LayoutTests/fast/loader/local-xhtml-parsed-as-xhtml.xhtml
+++ b/LayoutTests/fast/loader/local-xhtml-parsed-as-xhtml.xhtml
@@ -8,8 +8,8 @@
window.onload = function()
{
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var tagName = document.createElement('html').tagName;
log(tagName == "html" ? "PASS: File parsed as XHTML" : "FAIL: document.createElement('html').tagName was '" + tagName + "', expected 'html'");
}
diff --git a/LayoutTests/fast/loader/location-change-aborts-parsing.html b/LayoutTests/fast/loader/location-change-aborts-parsing.html
index f4e6d41..95028b7 100644
--- a/LayoutTests/fast/loader/location-change-aborts-parsing.html
+++ b/LayoutTests/fast/loader/location-change-aborts-parsing.html
@@ -1,7 +1,7 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.location.href = 'resources/location-change-aborts-parsing-pass.html';
</script>
diff --git a/LayoutTests/fast/loader/location-port.html b/LayoutTests/fast/loader/location-port.html
index ed02855..a4be982 100644
--- a/LayoutTests/fast/loader/location-port.html
+++ b/LayoutTests/fast/loader/location-port.html
@@ -51,16 +51,16 @@
var internalFrame = document.getElementById ('internal');
shouldBe('internalFrame.contentWindow.location.host', ':0');
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function runTests() {
- if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var internalFrame = document.getElementById ('internal');
diff --git a/LayoutTests/fast/loader/main-document-url-for-non-http-loads.html b/LayoutTests/fast/loader/main-document-url-for-non-http-loads.html
index 9a8f917..05db21e 100644
--- a/LayoutTests/fast/loader/main-document-url-for-non-http-loads.html
+++ b/LayoutTests/fast/loader/main-document-url-for-non-http-loads.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpResourceLoadCallbacks();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpResourceLoadCallbacks();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
</script>
diff --git a/LayoutTests/fast/loader/meta-refresh-vs-open.html b/LayoutTests/fast/loader/meta-refresh-vs-open.html
index 2c16cc2..3644877 100644
--- a/LayoutTests/fast/loader/meta-refresh-vs-open.html
+++ b/LayoutTests/fast/loader/meta-refresh-vs-open.html
@@ -1,9 +1,9 @@
<html>
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
</script>
<meta http-equiv="refresh" content="0;url=data:text/plain,You should not have been redirected here.">
@@ -12,7 +12,7 @@
<iframe id="ifrm" src="about:blank"></iframe>
<script>
document.body.onload = function() {
- if (window.layoutTestController)
+ if (window.testRunner)
document.write('<p>FAIL: onload</p>');
else
alert('FAIL: onload');
@@ -27,8 +27,8 @@
if (window.stop)
stop();
document.getElementById("ifrm").contentDocument.close();
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 500);
</script>
<p>SUCCESS - shouldn't refresh or invoke onload.</p>
diff --git a/LayoutTests/fast/loader/non-deferred-substitute-load.html b/LayoutTests/fast/loader/non-deferred-substitute-load.html
index a60f2bc..63798da 100644
--- a/LayoutTests/fast/loader/non-deferred-substitute-load.html
+++ b/LayoutTests/fast/loader/non-deferred-substitute-load.html
@@ -1,10 +1,10 @@
<p>This tests that using substitute load in combination with non-deferred main resource loading will not cause
assertions or duplicate loads, which can happen if the substitute document contains JavaScript-alerts.</p>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setDeferMainResourceDataLoad(false);
- layoutTestController.queueLoadHTMLString("<script>if (typeof(hasBeenLoaded) != 'undefined') {" +
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setDeferMainResourceDataLoad(false);
+ testRunner.queueLoadHTMLString("<script>if (typeof(hasBeenLoaded) != 'undefined') {" +
"document.getElementById('result').innerHTML = 'FAILURE';" +
"} else { " +
"hasBeenLoaded = true; document.write('<div id=result>PASS</div>'); alert('Triggering bug through JS-alert'); }" +
diff --git a/LayoutTests/fast/loader/null-request-after-willSendRequest.html b/LayoutTests/fast/loader/null-request-after-willSendRequest.html
index 750e254..b066da1 100644
--- a/LayoutTests/fast/loader/null-request-after-willSendRequest.html
+++ b/LayoutTests/fast/loader/null-request-after-willSendRequest.html
@@ -7,6 +7,6 @@
</p>
<img src="http://10.0.0.1/">
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
diff --git a/LayoutTests/fast/loader/onhashchange-attribute-listeners.html b/LayoutTests/fast/loader/onhashchange-attribute-listeners.html
index 413e18d..1e16d0b 100644
--- a/LayoutTests/fast/loader/onhashchange-attribute-listeners.html
+++ b/LayoutTests/fast/loader/onhashchange-attribute-listeners.html
@@ -2,9 +2,9 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function startTest() {
@@ -39,8 +39,8 @@
function windowAttribute()
{
alert("window.onhashchange attribute called.");
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/fast/loader/onload-bad-scheme-for-frame.html b/LayoutTests/fast/loader/onload-bad-scheme-for-frame.html
index d470f73..64398da 100644
--- a/LayoutTests/fast/loader/onload-bad-scheme-for-frame.html
+++ b/LayoutTests/fast/loader/onload-bad-scheme-for-frame.html
@@ -3,12 +3,12 @@
<head>
<title>Test for Bug 33533: window.onload never fires if page contains an <iframe> with a bad scheme or whose load is cancelled by returning null from resource load delegate's willSendRequest</title>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
window.onload = function() {
var result = document.getElementById("result");
- if (!window.layoutTestController) {
+ if (!window.testRunner) {
result.innerText = "This test can only be run in DumpRenderTree.";
return;
}
diff --git a/LayoutTests/fast/loader/onload-policy-ignore-for-frame.html b/LayoutTests/fast/loader/onload-policy-ignore-for-frame.html
index 5289b0c..7834584 100644
--- a/LayoutTests/fast/loader/onload-policy-ignore-for-frame.html
+++ b/LayoutTests/fast/loader/onload-policy-ignore-for-frame.html
@@ -3,14 +3,14 @@
<head>
<title>Test for Bug 33533: window.onload never fires if page contains an <iframe> with a bad scheme or whose load is cancelled by returning null from resource load delegate's willSendRequest</title>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setCustomPolicyDelegate(true);
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setCustomPolicyDelegate(true);
}
window.onload = function() {
var result = document.getElementById("result");
- if (!window.layoutTestController) {
+ if (!window.testRunner) {
result.innerText = "This test can only be run in DumpRenderTree.";
return;
}
diff --git a/LayoutTests/fast/loader/onload-willSendRequest-null-for-frame.html b/LayoutTests/fast/loader/onload-willSendRequest-null-for-frame.html
index d6f74c4..fd7e9a0 100644
--- a/LayoutTests/fast/loader/onload-willSendRequest-null-for-frame.html
+++ b/LayoutTests/fast/loader/onload-willSendRequest-null-for-frame.html
@@ -3,14 +3,14 @@
<head>
<title>Test for Bug 33533: window.onload never fires if page contains an <iframe> with a bad scheme or whose load is cancelled by returning null from resource load delegate's willSendRequest</title>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setWillSendRequestReturnsNull(true);
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setWillSendRequestReturnsNull(true);
}
window.onload = function() {
var result = document.getElementById("result");
- if (!window.layoutTestController) {
+ if (!window.testRunner) {
result.innerText = "This test can only be run in DumpRenderTree.";
return;
}
diff --git a/LayoutTests/fast/loader/onload-willSendRequest-null-for-script.html b/LayoutTests/fast/loader/onload-willSendRequest-null-for-script.html
index f30267f..9ebeadb 100644
--- a/LayoutTests/fast/loader/onload-willSendRequest-null-for-script.html
+++ b/LayoutTests/fast/loader/onload-willSendRequest-null-for-script.html
@@ -4,14 +4,14 @@
<title>Test for Bug 33687: window.onload never fires if page contains a <script src=foo>
whose load is cancelled by resource load delegate returning null from willSendRequest</title>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setWillSendRequestReturnsNull(true);
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setWillSendRequestReturnsNull(true);
}
window.onload = function() {
var result = document.getElementById("result");
- if (!window.layoutTestController) {
+ if (!window.testRunner) {
result.innerText = "This test can only be run in DumpRenderTree.";
return;
}
diff --git a/LayoutTests/fast/loader/onunload-form-submit-crash-2.html b/LayoutTests/fast/loader/onunload-form-submit-crash-2.html
index a286611..c414698 100644
--- a/LayoutTests/fast/loader/onunload-form-submit-crash-2.html
+++ b/LayoutTests/fast/loader/onunload-form-submit-crash-2.html
@@ -5,15 +5,15 @@
function test()
{
if (location.href.indexOf("?") == -1) {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
location.href = "resources/onunload-form-submit-success.html";
} else {
document.getElementById("result").innerText = "FAIL";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
diff --git a/LayoutTests/fast/loader/onunload-form-submit-crash.html b/LayoutTests/fast/loader/onunload-form-submit-crash.html
index 1cd9e18..daf605a 100644
--- a/LayoutTests/fast/loader/onunload-form-submit-crash.html
+++ b/LayoutTests/fast/loader/onunload-form-submit-crash.html
@@ -1,9 +1,9 @@
<html>
<body onUnload="document.myForm.submit()">
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.setTimeout("location.href='resources/onunload-form-submit-success.html'", 0);
diff --git a/LayoutTests/fast/loader/opaque-base-url.html b/LayoutTests/fast/loader/opaque-base-url.html
index 58f4407..69276fe 100644
--- a/LayoutTests/fast/loader/opaque-base-url.html
+++ b/LayoutTests/fast/loader/opaque-base-url.html
@@ -1,8 +1,8 @@
<p>Test how opaque base URLs work for fetching subresources.</p>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<ol>
diff --git a/LayoutTests/fast/loader/page-dismissal-modal-dialogs.html b/LayoutTests/fast/loader/page-dismissal-modal-dialogs.html
index c5f34e4..62598ef 100644
--- a/LayoutTests/fast/loader/page-dismissal-modal-dialogs.html
+++ b/LayoutTests/fast/loader/page-dismissal-modal-dialogs.html
@@ -21,9 +21,9 @@
addEventListener("load", function() {
registerEvents("mainFrame", window, frames[0]);
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
location = "resources/pass-and-notify-done.html";
}, false);
diff --git a/LayoutTests/fast/loader/ping-error.html b/LayoutTests/fast/loader/ping-error.html
index 334c3e8..a3f00b6 100644
--- a/LayoutTests/fast/loader/ping-error.html
+++ b/LayoutTests/fast/loader/ping-error.html
@@ -2,16 +2,16 @@
<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=46579">bug 46579</a>:
Reproducible crash in appcache code when closing pgatour.com</p>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- layoutTestController.setCanOpenWindows();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.setCanOpenWindows();
}
function done()
{
- if (window.layoutTestController)
- setTimeout('layoutTestController.notifyDone()', 0);
+ if (window.testRunner)
+ setTimeout('testRunner.notifyDone()', 0);
}
window.open("resources/ping-error-window.html");
diff --git a/LayoutTests/fast/loader/plain-text-document.html b/LayoutTests/fast/loader/plain-text-document.html
index d7d5ecc..8b7c8ae 100644
--- a/LayoutTests/fast/loader/plain-text-document.html
+++ b/LayoutTests/fast/loader/plain-text-document.html
@@ -1,7 +1,7 @@
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpChildFramesAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
}
</script>
<iframe src="resources/plain-text-document.txt">
diff --git a/LayoutTests/fast/loader/policy-delegate-action-hit-test-zoomed.html b/LayoutTests/fast/loader/policy-delegate-action-hit-test-zoomed.html
index 07327a2..c3dec85 100644
--- a/LayoutTests/fast/loader/policy-delegate-action-hit-test-zoomed.html
+++ b/LayoutTests/fast/loader/policy-delegate-action-hit-test-zoomed.html
@@ -10,8 +10,8 @@
document.getElementById("log").appendChild(document.createTextNode(message + '\n'));
}
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
eventSender.zoomPageIn();
eventSender.zoomPageIn();
@@ -22,7 +22,7 @@
var x = (link.offsetLeft + link.offsetWidth / 2) * zoomFactor;
var y = (link.offsetTop + link.offsetHeight / 2) * zoomFactor;
- layoutTestController.setCustomPolicyDelegate(true, false);
+ testRunner.setCustomPolicyDelegate(true, false);
log("The policy delegate message should indicate that the originating node is the text child of an anchor element.");
diff --git a/LayoutTests/fast/loader/recursive-before-unload-crash.html b/LayoutTests/fast/loader/recursive-before-unload-crash.html
index bb4f0d8..0185535 100644
--- a/LayoutTests/fast/loader/recursive-before-unload-crash.html
+++ b/LayoutTests/fast/loader/recursive-before-unload-crash.html
@@ -1,7 +1,7 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
}
var haveAddedIFrame = false;
@@ -26,8 +26,8 @@
frame.src = "http://localhost:1234/"
document.body.appendChild(frame);
haveAddedIFrame = true;
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function runTest() {
diff --git a/LayoutTests/fast/loader/redirect-with-open-subframe-2.html b/LayoutTests/fast/loader/redirect-with-open-subframe-2.html
index 5c53837..152c43d 100644
--- a/LayoutTests/fast/loader/redirect-with-open-subframe-2.html
+++ b/LayoutTests/fast/loader/redirect-with-open-subframe-2.html
@@ -1,12 +1,12 @@
<html>
<script>
function test() {
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
}
document.open();
- var newDoc = "SUCCESS<script>if (window.layoutTestController) layoutTestController.notifyDone();</scr" + "ipt>";
+ var newDoc = "SUCCESS<script>if (window.testRunner) testRunner.notifyDone();</scr" + "ipt>";
setTimeout("window.location='data:text/html," + newDoc + "'", 500);
}
</script>
diff --git a/LayoutTests/fast/loader/redirect-with-open-subframe.html b/LayoutTests/fast/loader/redirect-with-open-subframe.html
index 929f548..073484d 100644
--- a/LayoutTests/fast/loader/redirect-with-open-subframe.html
+++ b/LayoutTests/fast/loader/redirect-with-open-subframe.html
@@ -3,11 +3,11 @@
<iframe id="ifrm" src="about:blank"></iframe>
<script>
document.getElementById("ifrm").contentDocument.open();
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
}
- var newDoc = "SUCCESS<script>if (window.layoutTestController) layoutTestController.notifyDone();</scr" + "ipt>";
+ var newDoc = "SUCCESS<script>if (window.testRunner) testRunner.notifyDone();</scr" + "ipt>";
setTimeout("window.location='data:text/html," + newDoc + "'", 500);
</script>
<div>FAILURE: should redirect.</div>
diff --git a/LayoutTests/fast/loader/reload-policy-delegate.html b/LayoutTests/fast/loader/reload-policy-delegate.html
index 60cf251..6d5a7bc 100644
--- a/LayoutTests/fast/loader/reload-policy-delegate.html
+++ b/LayoutTests/fast/loader/reload-policy-delegate.html
@@ -3,9 +3,9 @@
<script type="text/javascript">
function startTest()
{
- layoutTestController.dumpAsText();
- layoutTestController.setCustomPolicyDelegate(true, true);
- layoutTestController.queueReload();
+ testRunner.dumpAsText();
+ testRunner.setCustomPolicyDelegate(true, true);
+ testRunner.queueReload();
}
</script>
</head>
diff --git a/LayoutTests/fast/loader/reload-zero-byte-plugin.html b/LayoutTests/fast/loader/reload-zero-byte-plugin.html
index 714e34e..d305fe5 100644
--- a/LayoutTests/fast/loader/reload-zero-byte-plugin.html
+++ b/LayoutTests/fast/loader/reload-zero-byte-plugin.html
@@ -1,17 +1,17 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- layoutTestController.setCanOpenWindows(true);
- layoutTestController.setCloseRemainingWindowsWhenComplete(true);
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.setCanOpenWindows(true);
+ testRunner.setCloseRemainingWindowsWhenComplete(true);
}
var win = window.open('data:application/x-webkit-test-netscape,');
setTimeout(function() {
win.location.reload();
setTimeout(function() {
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 100);
}, 100);
</script>
diff --git a/LayoutTests/fast/loader/repeat-same-document-navigation.html b/LayoutTests/fast/loader/repeat-same-document-navigation.html
index dd264b9..8e66fe0f 100644
--- a/LayoutTests/fast/loader/repeat-same-document-navigation.html
+++ b/LayoutTests/fast/loader/repeat-same-document-navigation.html
@@ -1,9 +1,9 @@
<html>
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function clickLink() {
@@ -21,7 +21,7 @@
var line = document.createElement('div');
line.appendChild(document.createTextNode("Scroll position is " + scrollY + "px"));
document.getElementById('anchor').appendChild(line);
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/fast/loader/resources/click-fragment-link.html b/LayoutTests/fast/loader/resources/click-fragment-link.html
index f73675f..8d23cd1 100644
--- a/LayoutTests/fast/loader/resources/click-fragment-link.html
+++ b/LayoutTests/fast/loader/resources/click-fragment-link.html
@@ -1,7 +1,7 @@
<script>
function loaded() {
- if (window.layoutTestController) {
+ if (window.testRunner) {
var element = document.getElementById("fragmentlink");
eventSender.mouseMoveTo(element.offsetLeft + (element.offsetWidth / 2), element.offsetTop + (element.offsetHeight / 2));
eventSender.mouseDown();
@@ -11,8 +11,8 @@
function hashChanged()
{
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/fast/loader/resources/document-with-fragment-url-test.html b/LayoutTests/fast/loader/resources/document-with-fragment-url-test.html
index 33fa440..8f75b8a 100644
--- a/LayoutTests/fast/loader/resources/document-with-fragment-url-test.html
+++ b/LayoutTests/fast/loader/resources/document-with-fragment-url-test.html
@@ -28,8 +28,8 @@
eventSender.mouseUp();
} else {
alert("Second load complete. URL's current hash is " + documentURLHash());
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
diff --git a/LayoutTests/fast/loader/resources/fail-and-notify-done.html b/LayoutTests/fast/loader/resources/fail-and-notify-done.html
index d9c9a9f..caef434 100644
--- a/LayoutTests/fast/loader/resources/fail-and-notify-done.html
+++ b/LayoutTests/fast/loader/resources/fail-and-notify-done.html
@@ -1,6 +1,6 @@
<body>
FAIL
<script>
-if (window.layoutTestController)
- layoutTestController.notifyDone()
+if (window.testRunner)
+ testRunner.notifyDone()
</script>
diff --git a/LayoutTests/fast/loader/resources/form-state-restore-with-locked-back-forward-list-3.html b/LayoutTests/fast/loader/resources/form-state-restore-with-locked-back-forward-list-3.html
index 6d54668..8e5bd29 100644
--- a/LayoutTests/fast/loader/resources/form-state-restore-with-locked-back-forward-list-3.html
+++ b/LayoutTests/fast/loader/resources/form-state-restore-with-locked-back-forward-list-3.html
@@ -3,7 +3,7 @@
<script src="../../js/resources/js-test-pre.js"></script>
<script>
shouldBeEqualToString("location.search", '?TestName1=Ok1&TestName2=Ok2');
-if (window.layoutTestController)
- layoutTestController.notifyDone();
+if (window.testRunner)
+ testRunner.notifyDone();
</script>
</body>
diff --git a/LayoutTests/fast/loader/resources/form-submission-before-load-page3.html b/LayoutTests/fast/loader/resources/form-submission-before-load-page3.html
index 04e88e3..56fc320 100644
--- a/LayoutTests/fast/loader/resources/form-submission-before-load-page3.html
+++ b/LayoutTests/fast/loader/resources/form-submission-before-load-page3.html
@@ -1,5 +1,5 @@
Done.
<script>
-if (window.layoutTestController)
- layoutTestController.notifyDone();
+if (window.testRunner)
+ testRunner.notifyDone();
</script>
diff --git a/LayoutTests/fast/loader/resources/invalid-charset-on-script-crashes-loader.js b/LayoutTests/fast/loader/resources/invalid-charset-on-script-crashes-loader.js
index 044c0c5..d58c0ba 100644
--- a/LayoutTests/fast/loader/resources/invalid-charset-on-script-crashes-loader.js
+++ b/LayoutTests/fast/loader/resources/invalid-charset-on-script-crashes-loader.js
@@ -1,3 +1,3 @@
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
document.writeln("Success!");
diff --git a/LayoutTests/fast/loader/resources/location-change-aborts-parsing-fail.html b/LayoutTests/fast/loader/resources/location-change-aborts-parsing-fail.html
index 8935f11..4568f06 100644
--- a/LayoutTests/fast/loader/resources/location-change-aborts-parsing-fail.html
+++ b/LayoutTests/fast/loader/resources/location-change-aborts-parsing-fail.html
@@ -1,5 +1,5 @@
<script>
-if (window.layoutTestController)
- layoutTestController.notifyDone();
+if (window.testRunner)
+ testRunner.notifyDone();
</script>
FAIL
diff --git a/LayoutTests/fast/loader/resources/location-change-aborts-parsing-pass.html b/LayoutTests/fast/loader/resources/location-change-aborts-parsing-pass.html
index 9fcd5f7..53f21c4 100644
--- a/LayoutTests/fast/loader/resources/location-change-aborts-parsing-pass.html
+++ b/LayoutTests/fast/loader/resources/location-change-aborts-parsing-pass.html
@@ -1,5 +1,5 @@
<script>
-if (window.layoutTestController)
- layoutTestController.notifyDone();
+if (window.testRunner)
+ testRunner.notifyDone();
</script>
PASS
diff --git a/LayoutTests/fast/loader/resources/notify-done.html b/LayoutTests/fast/loader/resources/notify-done.html
index f28a6dc..cbd62e3 100644
--- a/LayoutTests/fast/loader/resources/notify-done.html
+++ b/LayoutTests/fast/loader/resources/notify-done.html
@@ -1,4 +1,4 @@
<script>
-if (window.layoutTestController)
- layoutTestController.notifyDone();
+if (window.testRunner)
+ testRunner.notifyDone();
</script>
diff --git a/LayoutTests/fast/loader/resources/onunload-form-submit-failure.html b/LayoutTests/fast/loader/resources/onunload-form-submit-failure.html
index f781350..00a6c3d 100644
--- a/LayoutTests/fast/loader/resources/onunload-form-submit-failure.html
+++ b/LayoutTests/fast/loader/resources/onunload-form-submit-failure.html
@@ -3,8 +3,8 @@
<script>
function continueTestAfterNavigation()
{
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
</head>
diff --git a/LayoutTests/fast/loader/resources/onunload-form-submit-success.html b/LayoutTests/fast/loader/resources/onunload-form-submit-success.html
index 54b5640..4385705 100644
--- a/LayoutTests/fast/loader/resources/onunload-form-submit-success.html
+++ b/LayoutTests/fast/loader/resources/onunload-form-submit-success.html
@@ -3,8 +3,8 @@
<script>
function continueTestAfterNavigation()
{
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
</head>
diff --git a/LayoutTests/fast/loader/resources/pass-and-notify-done.html b/LayoutTests/fast/loader/resources/pass-and-notify-done.html
index 8eefb38..d61dc36 100644
--- a/LayoutTests/fast/loader/resources/pass-and-notify-done.html
+++ b/LayoutTests/fast/loader/resources/pass-and-notify-done.html
@@ -1,6 +1,6 @@
<body>
PASS
<script>
-if (window.layoutTestController)
- layoutTestController.notifyDone()
+if (window.testRunner)
+ testRunner.notifyDone()
</script>
diff --git a/LayoutTests/fast/loader/resources/subframe-navigate-during-main-frame-load2.html b/LayoutTests/fast/loader/resources/subframe-navigate-during-main-frame-load2.html
index afd2ff3..313b7c1 100644
--- a/LayoutTests/fast/loader/resources/subframe-navigate-during-main-frame-load2.html
+++ b/LayoutTests/fast/loader/resources/subframe-navigate-during-main-frame-load2.html
@@ -4,7 +4,7 @@
function runTest()
{
- document.getElementById("subframe").contentWindow.location = 'data:text/html,<body onload="layoutTestController.notifyDone();"></body>';
+ document.getElementById("subframe").contentWindow.location = 'data:text/html,<body onload="testRunner.notifyDone();"></body>';
}
</script>
diff --git a/LayoutTests/fast/loader/resources/subframe-notify-done.html b/LayoutTests/fast/loader/resources/subframe-notify-done.html
index e4c0d01..6422116 100644
--- a/LayoutTests/fast/loader/resources/subframe-notify-done.html
+++ b/LayoutTests/fast/loader/resources/subframe-notify-done.html
@@ -2,8 +2,8 @@
<head>
<script>
function loaded() {
- if (window.layoutTestController) {
- layoutTestController.notifyDone();
+ if (window.testRunner) {
+ testRunner.notifyDone();
}
}
</script>
diff --git a/LayoutTests/fast/loader/resources/submit-form-while-parsing-subframe.html b/LayoutTests/fast/loader/resources/submit-form-while-parsing-subframe.html
index 72acb9d4..88df401 100644
--- a/LayoutTests/fast/loader/resources/submit-form-while-parsing-subframe.html
+++ b/LayoutTests/fast/loader/resources/submit-form-while-parsing-subframe.html
@@ -1,8 +1,8 @@
<form name="form" method="POST" action="about:blank"></form>
<script type="text/javascript">
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
document.forms.form.submit();
setTimeout("location='resources/submit-form-while-parsing-success.html'", 0);
diff --git a/LayoutTests/fast/loader/resources/submit-form-while-parsing-success.html b/LayoutTests/fast/loader/resources/submit-form-while-parsing-success.html
index 3e18233..81cde52 100644
--- a/LayoutTests/fast/loader/resources/submit-form-while-parsing-success.html
+++ b/LayoutTests/fast/loader/resources/submit-form-while-parsing-success.html
@@ -1 +1 @@
-<body onload="layoutTestController.notifyDone()">PASSED: If we successfully got here without an assertion or crash, all is well.</body>
+<body onload="testRunner.notifyDone()">PASSED: If we successfully got here without an assertion or crash, all is well.</body>
diff --git a/LayoutTests/fast/loader/resources/unschedule-relayout-after-unload-target.html b/LayoutTests/fast/loader/resources/unschedule-relayout-after-unload-target.html
index 0578f8b..fd1414a 100644
--- a/LayoutTests/fast/loader/resources/unschedule-relayout-after-unload-target.html
+++ b/LayoutTests/fast/loader/resources/unschedule-relayout-after-unload-target.html
@@ -3,8 +3,8 @@
window.setTimeout(
function() {
document.body.innerHTML = 'SUCCESS: Navigated';
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 0);
</script>
</html>
diff --git a/LayoutTests/fast/loader/resources/window-clearing2.html b/LayoutTests/fast/loader/resources/window-clearing2.html
index c42918d..27ce52c 100644
--- a/LayoutTests/fast/loader/resources/window-clearing2.html
+++ b/LayoutTests/fast/loader/resources/window-clearing2.html
@@ -20,8 +20,8 @@
o = o.__proto__;
} while(o);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
</head>
diff --git a/LayoutTests/fast/loader/sandboxed-plugin-crash.html b/LayoutTests/fast/loader/sandboxed-plugin-crash.html
index 41903ed..634a21c 100644
--- a/LayoutTests/fast/loader/sandboxed-plugin-crash.html
+++ b/LayoutTests/fast/loader/sandboxed-plugin-crash.html
@@ -2,8 +2,8 @@
<head>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
diff --git a/LayoutTests/fast/loader/scroll-position-restored-on-back-non-cached.html b/LayoutTests/fast/loader/scroll-position-restored-on-back-non-cached.html
index 92f1cfc..a92d67e 100644
--- a/LayoutTests/fast/loader/scroll-position-restored-on-back-non-cached.html
+++ b/LayoutTests/fast/loader/scroll-position-restored-on-back-non-cached.html
@@ -5,9 +5,9 @@
function navigate()
{
if (location.hash == "") {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
scrollTo(0,100);
@@ -21,8 +21,8 @@
var result = document.getElementById("result");
if (scrollPosition == 100)
result.innerHTML = "Success! The scroll position was restored after navigation."
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 0);
}
diff --git a/LayoutTests/fast/loader/scroll-position-restored-on-back.html b/LayoutTests/fast/loader/scroll-position-restored-on-back.html
index 27b8623..54858a2 100644
--- a/LayoutTests/fast/loader/scroll-position-restored-on-back.html
+++ b/LayoutTests/fast/loader/scroll-position-restored-on-back.html
@@ -5,10 +5,10 @@
function navigate()
{
if (location.hash == "") {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+ testRunner.waitUntilDone();
}
scrollTo(0,100);
@@ -22,8 +22,8 @@
var result = document.getElementById("result");
if (scrollPosition == 100)
result.innerHTML = "Success! The scroll position was restored after navigation."
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 0);
}
diff --git a/LayoutTests/fast/loader/simultaneous-reloads-assert.html b/LayoutTests/fast/loader/simultaneous-reloads-assert.html
index a63c923..b4d64ca 100644
--- a/LayoutTests/fast/loader/simultaneous-reloads-assert.html
+++ b/LayoutTests/fast/loader/simultaneous-reloads-assert.html
@@ -2,9 +2,9 @@
<head>
<title>Test for http://bugs.webkit.org/show_bug.cgi?id=12479</title>
<script>
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
alert("If you do not hit an assertion failure when running this test with a debug build and you get a SUCCESS message, then you pass the test.");
}
@@ -15,9 +15,9 @@
reloaded = true;
frames[0].location.reload();
} else {
- if (window.layoutTestController) {
+ if (window.testRunner) {
alert("SUCCESS");
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
}
}
diff --git a/LayoutTests/fast/loader/start-load-in-unload.html b/LayoutTests/fast/loader/start-load-in-unload.html
index 234aff8..d4d1d1a 100644
--- a/LayoutTests/fast/loader/start-load-in-unload.html
+++ b/LayoutTests/fast/loader/start-load-in-unload.html
@@ -3,7 +3,7 @@
<img id="i" src="nosrc.jpg">
This test verifies that starting a subresource load from an unload handler does not cause crashes or assertion failures.
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</body>
diff --git a/LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back-with-fragment-scroll.html b/LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back-with-fragment-scroll.html
index 11f348f..1f870cc 100644
--- a/LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back-with-fragment-scroll.html
+++ b/LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back-with-fragment-scroll.html
@@ -2,11 +2,11 @@
<head>
<script>
-if (window.layoutTestController) {
+if (window.testRunner) {
if (!sessionStorage.stage)
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.clearBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function lastPathComponent(url)
@@ -90,8 +90,8 @@
if (hashOf(event.newURL) == "#FirstEntryWillLaterBeReactivated") {
alert("Test complete");
sessionStorage.clear();
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
diff --git a/LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back.html b/LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back.html
index 982fe81..6776db6 100644
--- a/LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back.html
+++ b/LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back.html
@@ -2,11 +2,11 @@
<head>
<script>
-if (window.layoutTestController) {
+if (window.testRunner) {
if (!sessionStorage.stage)
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ testRunner.clearBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function lastPathComponent()
@@ -68,8 +68,8 @@
else if (event.state == "FirstEntryWillLaterBeReactivated") {
alert("Test complete");
sessionStorage.clear();
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
diff --git a/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-addeventlistener.html b/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-addeventlistener.html
index 02e344c..6111ab4 100644
--- a/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-addeventlistener.html
+++ b/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-addeventlistener.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function log(txt)
@@ -35,8 +35,8 @@
log("State popped - " + event.state + " (type " + typeof event.state + ")");
if (event.state == null)
history.forward();
- else if (window.layoutTestController)
- layoutTestController.notifyDone();
+ else if (window.testRunner)
+ testRunner.notifyDone();
}
window.addEventListener("popstate", statePopped);
diff --git a/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-attribute.html b/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-attribute.html
index cc17c0c..62959d2 100644
--- a/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-attribute.html
+++ b/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-attribute.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function log(txt)
@@ -36,8 +36,8 @@
if (event.state == null) {
document.body.onpopstate = statePopped;
history.forward();
- } else if (window.layoutTestController)
- layoutTestController.notifyDone();
+ } else if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-inline-attribute.html b/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-inline-attribute.html
index 05da363..8ad8bf5 100644
--- a/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-inline-attribute.html
+++ b/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-inline-attribute.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function log(txt)
@@ -36,8 +36,8 @@
if (event.state == null) {
document.body.onpopstate = statePopped;
history.forward();
- } else if (window.layoutTestController)
- layoutTestController.notifyDone();
+ } else if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-window-attribute.html b/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-window-attribute.html
index 4953968..2f606f6 100644
--- a/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-window-attribute.html
+++ b/LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-window-attribute.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function log(txt)
@@ -35,8 +35,8 @@
log("State popped - " + event.state + " (type " + typeof event.state + ")");
if (event.state == null)
history.forward();
- else if (window.layoutTestController)
- layoutTestController.notifyDone();
+ else if (window.testRunner)
+ testRunner.notifyDone();
}
window.onpopstate = statePopped;
diff --git a/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html b/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html
index 83325fd..c30c604 100644
--- a/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html
+++ b/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html
@@ -11,9 +11,9 @@
onload = function()
{
- if (window.layoutTestController) {
- layoutTestController.setCanOpenWindows();
- layoutTestController.overridePreference('WebKitUsesPageCachePreferenceKey', 1);
+ if (window.testRunner) {
+ testRunner.setCanOpenWindows();
+ testRunner.overridePreference('WebKitUsesPageCachePreferenceKey', 1);
}
testWindow = window.open('resources/popstate-fires-with-page-cache-1.html');
if (!testWindow)
diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-clears-forward-history.html b/LayoutTests/fast/loader/stateobjects/pushstate-clears-forward-history.html
index bbb4479..e4c8b38 100644
--- a/LayoutTests/fast/loader/stateobjects/pushstate-clears-forward-history.html
+++ b/LayoutTests/fast/loader/stateobjects/pushstate-clears-forward-history.html
@@ -2,10 +2,10 @@
onload = function() {
if (location.search.substring(1).length == 0) {
sessionStorage.testStage = 0;
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpBackForwardList();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpBackForwardList();
+ testRunner.waitUntilDone();
}
}
@@ -23,8 +23,8 @@
break;
case 3:
history.pushState(null, null);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
break;
}
}, 0);
diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-in-data-url-denied.html b/LayoutTests/fast/loader/stateobjects/pushstate-in-data-url-denied.html
index 9ab705f..7ccbec0 100644
--- a/LayoutTests/fast/loader/stateobjects/pushstate-in-data-url-denied.html
+++ b/LayoutTests/fast/loader/stateobjects/pushstate-in-data-url-denied.html
@@ -1,7 +1,7 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.onload = function() {
window.location = 'data:text/html,' +
@@ -12,8 +12,8 @@
'} catch(e) {' +
'document.write("PASS: data URLs cannot be manipulated via pushState.");' +
'}' +
- 'if (window.layoutTestController)' +
- 'layoutTestController.notifyDone();' +
+ 'if (window.testRunner)' +
+ 'testRunner.notifyDone();' +
'%3C/script%3E';
}
</script>
diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-in-iframe.html b/LayoutTests/fast/loader/stateobjects/pushstate-in-iframe.html
index d570806..897c20a 100644
--- a/LayoutTests/fast/loader/stateobjects/pushstate-in-iframe.html
+++ b/LayoutTests/fast/loader/stateobjects/pushstate-in-iframe.html
@@ -1,7 +1,7 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
</script>
<iframe src="resources/pushstate-in-iframe-child.html">
diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-object-types.html b/LayoutTests/fast/loader/stateobjects/pushstate-object-types.html
index 0f9f557..7973579 100644
--- a/LayoutTests/fast/loader/stateobjects/pushstate-object-types.html
+++ b/LayoutTests/fast/loader/stateobjects/pushstate-object-types.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function log(txt)
@@ -59,8 +59,8 @@
if (event.state != "FirstEntry")
history.back();
- else if (window.layoutTestController)
- layoutTestController.notifyDone();
+ else if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-then-replacestate.html b/LayoutTests/fast/loader/stateobjects/pushstate-then-replacestate.html
index de6f093..9ea3b97 100644
--- a/LayoutTests/fast/loader/stateobjects/pushstate-then-replacestate.html
+++ b/LayoutTests/fast/loader/stateobjects/pushstate-then-replacestate.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function log(txt)
@@ -37,8 +37,8 @@
log("State popped - " + event.state + " (type " + typeof event.state + ")");
if (event.state == null)
history.forward();
- else if (window.layoutTestController)
- layoutTestController.notifyDone();
+ else if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-updates-location.html b/LayoutTests/fast/loader/stateobjects/pushstate-updates-location.html
index ef1a4dd..ffd9d8d2 100644
--- a/LayoutTests/fast/loader/stateobjects/pushstate-updates-location.html
+++ b/LayoutTests/fast/loader/stateobjects/pushstate-updates-location.html
@@ -1,6 +1,6 @@
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
onload = function() {
history.pushState(null, null, "?foo");
diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-with-fragment-urls-and-hashchange.html b/LayoutTests/fast/loader/stateobjects/pushstate-with-fragment-urls-and-hashchange.html
index 07c784d..d7605b7 100644
--- a/LayoutTests/fast/loader/stateobjects/pushstate-with-fragment-urls-and-hashchange.html
+++ b/LayoutTests/fast/loader/stateobjects/pushstate-with-fragment-urls-and-hashchange.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function log(txt)
@@ -59,8 +59,8 @@
log("State popped with event " + event.state + " (type " + typeof event.state + ") and last path component " + lastPathComponent(location.href));
if (event.state != "OriginalEntry")
setTimeout("history.back();", 0);
- else if (window.layoutTestController)
- layoutTestController.notifyDone();
+ else if (window.testRunner)
+ testRunner.notifyDone();
}
onhashchange = function(event)
diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-within-popstate-handler-assert.html b/LayoutTests/fast/loader/stateobjects/pushstate-within-popstate-handler-assert.html
index 250baf7..0e3e842 100644
--- a/LayoutTests/fast/loader/stateobjects/pushstate-within-popstate-handler-assert.html
+++ b/LayoutTests/fast/loader/stateobjects/pushstate-within-popstate-handler-assert.html
@@ -1,15 +1,15 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
onpopstate = function() {
history.pushState(null, null);
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
onload = function() {
diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-without-history.html b/LayoutTests/fast/loader/stateobjects/pushstate-without-history.html
index 10641ae..92b28f0 100644
--- a/LayoutTests/fast/loader/stateobjects/pushstate-without-history.html
+++ b/LayoutTests/fast/loader/stateobjects/pushstate-without-history.html
@@ -2,11 +2,11 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.setCanOpenWindows();
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.setCanOpenWindows();
+ testRunner.clearBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
</script>
<body onload="window.open('resources/pushstate-without-history.html');" >
diff --git a/LayoutTests/fast/loader/stateobjects/replacestate-in-iframe.html b/LayoutTests/fast/loader/stateobjects/replacestate-in-iframe.html
index 031b027..c250deb 100644
--- a/LayoutTests/fast/loader/stateobjects/replacestate-in-iframe.html
+++ b/LayoutTests/fast/loader/stateobjects/replacestate-in-iframe.html
@@ -1,8 +1,8 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setCanOpenWindows();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setCanOpenWindows();
+ testRunner.waitUntilDone();
}
// This is a test that replaceState called on an inner frame does not modify
@@ -18,8 +18,8 @@
document.body.innerText = result;
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function windowLoaded() {
diff --git a/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload.html b/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload.html
index 74daa08..b133aaf 100644
--- a/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload.html
+++ b/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload.html
@@ -2,9 +2,9 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function log(txt)
@@ -20,8 +20,8 @@
window.location = window.location.href + "?PASS";
} else {
log(window.location.search.slice(1));
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
}
diff --git a/LayoutTests/fast/loader/stateobjects/replacestate-then-pushstate.html b/LayoutTests/fast/loader/stateobjects/replacestate-then-pushstate.html
index 76a5e1b..b0dd81e 100644
--- a/LayoutTests/fast/loader/stateobjects/replacestate-then-pushstate.html
+++ b/LayoutTests/fast/loader/stateobjects/replacestate-then-pushstate.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function log(txt)
@@ -37,8 +37,8 @@
log("State popped - " + event.state + " (type " + typeof event.state + ")");
if (event.state == "OriginalHistoryItem")
history.forward();
- else if (window.layoutTestController)
- layoutTestController.notifyDone();
+ else if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/fast/loader/stateobjects/replacestate-updates-location.html b/LayoutTests/fast/loader/stateobjects/replacestate-updates-location.html
index b708dd6..aaa8409 100644
--- a/LayoutTests/fast/loader/stateobjects/replacestate-updates-location.html
+++ b/LayoutTests/fast/loader/stateobjects/replacestate-updates-location.html
@@ -1,6 +1,6 @@
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
onload = function() {
history.replaceState(null, null, "?foo");
diff --git a/LayoutTests/fast/loader/stateobjects/resources/pushstate-in-iframe-child.html b/LayoutTests/fast/loader/stateobjects/resources/pushstate-in-iframe-child.html
index 885fcd2..517ed73 100644
--- a/LayoutTests/fast/loader/stateobjects/resources/pushstate-in-iframe-child.html
+++ b/LayoutTests/fast/loader/stateobjects/resources/pushstate-in-iframe-child.html
@@ -11,8 +11,8 @@
} else {
topWin.document.body.innerHTML = "PASS";
}
- if (topWin.layoutTestController)
- topWin.layoutTestController.notifyDone();
+ if (topWin.testRunner)
+ topWin.testRunner.notifyDone();
}
onload = function() {
diff --git a/LayoutTests/fast/loader/stateobjects/resources/pushstate-without-history.html b/LayoutTests/fast/loader/stateobjects/resources/pushstate-without-history.html
index fad7434..e61a1c1 100644
--- a/LayoutTests/fast/loader/stateobjects/resources/pushstate-without-history.html
+++ b/LayoutTests/fast/loader/stateobjects/resources/pushstate-without-history.html
@@ -8,8 +8,8 @@
history.pushState("New history Item", "2Ping!");
history.pushState("New history Item", "3Ping!");
window.opener.document.getElementById("result").innerText = "history.length is: " + history.length;
- if (window.opener.layoutTestController)
- window.opener.layoutTestController.notifyDone();
+ if (window.opener.testRunner)
+ window.opener.testRunner.notifyDone();
window.close()
}
diff --git a/LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash.html b/LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash.html
index bb71bf7..8d5e471 100644
--- a/LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash.html
+++ b/LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash.html
@@ -1,8 +1,8 @@
<html>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function runTest()
{
diff --git a/LayoutTests/fast/loader/stateobjects/state-attribute-history-getter.html b/LayoutTests/fast/loader/stateobjects/state-attribute-history-getter.html
index c9a17b0..0fcf760 100644
--- a/LayoutTests/fast/loader/stateobjects/state-attribute-history-getter.html
+++ b/LayoutTests/fast/loader/stateobjects/state-attribute-history-getter.html
@@ -6,10 +6,10 @@
document.querySelector("#log").innerHTML += msg + "<br>";
}
-if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function test() {
@@ -23,7 +23,7 @@
} catch (e) {
// history.state is not configurable in JSC.
log(e.name == "TypeError" ? "PASS" : ("FAIL: unexpected exception: " + e));
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
return;
}
@@ -39,8 +39,8 @@
log("FAIL: e.state expected 42, was " + e.state + " (of type " + typeof e.state + ")");
else
log("PASS");
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
history.back();
diff --git a/LayoutTests/fast/loader/stateobjects/state-attribute-object-types.html b/LayoutTests/fast/loader/stateobjects/state-attribute-object-types.html
index b089b22..99035aa 100644
--- a/LayoutTests/fast/loader/stateobjects/state-attribute-object-types.html
+++ b/LayoutTests/fast/loader/stateobjects/state-attribute-object-types.html
@@ -7,8 +7,8 @@
<script>
description('This test calls pushState with state objects of all the different object types supported by the HTML5 "internal structured cloning algorithm" and makes sure the state attribute returns the expected objects.');
- if (window.layoutTestController)
- layoutTestController.clearBackForwardList();
+ if (window.testRunner)
+ testRunner.clearBackForwardList();
shouldBeDefined("history.state");
debug("\nhistory.state should initially be null.");
diff --git a/LayoutTests/fast/loader/stateobjects/state-attribute-only-one-deserialization.html b/LayoutTests/fast/loader/stateobjects/state-attribute-only-one-deserialization.html
index 9529495..924618a 100644
--- a/LayoutTests/fast/loader/stateobjects/state-attribute-only-one-deserialization.html
+++ b/LayoutTests/fast/loader/stateobjects/state-attribute-only-one-deserialization.html
@@ -8,9 +8,9 @@
description("Make sure the same deserialization of the state object is used every time (both in the history object and popstate events).");
window.jsTestIsAsync = true;
- if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.waitUntilDone();
}
shouldBeDefined("history.state");
diff --git a/LayoutTests/fast/loader/stateobjects/state-attribute-popstate-event.html b/LayoutTests/fast/loader/stateobjects/state-attribute-popstate-event.html
index 0d9bfb5..501d26b 100644
--- a/LayoutTests/fast/loader/stateobjects/state-attribute-popstate-event.html
+++ b/LayoutTests/fast/loader/stateobjects/state-attribute-popstate-event.html
@@ -8,9 +8,9 @@
description("Check that PopStateEvent.state always has a correct value.");
window.jsTestIsAsync = true;
- if (window.layoutTestController) {
- layoutTestController.clearBackForwardList();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.clearBackForwardList();
+ testRunner.waitUntilDone();
}
shouldBeDefined("history.state");
diff --git a/LayoutTests/fast/loader/stateobjects/state-url-sets-links-visited.html b/LayoutTests/fast/loader/stateobjects/state-url-sets-links-visited.html
index 8f03b65..a800c0a 100644
--- a/LayoutTests/fast/loader/stateobjects/state-url-sets-links-visited.html
+++ b/LayoutTests/fast/loader/stateobjects/state-url-sets-links-visited.html
@@ -1,8 +1,8 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.keepWebHistory();
- layoutTestController.dumpAsText();
+if (window.testRunner) {
+ testRunner.keepWebHistory();
+ testRunner.dumpAsText();
}
function loaded()
@@ -10,9 +10,9 @@
window.history.replaceState(null, "Title", "replacedURL.html");
window.history.pushState(null, "Title", "pushedURL.html");
- if (window.layoutTestController) {
- var style1 = window.layoutTestController.computedStyleIncludingVisitedInfo(document.getElementById('link1'));
- var style2 = window.layoutTestController.computedStyleIncludingVisitedInfo(document.getElementById('link2'));
+ if (window.testRunner) {
+ var style1 = window.testRunner.computedStyleIncludingVisitedInfo(document.getElementById('link1'));
+ var style2 = window.testRunner.computedStyleIncludingVisitedInfo(document.getElementById('link2'));
var result = document.createElement("p");
if (style1.color != "rgb(255, 165, 0)" || style2.color != "rgb(255, 165, 0)")
result.innerText = "FAIL";
diff --git a/LayoutTests/fast/loader/stop-provisional-loads.html b/LayoutTests/fast/loader/stop-provisional-loads.html
index 64ff13d..fa2ed3e 100644
--- a/LayoutTests/fast/loader/stop-provisional-loads.html
+++ b/LayoutTests/fast/loader/stop-provisional-loads.html
@@ -2,9 +2,9 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setStopProvisionalFrameLoads();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setStopProvisionalFrameLoads();
}
</script>
diff --git a/LayoutTests/fast/loader/subframe-navigate-during-main-frame-load-expected.txt b/LayoutTests/fast/loader/subframe-navigate-during-main-frame-load-expected.txt
index 4fb9981..8950f54 100644
--- a/LayoutTests/fast/loader/subframe-navigate-during-main-frame-load-expected.txt
+++ b/LayoutTests/fast/loader/subframe-navigate-during-main-frame-load-expected.txt
@@ -6,5 +6,5 @@
============== Back Forward List ==============
(file test):fast/loader/subframe-navigate-during-main-frame-load.html **nav target**
curr-> (file test):fast/loader/resources/subframe-navigate-during-main-frame-load2.html **nav target**
- data:text/html,<body onload="layoutTestController.notifyDone();"></body> (in frame "subframe")
+ data:text/html,<body onload="testRunner.notifyDone();"></body> (in frame "subframe")
===============================================
diff --git a/LayoutTests/fast/loader/subframe-navigate-during-main-frame-load.html b/LayoutTests/fast/loader/subframe-navigate-during-main-frame-load.html
index 2ab12cc..b7334b2 100644
--- a/LayoutTests/fast/loader/subframe-navigate-during-main-frame-load.html
+++ b/LayoutTests/fast/loader/subframe-navigate-during-main-frame-load.html
@@ -4,10 +4,10 @@
function runTest()
{
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpBackForwardList();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpBackForwardList();
+ testRunner.waitUntilDone();
}
// Location changes need to happen outside the onload handler to generate history entries.
diff --git a/LayoutTests/fast/loader/subframe-removes-itself.html b/LayoutTests/fast/loader/subframe-removes-itself.html
index 95c0f1d..ee0d083 100644
--- a/LayoutTests/fast/loader/subframe-removes-itself.html
+++ b/LayoutTests/fast/loader/subframe-removes-itself.html
@@ -1,8 +1,8 @@
This tests a subframe that removes itself to make sure a delegate message to indicate the interrupted load fires.
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpFrameLoadCallbacks();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpFrameLoadCallbacks();
}
</script>
<iframe src="resources/subframe-that-removes-itself.html"></iframe>
diff --git a/LayoutTests/fast/loader/subframe-self-close.html b/LayoutTests/fast/loader/subframe-self-close.html
index 6b27e1f..6cc427b 100644
--- a/LayoutTests/fast/loader/subframe-self-close.html
+++ b/LayoutTests/fast/loader/subframe-self-close.html
@@ -1,9 +1,9 @@
<html>
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
}
</script>
</head>
diff --git a/LayoutTests/fast/loader/submit-form-while-parsing-1.xhtml b/LayoutTests/fast/loader/submit-form-while-parsing-1.xhtml
index 7e3294a..7ef2b42 100644
--- a/LayoutTests/fast/loader/submit-form-while-parsing-1.xhtml
+++ b/LayoutTests/fast/loader/submit-form-while-parsing-1.xhtml
@@ -5,9 +5,9 @@
<form name="form" method="POST" action="resources/submit-form-while-parsing-success.html"/>
<script type="text/javascript">
<![CDATA[
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
document.forms.form.submit();
]]>
diff --git a/LayoutTests/fast/loader/submit-form-while-parsing-2.html b/LayoutTests/fast/loader/submit-form-while-parsing-2.html
index 8753b45..9ed3e26 100644
--- a/LayoutTests/fast/loader/submit-form-while-parsing-2.html
+++ b/LayoutTests/fast/loader/submit-form-while-parsing-2.html
@@ -5,9 +5,9 @@
function startTest()
{
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
testIsStarted = true;
@@ -29,8 +29,8 @@
document.getElementById("message").firstChild.data = "PASSED: If we successfully got here without an assertion or crash, all is well.";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/fast/loader/subresource-load-failed-crash.html b/LayoutTests/fast/loader/subresource-load-failed-crash.html
index e1cde29..62792cb 100644
--- a/LayoutTests/fast/loader/subresource-load-failed-crash.html
+++ b/LayoutTests/fast/loader/subresource-load-failed-crash.html
@@ -1,9 +1,9 @@
<html>
<body id='console'>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var xhr = new XMLHttpRequest;
@@ -13,7 +13,7 @@
{
if (xhr.readyState == xhr.DONE) {
document.getElementById('console').appendChild(document.createTextNode("PASS"));
- layoutTestController.notifyDone();
+ testRunner.notifyDone();
}
}
xhr.open("GET", "", true);
diff --git a/LayoutTests/fast/loader/subresource-willSendRequest-null.html b/LayoutTests/fast/loader/subresource-willSendRequest-null.html
index 3d2ce7e..15d633e 100644
--- a/LayoutTests/fast/loader/subresource-willSendRequest-null.html
+++ b/LayoutTests/fast/loader/subresource-willSendRequest-null.html
@@ -3,9 +3,9 @@
https://bugs.webkit.org/show_bug.cgi?id=49693<br>
Ensure loads that go through our scheduler and are cancelled by willSendRequest() don't cause us to crash.
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setWillSendRequestReturnsNull(true);
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setWillSendRequestReturnsNull(true);
}
var img = new Image(1, 1);
document.getElementsByTagName("body")[0].appendChild(img);
diff --git a/LayoutTests/fast/loader/unload-form-about-blank.html b/LayoutTests/fast/loader/unload-form-about-blank.html
index be397c2..5dfb539 100644
--- a/LayoutTests/fast/loader/unload-form-about-blank.html
+++ b/LayoutTests/fast/loader/unload-form-about-blank.html
@@ -5,9 +5,9 @@
</script>
<form id="fm" action="about:blank" method="POST"></form>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.location = "resources/pass-and-notify-done.html";
</script>
diff --git a/LayoutTests/fast/loader/unload-form-post-about-blank.html b/LayoutTests/fast/loader/unload-form-post-about-blank.html
index be397c2..5dfb539 100644
--- a/LayoutTests/fast/loader/unload-form-post-about-blank.html
+++ b/LayoutTests/fast/loader/unload-form-post-about-blank.html
@@ -5,9 +5,9 @@
</script>
<form id="fm" action="about:blank" method="POST"></form>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.location = "resources/pass-and-notify-done.html";
</script>
diff --git a/LayoutTests/fast/loader/unload-form-post.html b/LayoutTests/fast/loader/unload-form-post.html
index b952fe6..e90ef8d 100644
--- a/LayoutTests/fast/loader/unload-form-post.html
+++ b/LayoutTests/fast/loader/unload-form-post.html
@@ -5,9 +5,9 @@
</script>
<form id="fm" action="resources/fail-and-notify-done.html" method="POST"></form>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.location = "resources/pass-and-notify-done.html";
</script>
diff --git a/LayoutTests/fast/loader/unload-form.html b/LayoutTests/fast/loader/unload-form.html
index e1e5ea3..72c6858 100644
--- a/LayoutTests/fast/loader/unload-form.html
+++ b/LayoutTests/fast/loader/unload-form.html
@@ -5,9 +5,9 @@
</script>
<form id="fm" action="resources/fail-and-notify-done.html" method="GET"></form>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.location = "resources/pass-and-notify-done.html";
</script>
diff --git a/LayoutTests/fast/loader/unload-hyperlink-targeted.html b/LayoutTests/fast/loader/unload-hyperlink-targeted.html
index b2f0c3c..cb20465 100644
--- a/LayoutTests/fast/loader/unload-hyperlink-targeted.html
+++ b/LayoutTests/fast/loader/unload-hyperlink-targeted.html
@@ -1,7 +1,7 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
</script>
<iframe src="resources/unload-hyperlink-targeted-subframe.html">
diff --git a/LayoutTests/fast/loader/unload-hyperlink.html b/LayoutTests/fast/loader/unload-hyperlink.html
index 74718c6..d767392 100644
--- a/LayoutTests/fast/loader/unload-hyperlink.html
+++ b/LayoutTests/fast/loader/unload-hyperlink.html
@@ -10,9 +10,9 @@
</script>
<a id="lk" href="resources/fail-and-notify-done.html">Link to failure.</a>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.location = "resources/pass-and-notify-done.html";
</script>
diff --git a/LayoutTests/fast/loader/unload-javascript-url.html b/LayoutTests/fast/loader/unload-javascript-url.html
index 54d6fdc..e2b41f8 100644
--- a/LayoutTests/fast/loader/unload-javascript-url.html
+++ b/LayoutTests/fast/loader/unload-javascript-url.html
@@ -4,9 +4,9 @@
}, false);
</script>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.location = "resources/pass-and-notify-done.html";
</script>
diff --git a/LayoutTests/fast/loader/unload-reload.html b/LayoutTests/fast/loader/unload-reload.html
index c8a6099..74d5731 100644
--- a/LayoutTests/fast/loader/unload-reload.html
+++ b/LayoutTests/fast/loader/unload-reload.html
@@ -4,9 +4,9 @@
}, false);
</script>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.location = "resources/pass-and-notify-done.html";
</script>
diff --git a/LayoutTests/fast/loader/unload-window-location.html b/LayoutTests/fast/loader/unload-window-location.html
index 67dab4d..154cdee 100644
--- a/LayoutTests/fast/loader/unload-window-location.html
+++ b/LayoutTests/fast/loader/unload-window-location.html
@@ -4,9 +4,9 @@
}, false);
</script>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
window.location = "resources/pass-and-notify-done.html";
</script>
diff --git a/LayoutTests/fast/loader/unschedule-relayout-after-unload.html b/LayoutTests/fast/loader/unschedule-relayout-after-unload.html
index 801b36f..b84188c 100644
--- a/LayoutTests/fast/loader/unschedule-relayout-after-unload.html
+++ b/LayoutTests/fast/loader/unschedule-relayout-after-unload.html
@@ -4,10 +4,10 @@
</body>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
}
window.onpageshow = function(evt) {
diff --git a/LayoutTests/fast/loader/url-data-replace-backslash.html b/LayoutTests/fast/loader/url-data-replace-backslash.html
index 85e2669..e2387ec 100644
--- a/LayoutTests/fast/loader/url-data-replace-backslash.html
+++ b/LayoutTests/fast/loader/url-data-replace-backslash.html
@@ -3,8 +3,8 @@
</script>
<script type="text/javascript" src="data:text/javascript,d5%20%3D%20'five\u0027s'%3B"></script>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
if (d5 == "five's") {
document.write("PASS");
} else {
diff --git a/LayoutTests/fast/loader/url-parse-1.html b/LayoutTests/fast/loader/url-parse-1.html
index 48c318b..486d9f4 100644
--- a/LayoutTests/fast/loader/url-parse-1.html
+++ b/LayoutTests/fast/loader/url-parse-1.html
@@ -27,8 +27,8 @@
<tbody id = "results"></tbody>
</table>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function test(url)
{
diff --git a/LayoutTests/fast/loader/url-strip-cr-lf-tab.html b/LayoutTests/fast/loader/url-strip-cr-lf-tab.html
index c4bb346..ecf959c 100644
--- a/LayoutTests/fast/loader/url-strip-cr-lf-tab.html
+++ b/LayoutTests/fast/loader/url-strip-cr-lf-tab.html
@@ -3,9 +3,9 @@
XMLHttpRequest should strip CR/LF characters from the URL (not just XMLHttpRequest, really, and TAB is also stripped).
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
if (document.URL.indexOf('?') == -1) {
@@ -19,8 +19,8 @@
else
document.write("<p>Failure</p>");
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
</body>
diff --git a/LayoutTests/fast/loader/user-style-sheet-resource-load-callbacks.html b/LayoutTests/fast/loader/user-style-sheet-resource-load-callbacks.html
index 6a9e5b5..81eeb5f 100644
--- a/LayoutTests/fast/loader/user-style-sheet-resource-load-callbacks.html
+++ b/LayoutTests/fast/loader/user-style-sheet-resource-load-callbacks.html
@@ -1,15 +1,15 @@
<html>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpResourceLoadCallbacks();
- layoutTestController.setUserStyleSheetLocation("file:///tmp/LayoutTests/fast/loader/resources/user-style-sheet.css");
- layoutTestController.setUserStyleSheetEnabled(true);
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpResourceLoadCallbacks();
+ testRunner.setUserStyleSheetLocation("file:///tmp/LayoutTests/fast/loader/resources/user-style-sheet.css");
+ testRunner.setUserStyleSheetEnabled(true);
} else {
document.write ('This test must be run through DumpRenderTree.')
}
</script>
-<body onload = "if (window.layoutTestController) layoutTestController.setUserStyleSheetEnabled(false);">
+<body onload = "if (window.testRunner) testRunner.setUserStyleSheetEnabled(false);">
This tests that no delegate methods are sent for the user style sheet. No stylesheet load messages should be dumped.
</div>
</html>
\ No newline at end of file
diff --git a/LayoutTests/fast/loader/user-stylesheet-fast-path.html b/LayoutTests/fast/loader/user-stylesheet-fast-path.html
index 3584421..5e4a7cb 100644
--- a/LayoutTests/fast/loader/user-stylesheet-fast-path.html
+++ b/LayoutTests/fast/loader/user-stylesheet-fast-path.html
@@ -14,19 +14,19 @@
{result:false, size:"160px", url:"%50%30%10%00%20%40"}
];
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setUserStyleSheetEnabled(true);
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setUserStyleSheetEnabled(true);
for (var i = 0; i < testObjects.length; i++) {
var obj = testObjects[i];
- layoutTestController.setUserStyleSheetLocation(obj.url);
+ testRunner.setUserStyleSheetLocation(obj.url);
document.body.offsetTop;
var result = getComputedStyle(document.body).fontSize == obj.size;
document.write((result == obj.result ? "PASS" : "FAIL") + " " + obj.size + "<br>");
- layoutTestController.setUserStyleSheetLocation("");
+ testRunner.setUserStyleSheetLocation("");
}
} else
document.write("This test can only be run in DumpRenderTree.");
diff --git a/LayoutTests/fast/loader/willSendRequest-null-for-preload.html b/LayoutTests/fast/loader/willSendRequest-null-for-preload.html
index 01dca05..86a542a 100644
--- a/LayoutTests/fast/loader/willSendRequest-null-for-preload.html
+++ b/LayoutTests/fast/loader/willSendRequest-null-for-preload.html
@@ -3,9 +3,9 @@
<head>
<title>Bug 53123: Crashes loading pages when cancelling subresource loads through WebKit</title>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setWillSendRequestReturnsNull(true);
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setWillSendRequestReturnsNull(true);
}
</script>
<script type="text/javascript" src="resources/empty-script.js"></script>
diff --git a/LayoutTests/fast/loader/window-clearing.html b/LayoutTests/fast/loader/window-clearing.html
index fa95d74..fd8c3a3 100644
--- a/LayoutTests/fast/loader/window-clearing.html
+++ b/LayoutTests/fast/loader/window-clearing.html
@@ -2,9 +2,9 @@
<head>
<script>
function test() {
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
// set up test variables -- they should be cleared
diff --git a/LayoutTests/fast/loader/window-properties-restored-from-page-cache.html b/LayoutTests/fast/loader/window-properties-restored-from-page-cache.html
index 58bf47f..42b0e7f 100644
--- a/LayoutTests/fast/loader/window-properties-restored-from-page-cache.html
+++ b/LayoutTests/fast/loader/window-properties-restored-from-page-cache.html
@@ -1,8 +1,8 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
}
var cachedApplicationCache = window.applicationCache;
@@ -98,8 +98,8 @@
if (document.getElementById("errorDiv").innerText == "")
document.getElementById("errorDiv").innerText = "All tests passed.";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/fast/media/color-does-not-include-alpha.html b/LayoutTests/fast/media/color-does-not-include-alpha.html
index 3f369e2..2ebd254 100644
--- a/LayoutTests/fast/media/color-does-not-include-alpha.html
+++ b/LayoutTests/fast/media/color-does-not-include-alpha.html
@@ -13,8 +13,8 @@
</style>
<div id=test>This box should be green.</div>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var backgroundColor = getComputedStyle(document.getElementById("test"), null).backgroundColor;
const expectedBackgroundColor = "rgb(0, 128, 0)";
if (backgroundColor === expectedBackgroundColor)
diff --git a/LayoutTests/fast/media/invalid-lengths.html b/LayoutTests/fast/media/invalid-lengths.html
index 749f8ab..50a933d 100644
--- a/LayoutTests/fast/media/invalid-lengths.html
+++ b/LayoutTests/fast/media/invalid-lengths.html
@@ -2,8 +2,8 @@
<pre id="console">
</pre>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(message)
{
diff --git a/LayoutTests/fast/media/lifetime.html b/LayoutTests/fast/media/lifetime.html
index 18d1ddc..b9ef342 100644
--- a/LayoutTests/fast/media/lifetime.html
+++ b/LayoutTests/fast/media/lifetime.html
@@ -3,9 +3,9 @@
<div id=result>Testing...</div>
<iframe src="about:blank"></iframe>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function gc()
@@ -39,8 +39,8 @@
gc();
try { m.matchMedium("foobar") } catch (ex) { }
document.getElementById("result").innerHTML = "PASS";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}, 0);
}
</script>
diff --git a/LayoutTests/fast/media/matchmedium-query-api.html b/LayoutTests/fast/media/matchmedium-query-api.html
index 490ba49..278e429 100644
--- a/LayoutTests/fast/media/matchmedium-query-api.html
+++ b/LayoutTests/fast/media/matchmedium-query-api.html
@@ -5,8 +5,8 @@
</style>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(m)
{
diff --git a/LayoutTests/fast/media/media-query-list-01.html b/LayoutTests/fast/media/media-query-list-01.html
index 33dcc67..48dfb1e 100644
--- a/LayoutTests/fast/media/media-query-list-01.html
+++ b/LayoutTests/fast/media/media-query-list-01.html
@@ -5,8 +5,8 @@
</style>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(m)
{
diff --git a/LayoutTests/fast/media/media-query-list-02.html b/LayoutTests/fast/media/media-query-list-02.html
index 7093ca1..2a0426c 100644
--- a/LayoutTests/fast/media/media-query-list-02.html
+++ b/LayoutTests/fast/media/media-query-list-02.html
@@ -5,8 +5,8 @@
</style>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(m) {
document.getElementById('results').innerHTML += m + '<br>';
@@ -22,10 +22,10 @@
function runTests()
{
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
- layoutTestController.setViewModeMediaFeature("windowed");
+ testRunner.setViewModeMediaFeature("windowed");
windowedQuery = window.matchMedia("(-webkit-view-mode: windowed)");
floatingQuery = window.matchMedia("(-webkit-view-mode: floating)");
@@ -43,13 +43,13 @@
maximizedQuery.addListener(callback2);
log("------------- minimized -------------");
- layoutTestController.setViewModeMediaFeature("minimized");
+ testRunner.setViewModeMediaFeature("minimized");
log("------------- maximized -------------");
- layoutTestController.setViewModeMediaFeature("maximized");
+ testRunner.setViewModeMediaFeature("maximized");
log("------------- windowed -------------");
- layoutTestController.setViewModeMediaFeature("windowed");
+ testRunner.setViewModeMediaFeature("windowed");
log("------------- floating -------------");
- layoutTestController.setViewModeMediaFeature("floating");
+ testRunner.setViewModeMediaFeature("floating");
}
</script>
diff --git a/LayoutTests/fast/media/media-query-list-03.html b/LayoutTests/fast/media/media-query-list-03.html
index 833bdde..9842418 100644
--- a/LayoutTests/fast/media/media-query-list-03.html
+++ b/LayoutTests/fast/media/media-query-list-03.html
@@ -5,8 +5,8 @@
</style>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(m) {
document.getElementById('results').innerHTML += m + '<br>';
@@ -22,10 +22,10 @@
function runTests()
{
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
- layoutTestController.setViewModeMediaFeature("windowed");
+ testRunner.setViewModeMediaFeature("windowed");
windowedQuery = window.matchMedia("(-webkit-view-mode: windowed)");
minimizedQuery = window.matchMedia("(-webkit-view-mode: minimized)");
@@ -37,27 +37,27 @@
minimizedQuery.addListener(callback2);
log("------------- minimized -------------");
- layoutTestController.setViewModeMediaFeature("minimized");
+ testRunner.setViewModeMediaFeature("minimized");
log("------------- windowed -------------");
- layoutTestController.setViewModeMediaFeature("windowed");
+ testRunner.setViewModeMediaFeature("windowed");
log("<br><br>removing windowed[1] and minimized[2]<br>");
windowedQuery.removeListener(callback1);
minimizedQuery.removeListener(callback2);
log("------------- minimized -------------");
- layoutTestController.setViewModeMediaFeature("minimized");
+ testRunner.setViewModeMediaFeature("minimized");
log("------------- windowed -------------");
- layoutTestController.setViewModeMediaFeature("windowed");
+ testRunner.setViewModeMediaFeature("windowed");
log("<br><br>adding windowed[1] and minimized[2]<br>");
windowedQuery.addListener(callback1);
minimizedQuery.addListener(callback2);
log("------------- minimized -------------");
- layoutTestController.setViewModeMediaFeature("minimized");
+ testRunner.setViewModeMediaFeature("minimized");
log("------------- windowed -------------");
- layoutTestController.setViewModeMediaFeature("windowed");
+ testRunner.setViewModeMediaFeature("windowed");
}
diff --git a/LayoutTests/fast/media/media-query-list-04.html b/LayoutTests/fast/media/media-query-list-04.html
index a877a5a..a49af0f 100644
--- a/LayoutTests/fast/media/media-query-list-04.html
+++ b/LayoutTests/fast/media/media-query-list-04.html
@@ -3,10 +3,10 @@
<title>Test CSSOM View module: MediaQueryList interface</title>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
}
function log(m) {
@@ -47,21 +47,21 @@
// if this point is reached the page is comming from the page cache.
log("------------- minimized -------------");
- layoutTestController.setViewModeMediaFeature("minimized");
+ testRunner.setViewModeMediaFeature("minimized");
log("------------- maximized -------------");
- layoutTestController.setViewModeMediaFeature("maximized");
+ testRunner.setViewModeMediaFeature("maximized");
log("------------- windowed -------------");
- layoutTestController.setViewModeMediaFeature("windowed");
+ testRunner.setViewModeMediaFeature("windowed");
log("------------- floating -------------");
- layoutTestController.setViewModeMediaFeature("floating");
+ testRunner.setViewModeMediaFeature("floating");
- setTimeout(function() { if (window.layoutTestController) layoutTestController.notifyDone(); }, 0);
+ setTimeout(function() { if (window.testRunner) testRunner.notifyDone(); }, 0);
}
}
- if (window.layoutTestController) {
- layoutTestController.setViewModeMediaFeature("windowed");
+ if (window.testRunner) {
+ testRunner.setViewModeMediaFeature("windowed");
window.onpageshow = pageshow;
}
diff --git a/LayoutTests/fast/media/media-query-list-05.html b/LayoutTests/fast/media/media-query-list-05.html
index 6b66b0a..c2134d5 100644
--- a/LayoutTests/fast/media/media-query-list-05.html
+++ b/LayoutTests/fast/media/media-query-list-05.html
@@ -5,8 +5,8 @@
</style>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(m) {
document.getElementById('results').innerHTML += m + '<br>';
@@ -22,10 +22,10 @@
function runTests()
{
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
- layoutTestController.setViewModeMediaFeature("windowed");
+ testRunner.setViewModeMediaFeature("windowed");
var query = window.matchMedia("(-webkit-view-mode: windowed)");
@@ -33,7 +33,7 @@
query.addListener(callback1);
query.addListener(callback2);
- layoutTestController.setViewModeMediaFeature("minimized");
+ testRunner.setViewModeMediaFeature("minimized");
}
</script>
diff --git a/LayoutTests/fast/media/media-query-list-06.html b/LayoutTests/fast/media/media-query-list-06.html
index 5913e56..3de64da 100644
--- a/LayoutTests/fast/media/media-query-list-06.html
+++ b/LayoutTests/fast/media/media-query-list-06.html
@@ -5,8 +5,8 @@
</style>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(m) {
document.getElementById('results').innerHTML += m + '<br>';
@@ -14,14 +14,14 @@
function runTests()
{
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
- layoutTestController.setViewModeMediaFeature("windowed");
+ testRunner.setViewModeMediaFeature("windowed");
var query = window.matchMedia("(-webkit-view-mode: windowed)");
log('Query result before changing view-mode: ' + query.matches);
- layoutTestController.setViewModeMediaFeature("minimized");
+ testRunner.setViewModeMediaFeature("minimized");
log('Query result after changing view-mode: ' + query.matches);
}
diff --git a/LayoutTests/fast/media/media-query-list-07.html b/LayoutTests/fast/media/media-query-list-07.html
index 0344263..5d7115d 100644
--- a/LayoutTests/fast/media/media-query-list-07.html
+++ b/LayoutTests/fast/media/media-query-list-07.html
@@ -5,8 +5,8 @@
</style>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(m) {
document.getElementById('results').innerHTML += m + '<br>';
@@ -22,10 +22,10 @@
function runTests()
{
- if (!window.layoutTestController)
+ if (!window.testRunner)
return;
- layoutTestController.setViewModeMediaFeature("windowed");
+ testRunner.setViewModeMediaFeature("windowed");
var query = window.matchMedia("(-webkit-view-mode: windowed)");
@@ -35,7 +35,7 @@
query.addListener([1,2]);
query.addListener(callback2);
- layoutTestController.setViewModeMediaFeature("minimized");
+ testRunner.setViewModeMediaFeature("minimized");
}
</script>
diff --git a/LayoutTests/fast/media/media-query-list-callback.html b/LayoutTests/fast/media/media-query-list-callback.html
index 87dc7c6..f563b7b 100644
--- a/LayoutTests/fast/media/media-query-list-callback.html
+++ b/LayoutTests/fast/media/media-query-list-callback.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<p>If this doesn't crash...</p>
<p style="color:green;">PASS</p>
diff --git a/LayoutTests/fast/media/media-svg-crash.html b/LayoutTests/fast/media/media-svg-crash.html
index 1ef08ca..432c005 100644
--- a/LayoutTests/fast/media/media-svg-crash.html
+++ b/LayoutTests/fast/media/media-svg-crash.html
@@ -1,7 +1,7 @@
<html>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<img src='data:image/svg+xml,<!DOCTYPEg PUBLIC "" "/"><g xmlns="http://www.w3.org/2000/svg"><style>@media(max-color:5){*{</style>'>
PASS - SVG image with media type does not crash.
diff --git a/LayoutTests/fast/media/mq-pointer.html b/LayoutTests/fast/media/mq-pointer.html
index 7c81a40..9ad01a6 100644
--- a/LayoutTests/fast/media/mq-pointer.html
+++ b/LayoutTests/fast/media/mq-pointer.html
@@ -5,8 +5,8 @@
</style>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(m) {
document.getElementById('results').innerHTML += m + '<br>';
diff --git a/LayoutTests/fast/media/print-restores-previous-mediatype.html b/LayoutTests/fast/media/print-restores-previous-mediatype.html
index 10f5954..43db80f 100644
--- a/LayoutTests/fast/media/print-restores-previous-mediatype.html
+++ b/LayoutTests/fast/media/print-restores-previous-mediatype.html
@@ -5,9 +5,9 @@
</style>
<script type="text/javascript" charset="utf-8">
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setMediaType("handheld");
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setMediaType("handheld");
}
function log(m)
diff --git a/LayoutTests/fast/media/update-media-query-css-parser.html b/LayoutTests/fast/media/update-media-query-css-parser.html
index 7ce5f65..5105f80 100755
--- a/LayoutTests/fast/media/update-media-query-css-parser.html
+++ b/LayoutTests/fast/media/update-media-query-css-parser.html
@@ -10,8 +10,8 @@
}
</style>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<body>
diff --git a/LayoutTests/fast/media/view-mode-media-feature.html b/LayoutTests/fast/media/view-mode-media-feature.html
index 4a9dc79..70dd732 100644
--- a/LayoutTests/fast/media/view-mode-media-feature.html
+++ b/LayoutTests/fast/media/view-mode-media-feature.html
@@ -16,8 +16,8 @@
}
</style>
<script>
- if (window.layoutTestController)
- layoutTestController.setViewModeMediaFeature("minimized");
+ if (window.testRunner)
+ testRunner.setViewModeMediaFeature("minimized");
</script>
</head>
<body>
diff --git a/LayoutTests/fast/multicol/anonymous-block-split-crash.html b/LayoutTests/fast/multicol/anonymous-block-split-crash.html
index a09eb40..e8461df 100755
--- a/LayoutTests/fast/multicol/anonymous-block-split-crash.html
+++ b/LayoutTests/fast/multicol/anonymous-block-split-crash.html
@@ -8,8 +8,8 @@
#test4 { float: right; }
</style>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
onload = function() {
test0 = document.createElement('div');
diff --git a/LayoutTests/fast/multicol/break-properties.html b/LayoutTests/fast/multicol/break-properties.html
index 104cb8a..65f4cee 100644
--- a/LayoutTests/fast/multicol/break-properties.html
+++ b/LayoutTests/fast/multicol/break-properties.html
@@ -13,8 +13,8 @@
</div>
<pre id="console"></pre>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(message)
{
diff --git a/LayoutTests/fast/multicol/clone-block-children-inline-mismatch-crash.html b/LayoutTests/fast/multicol/clone-block-children-inline-mismatch-crash.html
index 534b7ae..afe0d36 100644
--- a/LayoutTests/fast/multicol/clone-block-children-inline-mismatch-crash.html
+++ b/LayoutTests/fast/multicol/clone-block-children-inline-mismatch-crash.html
@@ -8,8 +8,8 @@
#div2 { -webkit-column-span: all; }
</style>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function runTest()
{
diff --git a/LayoutTests/fast/multicol/column-span-parent-continuation-crash.html b/LayoutTests/fast/multicol/column-span-parent-continuation-crash.html
index 2a110f3d..5fa1491 100644
--- a/LayoutTests/fast/multicol/column-span-parent-continuation-crash.html
+++ b/LayoutTests/fast/multicol/column-span-parent-continuation-crash.html
@@ -8,9 +8,9 @@
</style>
<script src="../js/resources/js-test-pre.js"></script>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
function runTest()
@@ -22,8 +22,8 @@
gc();
document.body.innerHTML = "PASS";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
setTimeout("runTest()", 0);
diff --git a/LayoutTests/fast/multicol/content-height-zero-crash.html b/LayoutTests/fast/multicol/content-height-zero-crash.html
index 071e003..b2446dd 100644
--- a/LayoutTests/fast/multicol/content-height-zero-crash.html
+++ b/LayoutTests/fast/multicol/content-height-zero-crash.html
@@ -1,6 +1,6 @@
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<p>
This tests for a crash when specifying multiple columns for a block with 0 content height.
diff --git a/LayoutTests/fast/multicol/flipped-blocks-hit-test.html b/LayoutTests/fast/multicol/flipped-blocks-hit-test.html
index bcf373d..b699c91 100644
--- a/LayoutTests/fast/multicol/flipped-blocks-hit-test.html
+++ b/LayoutTests/fast/multicol/flipped-blocks-hit-test.html
@@ -11,8 +11,8 @@
</div>
<p id="result">The test did not run.</p>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var offset = document.caretRangeFromPoint(38, 18).startOffset;
document.getElementById("result").innerText = offset === 26 ? "PASS" : "FAIL";
diff --git a/LayoutTests/fast/multicol/float-truncation.html b/LayoutTests/fast/multicol/float-truncation.html
index 93d36fa..9e9fabc 100644
--- a/LayoutTests/fast/multicol/float-truncation.html
+++ b/LayoutTests/fast/multicol/float-truncation.html
@@ -95,8 +95,8 @@
failures++
}
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
document.getElementById("tests").style.display = "none";
}
diff --git a/LayoutTests/fast/multicol/gap-non-negative.html b/LayoutTests/fast/multicol/gap-non-negative.html
index 3912ae5..f2b7739 100644
--- a/LayoutTests/fast/multicol/gap-non-negative.html
+++ b/LayoutTests/fast/multicol/gap-non-negative.html
@@ -7,8 +7,8 @@
<p id = "result"></p>
<div id="target" style="-webkit-column-count: 4; -webkit-column-gap: -10px;"></div>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var style = getComputedStyle(document.getElementById("target"));
var columnGap = style.getPropertyValue("-webkit-column-gap");
diff --git a/LayoutTests/fast/multicol/hit-test-above-or-below.html b/LayoutTests/fast/multicol/hit-test-above-or-below.html
index 4e23fee..b1613b0 100644
--- a/LayoutTests/fast/multicol/hit-test-above-or-below.html
+++ b/LayoutTests/fast/multicol/hit-test-above-or-below.html
@@ -27,8 +27,8 @@
log ("FAIL: Character at " + x + ", " + y + " is " + actualCharacter + ". Expected " + character + ".");
}
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
test(150, 25, "1");
test(350, 25, "d");
diff --git a/LayoutTests/fast/multicol/hit-test-float.html b/LayoutTests/fast/multicol/hit-test-float.html
index e50f3b7..7af96ad 100644
--- a/LayoutTests/fast/multicol/hit-test-float.html
+++ b/LayoutTests/fast/multicol/hit-test-float.html
@@ -19,8 +19,8 @@
</div>
<div id="result">FAIL: Test did not run.</div>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var result = document.getElementById("result");
var hitElement = document.elementFromPoint(370, 250);
diff --git a/LayoutTests/fast/multicol/huge-column-count.html b/LayoutTests/fast/multicol/huge-column-count.html
index bf1c887..86a01bd 100644
--- a/LayoutTests/fast/multicol/huge-column-count.html
+++ b/LayoutTests/fast/multicol/huge-column-count.html
@@ -5,6 +5,6 @@
This test should not crash.
</body>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
diff --git a/LayoutTests/fast/multicol/huge-column-gap-crash.html b/LayoutTests/fast/multicol/huge-column-gap-crash.html
index 1580182..cf95ea9 100644
--- a/LayoutTests/fast/multicol/huge-column-gap-crash.html
+++ b/LayoutTests/fast/multicol/huge-column-gap-crash.html
@@ -8,8 +8,8 @@
</style>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
diff --git a/LayoutTests/fast/multicol/image-inside-nested-blocks-with-border.html b/LayoutTests/fast/multicol/image-inside-nested-blocks-with-border.html
index b53db8a..5957656 100644
--- a/LayoutTests/fast/multicol/image-inside-nested-blocks-with-border.html
+++ b/LayoutTests/fast/multicol/image-inside-nested-blocks-with-border.html
@@ -30,8 +30,8 @@
failures++
}
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
document.getElementById("tests").style.display = "none";
}
diff --git a/LayoutTests/fast/multicol/inherit-column-values.html b/LayoutTests/fast/multicol/inherit-column-values.html
index c4d46c8..4167702 100644
--- a/LayoutTests/fast/multicol/inherit-column-values.html
+++ b/LayoutTests/fast/multicol/inherit-column-values.html
@@ -31,8 +31,8 @@
output += (result == value) ? "\n" : (" expected " + value + "\n");
}
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
document.getElementById("parent").style.display = "none";
}
diff --git a/LayoutTests/fast/multicol/initial-column-values.html b/LayoutTests/fast/multicol/initial-column-values.html
index 150f009..32acd00 100644
--- a/LayoutTests/fast/multicol/initial-column-values.html
+++ b/LayoutTests/fast/multicol/initial-column-values.html
@@ -35,8 +35,8 @@
output += (result == value) ? "\n" : (" expected " + value + "\n");
}
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
document.getElementById("columns-test").style.display = "none";
document.getElementById("count-test").style.display = "none";
document.getElementById("gap-test").style.display = "none";
diff --git a/LayoutTests/fast/multicol/negativeColumnWidth.html b/LayoutTests/fast/multicol/negativeColumnWidth.html
index 909e845..0bf14830 100644
--- a/LayoutTests/fast/multicol/negativeColumnWidth.html
+++ b/LayoutTests/fast/multicol/negativeColumnWidth.html
@@ -3,6 +3,6 @@
<table><td style="-webkit-columns: -9999px;">
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
diff --git a/LayoutTests/fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow.html b/LayoutTests/fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow.html
index 03f50ca..448b652 100644
--- a/LayoutTests/fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow.html
+++ b/LayoutTests/fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow.html
@@ -7,8 +7,8 @@
The test passes if it does not cause a crash or assertion failure.
</p>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<div style="-webkit-columns: 2; width: 200px; height: 40px; font-family: ahem; -webkit-font-smoothing: none;">
<div style="height: 12px;"></div>
diff --git a/LayoutTests/fast/multicol/paginated-layer-crash.html b/LayoutTests/fast/multicol/paginated-layer-crash.html
index 4a6c6da..934133d 100644
--- a/LayoutTests/fast/multicol/paginated-layer-crash.html
+++ b/LayoutTests/fast/multicol/paginated-layer-crash.html
@@ -26,6 +26,6 @@
</div>
</div>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
diff --git a/LayoutTests/fast/multicol/renderer-positioned-assert-crash.html b/LayoutTests/fast/multicol/renderer-positioned-assert-crash.html
index 4336081..4ef4f3c 100644
--- a/LayoutTests/fast/multicol/renderer-positioned-assert-crash.html
+++ b/LayoutTests/fast/multicol/renderer-positioned-assert-crash.html
@@ -1,7 +1,7 @@
<html>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
<style>
.box
diff --git a/LayoutTests/fast/multicol/span/clone-before-after-content-crash.html b/LayoutTests/fast/multicol/span/clone-before-after-content-crash.html
index c0116d4..962e864 100755
--- a/LayoutTests/fast/multicol/span/clone-before-after-content-crash.html
+++ b/LayoutTests/fast/multicol/span/clone-before-after-content-crash.html
@@ -7,8 +7,8 @@
#test4 { -webkit-column-span: all; }
</style>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function runTest(){
test1 = document.createElement('div');
test1.setAttribute('id', 'test1');
diff --git a/LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash.html b/LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash.html
index 949ddc9..b6a3dfc 100644
--- a/LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash.html
+++ b/LayoutTests/fast/multicol/span/double-merge-anonymous-block-crash.html
@@ -1,8 +1,8 @@
<html>
<head>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
</script>
</head>
<style>
diff --git a/LayoutTests/fast/multicol/span/empty-anonymous-block-split-crash.html b/LayoutTests/fast/multicol/span/empty-anonymous-block-split-crash.html
index 9cb3762..ebc2724 100755
--- a/LayoutTests/fast/multicol/span/empty-anonymous-block-split-crash.html
+++ b/LayoutTests/fast/multicol/span/empty-anonymous-block-split-crash.html
@@ -7,8 +7,8 @@
#test3 { content: counter(c); -webkit-column-span: all; }
</style>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
onload = function() {
test0 = document.createElement('div');
diff --git a/LayoutTests/fast/multicol/span/positioned-child-not-removed-crash.html b/LayoutTests/fast/multicol/span/positioned-child-not-removed-crash.html
index aef7b9d..a30979c 100755
--- a/LayoutTests/fast/multicol/span/positioned-child-not-removed-crash.html
+++ b/LayoutTests/fast/multicol/span/positioned-child-not-removed-crash.html
@@ -9,8 +9,8 @@
.flexbox1 { display: -webkit-flexbox; padding-right: 10px; -webkit-transform: rotate3d(0, 1, 0, 90deg); }
</style>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function runTest() {
caption1 = document.createElement('caption');
diff --git a/LayoutTests/fast/multicol/span/positioned-objects-not-removed-crash.html b/LayoutTests/fast/multicol/span/positioned-objects-not-removed-crash.html
index fea1fcb..5e4a1f4 100755
--- a/LayoutTests/fast/multicol/span/positioned-objects-not-removed-crash.html
+++ b/LayoutTests/fast/multicol/span/positioned-objects-not-removed-crash.html
@@ -12,8 +12,8 @@
.c1:first-letter { content: ""; }
</style>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
onload = function() {
test0 = document.createElement('div');
diff --git a/LayoutTests/fast/multicol/span/removal-of-multicol-span-crash.html b/LayoutTests/fast/multicol/span/removal-of-multicol-span-crash.html
index fca19f5..e698277 100755
--- a/LayoutTests/fast/multicol/span/removal-of-multicol-span-crash.html
+++ b/LayoutTests/fast/multicol/span/removal-of-multicol-span-crash.html
@@ -8,14 +8,14 @@
function clear() {
document.documentElement.removeChild(document.body);
document.documentElement.innerHTML='PASS, if no exception or crash';
- if (window.layoutTestController) {
- layoutTestController.notifyDone();
+ if (window.testRunner) {
+ testRunner.notifyDone();
}
}
setTimeout("clear();", 0);
- if (window.layoutTestController) {
- layoutTestController.waitUntilDone();
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
}
</script>
<body>
diff --git a/LayoutTests/fast/multicol/span/runin-continuation-crash.html b/LayoutTests/fast/multicol/span/runin-continuation-crash.html
index f523c29..83e4f29 100755
--- a/LayoutTests/fast/multicol/span/runin-continuation-crash.html
+++ b/LayoutTests/fast/multicol/span/runin-continuation-crash.html
@@ -8,8 +8,8 @@
.runin { display: run-in; }
</style>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
document.body.offsetTop;
div1 = document.createElement('div');
diff --git a/LayoutTests/fast/multicol/span/split-flow-anonymous-wrapper-crash.html b/LayoutTests/fast/multicol/span/split-flow-anonymous-wrapper-crash.html
index 865e8ba..c514e94 100755
--- a/LayoutTests/fast/multicol/span/split-flow-anonymous-wrapper-crash.html
+++ b/LayoutTests/fast/multicol/span/split-flow-anonymous-wrapper-crash.html
@@ -6,8 +6,8 @@
.d1 { -webkit-column-span: all; }
</style>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function runTest() {
div1 = document.createElement('div');
diff --git a/LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash.html b/LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash.html
index 367aa01..3920465 100755
--- a/LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash.html
+++ b/LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash.html
@@ -1,8 +1,8 @@
<html>
<head>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function runTest() {
var container = document.createElement('div');
diff --git a/LayoutTests/fast/multicol/span/table-multi-column-crash.html b/LayoutTests/fast/multicol/span/table-multi-column-crash.html
index e36ca59..6f151dd 100755
--- a/LayoutTests/fast/multicol/span/table-multi-column-crash.html
+++ b/LayoutTests/fast/multicol/span/table-multi-column-crash.html
@@ -7,8 +7,8 @@
.table_container { -webkit-column-count: 2; }
</style>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
document.body.offsetTop;
table_span = document.createElement('table');
diff --git a/LayoutTests/fast/multicol/span/textbox-not-removed-crash.html b/LayoutTests/fast/multicol/span/textbox-not-removed-crash.html
index c06ca00..42d40d1 100755
--- a/LayoutTests/fast/multicol/span/textbox-not-removed-crash.html
+++ b/LayoutTests/fast/multicol/span/textbox-not-removed-crash.html
@@ -12,8 +12,8 @@
}
</style>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function crash() {
test1 = document.createElement('div');
diff --git a/LayoutTests/fast/multicol/span/update-after-content-before-child-crash.html b/LayoutTests/fast/multicol/span/update-after-content-before-child-crash.html
index 8572a42..11ae268 100755
--- a/LayoutTests/fast/multicol/span/update-after-content-before-child-crash.html
+++ b/LayoutTests/fast/multicol/span/update-after-content-before-child-crash.html
@@ -8,8 +8,8 @@
#table { float: right; }
</style>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
onload = function() {
columnContainer = document.createElement('div');
diff --git a/LayoutTests/fast/multicol/vertical-lr/break-properties.html b/LayoutTests/fast/multicol/vertical-lr/break-properties.html
index 69860e3..d285f6d 100644
--- a/LayoutTests/fast/multicol/vertical-lr/break-properties.html
+++ b/LayoutTests/fast/multicol/vertical-lr/break-properties.html
@@ -14,8 +14,8 @@
</div>
<pre id="console"></pre>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(message)
{
diff --git a/LayoutTests/fast/multicol/vertical-lr/float-truncation.html b/LayoutTests/fast/multicol/vertical-lr/float-truncation.html
index 0633ac8..46c07b7 100644
--- a/LayoutTests/fast/multicol/vertical-lr/float-truncation.html
+++ b/LayoutTests/fast/multicol/vertical-lr/float-truncation.html
@@ -94,8 +94,8 @@
}
}
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
document.getElementById("tests").style.display = "none";
}
diff --git a/LayoutTests/fast/multicol/vertical-lr/gap-non-negative.html b/LayoutTests/fast/multicol/vertical-lr/gap-non-negative.html
index b0d866c..d2a3d8d 100644
--- a/LayoutTests/fast/multicol/vertical-lr/gap-non-negative.html
+++ b/LayoutTests/fast/multicol/vertical-lr/gap-non-negative.html
@@ -8,8 +8,8 @@
<p id = "result"></p>
<div id="target" style="-webkit-column-count: 4; -webkit-column-gap: -10px;"></div>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var style = getComputedStyle(document.getElementById("target"));
var columnGap = style.getPropertyValue("-webkit-column-gap");
diff --git a/LayoutTests/fast/multicol/vertical-lr/image-inside-nested-blocks-with-border.html b/LayoutTests/fast/multicol/vertical-lr/image-inside-nested-blocks-with-border.html
index afa20ab..83a7088 100644
--- a/LayoutTests/fast/multicol/vertical-lr/image-inside-nested-blocks-with-border.html
+++ b/LayoutTests/fast/multicol/vertical-lr/image-inside-nested-blocks-with-border.html
@@ -30,8 +30,8 @@
failures++
}
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
document.getElementById("tests").style.display = "none";
}
diff --git a/LayoutTests/fast/multicol/vertical-rl/break-properties.html b/LayoutTests/fast/multicol/vertical-rl/break-properties.html
index b68b941..427ffb4 100644
--- a/LayoutTests/fast/multicol/vertical-rl/break-properties.html
+++ b/LayoutTests/fast/multicol/vertical-rl/break-properties.html
@@ -17,8 +17,8 @@
</div>
<pre id="console"></pre>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function log(message)
{
diff --git a/LayoutTests/fast/multicol/vertical-rl/float-truncation.html b/LayoutTests/fast/multicol/vertical-rl/float-truncation.html
index 8f28294..48cdd09 100644
--- a/LayoutTests/fast/multicol/vertical-rl/float-truncation.html
+++ b/LayoutTests/fast/multicol/vertical-rl/float-truncation.html
@@ -97,8 +97,8 @@
}
}
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
document.getElementById("tests").style.display = "none";
}
diff --git a/LayoutTests/fast/multicol/vertical-rl/gap-non-negative.html b/LayoutTests/fast/multicol/vertical-rl/gap-non-negative.html
index d232f66..0465470 100644
--- a/LayoutTests/fast/multicol/vertical-rl/gap-non-negative.html
+++ b/LayoutTests/fast/multicol/vertical-rl/gap-non-negative.html
@@ -8,8 +8,8 @@
<p id = "result"></p>
<div id="target" style="-webkit-column-count: 4; -webkit-column-gap: -10px;"></div>
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var style = getComputedStyle(document.getElementById("target"));
var columnGap = style.getPropertyValue("-webkit-column-gap");
diff --git a/LayoutTests/fast/multicol/vertical-rl/image-inside-nested-blocks-with-border.html b/LayoutTests/fast/multicol/vertical-rl/image-inside-nested-blocks-with-border.html
index 1042bb6..77d8c15 100644
--- a/LayoutTests/fast/multicol/vertical-rl/image-inside-nested-blocks-with-border.html
+++ b/LayoutTests/fast/multicol/vertical-rl/image-inside-nested-blocks-with-border.html
@@ -32,8 +32,8 @@
}
}
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
document.getElementById("tests").style.display = "none";
}
diff --git a/LayoutTests/fast/multicol/zeroColumnCount.html b/LayoutTests/fast/multicol/zeroColumnCount.html
index dce1517..9d7f304 100644
--- a/LayoutTests/fast/multicol/zeroColumnCount.html
+++ b/LayoutTests/fast/multicol/zeroColumnCount.html
@@ -3,6 +3,6 @@
<h2 style="-webkit-column-count: 0;">
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
</script>
diff --git a/LayoutTests/fast/mutation/end-of-task-delivery.html b/LayoutTests/fast/mutation/end-of-task-delivery.html
index 22d3647..7715c4f 100644
--- a/LayoutTests/fast/mutation/end-of-task-delivery.html
+++ b/LayoutTests/fast/mutation/end-of-task-delivery.html
@@ -4,9 +4,9 @@
</ol>
<p>Then click here</p>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var list = document.querySelector('ol');
@@ -16,8 +16,8 @@
observer.observe(list, {childList: true});
list.addEventListener('blur', function() {
document.body.innerHTML = observerRuns == 1 ? 'PASSED' : 'FAILED';
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
});
list.focus();
if (window.eventSender) {
diff --git a/LayoutTests/fast/mutation/inline-event-listener.html b/LayoutTests/fast/mutation/inline-event-listener.html
index 30968e1..22bcc2c 100644
--- a/LayoutTests/fast/mutation/inline-event-listener.html
+++ b/LayoutTests/fast/mutation/inline-event-listener.html
@@ -1,11 +1,11 @@
<!DOCTYPE html>
-<ol contenteditable oninput="document.body.innerHTML = observerRan ? 'FAILED' : 'PASSED'; if (window.layoutTestController) layoutTestController.notifyDone()">
+<ol contenteditable oninput="document.body.innerHTML = observerRan ? 'FAILED' : 'PASSED'; if (window.testRunner) testRunner.notifyDone()">
<li>Press enter
</ol>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var list = document.querySelector('ol');
diff --git a/LayoutTests/fast/mutation/mutation-callback-non-element-crash.html b/LayoutTests/fast/mutation/mutation-callback-non-element-crash.html
index 75f22ef..daf365a 100755
--- a/LayoutTests/fast/mutation/mutation-callback-non-element-crash.html
+++ b/LayoutTests/fast/mutation/mutation-callback-non-element-crash.html
@@ -2,8 +2,8 @@
<html>
<body>
<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
+if (window.testRunner)
+ testRunner.dumpAsText();
function mutationCallback(mutations, observer) {
mutations[0].addedNodes[-1];
diff --git a/LayoutTests/platform/chromium/fast/loader/create-view-target-blank.html b/LayoutTests/platform/chromium/fast/loader/create-view-target-blank.html
index e692eec..448cc9b 100644
--- a/LayoutTests/platform/chromium/fast/loader/create-view-target-blank.html
+++ b/LayoutTests/platform/chromium/fast/loader/create-view-target-blank.html
@@ -1,12 +1,12 @@
<html>
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpCreateView();
- layoutTestController.setCanOpenWindows();
- layoutTestController.setCloseRemainingWindowsWhenComplete();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpCreateView();
+ testRunner.setCanOpenWindows();
+ testRunner.setCloseRemainingWindowsWhenComplete();
+ testRunner.waitUntilDone();
}
function runTest() {
diff --git a/LayoutTests/platform/chromium/fast/loader/resources/done.html b/LayoutTests/platform/chromium/fast/loader/resources/done.html
index f28a6dc..cbd62e3 100644
--- a/LayoutTests/platform/chromium/fast/loader/resources/done.html
+++ b/LayoutTests/platform/chromium/fast/loader/resources/done.html
@@ -1,4 +1,4 @@
<script>
-if (window.layoutTestController)
- layoutTestController.notifyDone();
+if (window.testRunner)
+ testRunner.notifyDone();
</script>
diff --git a/LayoutTests/platform/gtk/fast/loader/crash-display-local-directory.html b/LayoutTests/platform/gtk/fast/loader/crash-display-local-directory.html
index 7fa0cb9..f65a087 100644
--- a/LayoutTests/platform/gtk/fast/loader/crash-display-local-directory.html
+++ b/LayoutTests/platform/gtk/fast/loader/crash-display-local-directory.html
@@ -3,8 +3,8 @@
<title>Test crash on directory display</title>
<script>
function directoryTest() {
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
var result = document.getElementById("result");
diff --git a/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2.html b/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2.html
index 0fec34a..898d128 100644
--- a/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2.html
+++ b/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpResourceResponseMIMETypes();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpResourceResponseMIMETypes();
+ testRunner.waitUntilDone();
}
var testImage;
@@ -152,8 +152,8 @@
function finish()
{
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3.html b/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3.html
index db00878..9440d02 100644
--- a/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3.html
+++ b/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpResourceResponseMIMETypes();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpResourceResponseMIMETypes();
+ testRunner.waitUntilDone();
}
var testImage;
@@ -134,8 +134,8 @@
function finish()
{
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/platform/mac/fast/loader/file-url-mimetypes.html b/LayoutTests/platform/mac/fast/loader/file-url-mimetypes.html
index 0b2b2be..d778df3 100644
--- a/LayoutTests/platform/mac/fast/loader/file-url-mimetypes.html
+++ b/LayoutTests/platform/mac/fast/loader/file-url-mimetypes.html
@@ -2,10 +2,10 @@
<head>
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpResourceResponseMIMETypes();
- layoutTestController.waitUntilDone();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpResourceResponseMIMETypes();
+ testRunner.waitUntilDone();
}
var testImage;
@@ -154,8 +154,8 @@
function finish()
{
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
</script>
diff --git a/LayoutTests/platform/mac/fast/loader/non-html-load-event.html b/LayoutTests/platform/mac/fast/loader/non-html-load-event.html
index 343cc54..ac4073b 100644
--- a/LayoutTests/platform/mac/fast/loader/non-html-load-event.html
+++ b/LayoutTests/platform/mac/fast/loader/non-html-load-event.html
@@ -1,6 +1,6 @@
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+ if (window.testRunner)
+ testRunner.dumpAsText();
function frameLoaded()
{
diff --git a/LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected.html b/LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected.html
index 3dd30d0..cb18e37 100644
--- a/LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected.html
+++ b/LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected.html
@@ -1,7 +1,7 @@
<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpChildFramesAsText();
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
}
</script>
The webarchive in this iframe is utf-8 encoded and will only display properly if the webarchive's encoding is respected.<br>
diff --git a/LayoutTests/platform/qt/fast/loader/user-stylesheet-qrc-path.html b/LayoutTests/platform/qt/fast/loader/user-stylesheet-qrc-path.html
index 368d2a3..b29efcd 100644
--- a/LayoutTests/platform/qt/fast/loader/user-stylesheet-qrc-path.html
+++ b/LayoutTests/platform/qt/fast/loader/user-stylesheet-qrc-path.html
@@ -2,10 +2,10 @@
This tests that a qrc URL is properly loaded as a user style sheet.
</p>
<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setUserStyleSheetEnabled(true);
- layoutTestController.setUserStyleSheetLocation('qrc:///resources/user.css');
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setUserStyleSheetEnabled(true);
+ testRunner.setUserStyleSheetLocation('qrc:///resources/user.css');
var computedStyle = getComputedStyle(document.body),
result = computedStyle.fontSize == '50px' && computedStyle.backgroundColor == 'rgb(255, 255, 0)',
