Use testRunner instead of layoutTestController in storage, tables, touchadjustments...
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 16 Jun 2012 02:16:04 +0000 (02:16 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 16 Jun 2012 02:16:04 +0000 (02:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=89263

Reviewed by Antti Koivisto.

* storage/domstorage/events/resources/eventTestHarness.js:
(testStorages.allDone):
* storage/domstorage/localstorage/delete-removal.html:
* storage/domstorage/localstorage/enumerate-storage.html:
* storage/domstorage/localstorage/enumerate-with-length-and-key.html:
* storage/domstorage/localstorage/index-get-and-set.html:
* storage/domstorage/localstorage/private-browsing-affects-storage.html:
* storage/domstorage/localstorage/resources/window-open-second.html:
* storage/domstorage/localstorage/simple-usage.html:
* storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare.html:
* storage/domstorage/localstorage/storagetracker/storage-tracker-2-create.html:
* storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all-expected.txt:
* storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all.html:
* storage/domstorage/localstorage/storagetracker/storage-tracker-4-create.html:
* storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one-expected.txt:
* storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one.html:
* storage/domstorage/localstorage/storagetracker/storage-tracker-6-create.html:
* storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage-expected.txt:
* storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage.html:
* storage/domstorage/localstorage/string-conversion.html:
* storage/domstorage/localstorage/window-open.html:
* storage/domstorage/script-tests/storage-functions-not-overwritten.js:
* storage/domstorage/sessionstorage/delete-removal.html:
* storage/domstorage/sessionstorage/enumerate-storage.html:
* storage/domstorage/sessionstorage/enumerate-with-length-and-key.html:
* storage/domstorage/sessionstorage/index-get-and-set.html:
* storage/domstorage/sessionstorage/private-browsing-affects-storage.html:
* storage/domstorage/sessionstorage/resources/window-open-second.html:
* storage/domstorage/sessionstorage/simple-usage.html:
* storage/domstorage/sessionstorage/string-conversion.html:
* storage/domstorage/sessionstorage/window-open.html:
* storage/domstorage/window-attributes-exist.html:
* storage/indexeddb/mozilla/index-prev-no-duplicate.html:
* storage/indexeddb/tutorial.html:
* storage/websql/change-version-handle-reuse.js:
(finishTest):
* storage/websql/change-version-no-crash-on-preflight-failure.html:
* storage/websql/change-version.html:
* storage/websql/close-during-stress-test.html:
* storage/websql/database-lock-after-reload.html:
* storage/websql/empty-statement.html:
* storage/websql/execute-sql-args.js:
(runTransactionTests):
* storage/websql/executesql-accepts-only-one-statement.html:
* storage/websql/hash-change-with-xhr.js:
(stopTest):
* storage/websql/multiple-databases-garbage-collection.js:
(checkCompletion):
* storage/websql/multiple-transactions-on-different-handles.js:
(checkCompletion):
* storage/websql/multiple-transactions.js:
(checkCompletion):
* storage/websql/null-callbacks.html:
* storage/websql/open-database-creation-callback-isolated-world.html:
* storage/websql/open-database-creation-callback.html:
* storage/websql/open-database-empty-version.html:
* storage/websql/open-database-over-quota.html:
* storage/websql/open-database-set-empty-version.html:
* storage/websql/open-database-while-transaction-in-progress.js:
(runTest):
* storage/websql/private-browsing-noread-nowrite.html:
* storage/websql/quota-tracking.html:
* storage/websql/read-and-write-transactions-dont-run-together.js:
(terminateTest):
* storage/websql/read-transactions-running-concurrently.html:
* storage/websql/resources/database-common.js:
(setupAndRunTest):
* storage/websql/resources/database-lock-after-reload-2.html:
* storage/websql/sql-data-types.js:
(notifyDone):
(runTest):
* storage/websql/sql-error-codes.js:
(finishTest):
(runTest):
* storage/websql/statement-error-callback-isolated-world.html:
* storage/websql/statement-error-callback.html:
* storage/websql/statement-success-callback-isolated-world.html:
* storage/websql/success-callback.html:
* storage/websql/test-authorizer.js:
(terminateTest):
* storage/websql/transaction-callback-exception-crash.html:
* storage/websql/transaction-callback-isolated-world.html:
* storage/websql/transaction-error-callback-isolated-world.html:
* storage/websql/transaction-error-callback.html:
* storage/websql/transaction-success-callback-isolated-world.html:
* tables/hittesting/filltable-emptycells.html:
* tables/hittesting/filltable-levels.html:
* tables/hittesting/filltable-outline.html:
* tables/hittesting/filltable-rtl.html:
* tables/hittesting/filltable-stress.html:
* tables/layering/paint-test-layering-1.html:
* tables/layering/paint-test-layering-2.html:
* tables/table-section-overflow-clip-crash.html:
* touchadjustment/block-testing.html:
* touchadjustment/event-triggered-widgets.html:
* touchadjustment/html-label.html:
* touchadjustment/iframe.html:
* touchadjustment/nested-touch.html:
* touchadjustment/scroll-delegation/iframe-with-mainframe-scroll-offset.html:
* touchadjustment/scroll-offset.html:
* touchadjustment/touch-inlines.html:
* touchadjustment/zoom-basic.html:
* touchadjustment/zoom-fatfinger.html:
* transforms/2d/compound-2d-transforms.html:
* transforms/2d/cssmatrix-2d-zoom.html:
* transforms/2d/set-transform-and-top.html:
* transforms/2d/transform-2d.html:
* transforms/2d/transform-accuracy.html:
* transforms/3d/general/3dtransform-values.html:
* transforms/3d/general/cssmatrix-3d-zoom.html:
* transforms/3d/general/matrix-with-zoom-3d.html:
* transforms/3d/general/transform-origin-z-change.html:
* transforms/3d/hit-testing/hit-preserves-3d.html:
* transforms/3d/point-mapping/3d-point-mapping-2.html:
* transforms/3d/point-mapping/3d-point-mapping-3.html:
* transforms/3d/point-mapping/3d-point-mapping-deep.html:
* transforms/3d/point-mapping/3d-point-mapping-origins.html:
* transforms/3d/point-mapping/3d-point-mapping-preserve-3d.html:
* transforms/no_transform_hit_testing.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@120516 268f45cc-cd09-0410-ab3c-d52691b4dbfc

105 files changed:
LayoutTests/ChangeLog
LayoutTests/storage/domstorage/events/resources/eventTestHarness.js
LayoutTests/storage/domstorage/localstorage/delete-removal.html
LayoutTests/storage/domstorage/localstorage/enumerate-storage.html
LayoutTests/storage/domstorage/localstorage/enumerate-with-length-and-key.html
LayoutTests/storage/domstorage/localstorage/index-get-and-set.html
LayoutTests/storage/domstorage/localstorage/private-browsing-affects-storage.html
LayoutTests/storage/domstorage/localstorage/resources/window-open-second.html
LayoutTests/storage/domstorage/localstorage/simple-usage.html
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare.html
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-2-create.html
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all-expected.txt
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all.html
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-4-create.html
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one-expected.txt
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one.html
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-6-create.html
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage-expected.txt
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage.html
LayoutTests/storage/domstorage/localstorage/string-conversion.html
LayoutTests/storage/domstorage/localstorage/window-open.html
LayoutTests/storage/domstorage/script-tests/storage-functions-not-overwritten.js
LayoutTests/storage/domstorage/sessionstorage/delete-removal.html
LayoutTests/storage/domstorage/sessionstorage/enumerate-storage.html
LayoutTests/storage/domstorage/sessionstorage/enumerate-with-length-and-key.html
LayoutTests/storage/domstorage/sessionstorage/index-get-and-set.html
LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects-storage.html
LayoutTests/storage/domstorage/sessionstorage/resources/window-open-second.html
LayoutTests/storage/domstorage/sessionstorage/simple-usage.html
LayoutTests/storage/domstorage/sessionstorage/string-conversion.html
LayoutTests/storage/domstorage/sessionstorage/window-open.html
LayoutTests/storage/domstorage/window-attributes-exist.html
LayoutTests/storage/indexeddb/mozilla/index-prev-no-duplicate.html
LayoutTests/storage/indexeddb/tutorial.html
LayoutTests/storage/websql/change-version-handle-reuse.js
LayoutTests/storage/websql/change-version-no-crash-on-preflight-failure.html
LayoutTests/storage/websql/change-version.html
LayoutTests/storage/websql/close-during-stress-test.html
LayoutTests/storage/websql/database-lock-after-reload.html
LayoutTests/storage/websql/empty-statement.html
LayoutTests/storage/websql/execute-sql-args.js
LayoutTests/storage/websql/executesql-accepts-only-one-statement.html
LayoutTests/storage/websql/hash-change-with-xhr.js
LayoutTests/storage/websql/multiple-databases-garbage-collection.js
LayoutTests/storage/websql/multiple-transactions-on-different-handles.js
LayoutTests/storage/websql/multiple-transactions.js
LayoutTests/storage/websql/null-callbacks.html
LayoutTests/storage/websql/open-database-creation-callback-isolated-world.html
LayoutTests/storage/websql/open-database-creation-callback.html
LayoutTests/storage/websql/open-database-empty-version.html
LayoutTests/storage/websql/open-database-over-quota.html
LayoutTests/storage/websql/open-database-set-empty-version.html
LayoutTests/storage/websql/open-database-while-transaction-in-progress.js
LayoutTests/storage/websql/private-browsing-noread-nowrite.html
LayoutTests/storage/websql/quota-tracking.html
LayoutTests/storage/websql/read-and-write-transactions-dont-run-together.js
LayoutTests/storage/websql/read-transactions-running-concurrently.html
LayoutTests/storage/websql/resources/database-common.js
LayoutTests/storage/websql/resources/database-lock-after-reload-2.html
LayoutTests/storage/websql/sql-data-types.js
LayoutTests/storage/websql/sql-error-codes.js
LayoutTests/storage/websql/statement-error-callback-isolated-world.html
LayoutTests/storage/websql/statement-error-callback.html
LayoutTests/storage/websql/statement-success-callback-isolated-world.html
LayoutTests/storage/websql/success-callback.html
LayoutTests/storage/websql/test-authorizer.js
LayoutTests/storage/websql/transaction-callback-exception-crash.html
LayoutTests/storage/websql/transaction-callback-isolated-world.html
LayoutTests/storage/websql/transaction-error-callback-isolated-world.html
LayoutTests/storage/websql/transaction-error-callback.html
LayoutTests/storage/websql/transaction-success-callback-isolated-world.html
LayoutTests/tables/hittesting/filltable-emptycells.html
LayoutTests/tables/hittesting/filltable-levels.html
LayoutTests/tables/hittesting/filltable-outline.html
LayoutTests/tables/hittesting/filltable-rtl.html
LayoutTests/tables/hittesting/filltable-stress.html
LayoutTests/tables/layering/paint-test-layering-1.html
LayoutTests/tables/layering/paint-test-layering-2.html
LayoutTests/tables/table-section-overflow-clip-crash.html
LayoutTests/touchadjustment/block-testing.html
LayoutTests/touchadjustment/event-triggered-widgets.html
LayoutTests/touchadjustment/html-label.html
LayoutTests/touchadjustment/iframe.html
LayoutTests/touchadjustment/nested-touch.html
LayoutTests/touchadjustment/scroll-delegation/iframe-with-mainframe-scroll-offset.html
LayoutTests/touchadjustment/scroll-offset.html
LayoutTests/touchadjustment/touch-inlines.html
LayoutTests/touchadjustment/zoom-basic.html
LayoutTests/touchadjustment/zoom-fatfinger.html
LayoutTests/transforms/2d/compound-2d-transforms.html
LayoutTests/transforms/2d/cssmatrix-2d-zoom.html
LayoutTests/transforms/2d/set-transform-and-top.html
LayoutTests/transforms/2d/transform-2d.html
LayoutTests/transforms/2d/transform-accuracy.html
LayoutTests/transforms/3d/general/3dtransform-values.html
LayoutTests/transforms/3d/general/cssmatrix-3d-zoom.html
LayoutTests/transforms/3d/general/matrix-with-zoom-3d.html
LayoutTests/transforms/3d/general/transform-origin-z-change.html
LayoutTests/transforms/3d/hit-testing/hit-preserves-3d.html
LayoutTests/transforms/3d/point-mapping/3d-point-mapping-2.html
LayoutTests/transforms/3d/point-mapping/3d-point-mapping-3.html
LayoutTests/transforms/3d/point-mapping/3d-point-mapping-deep.html
LayoutTests/transforms/3d/point-mapping/3d-point-mapping-origins.html
LayoutTests/transforms/3d/point-mapping/3d-point-mapping-preserve-3d.html
LayoutTests/transforms/no_transform_hit_testing.html

index b0dc48f..4ad1429 100644 (file)
@@ -1,3 +1,130 @@
+2012-06-16  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Use testRunner instead of layoutTestController in storage, tables, touchadjustments, and transforms tests
+        https://bugs.webkit.org/show_bug.cgi?id=89263
+
+        Reviewed by Antti Koivisto.
+
+        * storage/domstorage/events/resources/eventTestHarness.js:
+        (testStorages.allDone):
+        * storage/domstorage/localstorage/delete-removal.html:
+        * storage/domstorage/localstorage/enumerate-storage.html:
+        * storage/domstorage/localstorage/enumerate-with-length-and-key.html:
+        * storage/domstorage/localstorage/index-get-and-set.html:
+        * storage/domstorage/localstorage/private-browsing-affects-storage.html:
+        * storage/domstorage/localstorage/resources/window-open-second.html:
+        * storage/domstorage/localstorage/simple-usage.html:
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare.html:
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-2-create.html:
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all-expected.txt:
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all.html:
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-4-create.html:
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one-expected.txt:
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one.html:
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-6-create.html:
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage-expected.txt:
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage.html:
+        * storage/domstorage/localstorage/string-conversion.html:
+        * storage/domstorage/localstorage/window-open.html:
+        * storage/domstorage/script-tests/storage-functions-not-overwritten.js:
+        * storage/domstorage/sessionstorage/delete-removal.html:
+        * storage/domstorage/sessionstorage/enumerate-storage.html:
+        * storage/domstorage/sessionstorage/enumerate-with-length-and-key.html:
+        * storage/domstorage/sessionstorage/index-get-and-set.html:
+        * storage/domstorage/sessionstorage/private-browsing-affects-storage.html:
+        * storage/domstorage/sessionstorage/resources/window-open-second.html:
+        * storage/domstorage/sessionstorage/simple-usage.html:
+        * storage/domstorage/sessionstorage/string-conversion.html:
+        * storage/domstorage/sessionstorage/window-open.html:
+        * storage/domstorage/window-attributes-exist.html:
+        * storage/indexeddb/mozilla/index-prev-no-duplicate.html:
+        * storage/indexeddb/tutorial.html:
+        * storage/websql/change-version-handle-reuse.js:
+        (finishTest):
+        * storage/websql/change-version-no-crash-on-preflight-failure.html:
+        * storage/websql/change-version.html:
+        * storage/websql/close-during-stress-test.html:
+        * storage/websql/database-lock-after-reload.html:
+        * storage/websql/empty-statement.html:
+        * storage/websql/execute-sql-args.js:
+        (runTransactionTests):
+        * storage/websql/executesql-accepts-only-one-statement.html:
+        * storage/websql/hash-change-with-xhr.js:
+        (stopTest):
+        * storage/websql/multiple-databases-garbage-collection.js:
+        (checkCompletion):
+        * storage/websql/multiple-transactions-on-different-handles.js:
+        (checkCompletion):
+        * storage/websql/multiple-transactions.js:
+        (checkCompletion):
+        * storage/websql/null-callbacks.html:
+        * storage/websql/open-database-creation-callback-isolated-world.html:
+        * storage/websql/open-database-creation-callback.html:
+        * storage/websql/open-database-empty-version.html:
+        * storage/websql/open-database-over-quota.html:
+        * storage/websql/open-database-set-empty-version.html:
+        * storage/websql/open-database-while-transaction-in-progress.js:
+        (runTest):
+        * storage/websql/private-browsing-noread-nowrite.html:
+        * storage/websql/quota-tracking.html:
+        * storage/websql/read-and-write-transactions-dont-run-together.js:
+        (terminateTest):
+        * storage/websql/read-transactions-running-concurrently.html:
+        * storage/websql/resources/database-common.js:
+        (setupAndRunTest):
+        * storage/websql/resources/database-lock-after-reload-2.html:
+        * storage/websql/sql-data-types.js:
+        (notifyDone):
+        (runTest):
+        * storage/websql/sql-error-codes.js:
+        (finishTest):
+        (runTest):
+        * storage/websql/statement-error-callback-isolated-world.html:
+        * storage/websql/statement-error-callback.html:
+        * storage/websql/statement-success-callback-isolated-world.html:
+        * storage/websql/success-callback.html:
+        * storage/websql/test-authorizer.js:
+        (terminateTest):
+        * storage/websql/transaction-callback-exception-crash.html:
+        * storage/websql/transaction-callback-isolated-world.html:
+        * storage/websql/transaction-error-callback-isolated-world.html:
+        * storage/websql/transaction-error-callback.html:
+        * storage/websql/transaction-success-callback-isolated-world.html:
+        * tables/hittesting/filltable-emptycells.html:
+        * tables/hittesting/filltable-levels.html:
+        * tables/hittesting/filltable-outline.html:
+        * tables/hittesting/filltable-rtl.html:
+        * tables/hittesting/filltable-stress.html:
+        * tables/layering/paint-test-layering-1.html:
+        * tables/layering/paint-test-layering-2.html:
+        * tables/table-section-overflow-clip-crash.html:
+        * touchadjustment/block-testing.html:
+        * touchadjustment/event-triggered-widgets.html:
+        * touchadjustment/html-label.html:
+        * touchadjustment/iframe.html:
+        * touchadjustment/nested-touch.html:
+        * touchadjustment/scroll-delegation/iframe-with-mainframe-scroll-offset.html:
+        * touchadjustment/scroll-offset.html:
+        * touchadjustment/touch-inlines.html:
+        * touchadjustment/zoom-basic.html:
+        * touchadjustment/zoom-fatfinger.html:
+        * transforms/2d/compound-2d-transforms.html:
+        * transforms/2d/cssmatrix-2d-zoom.html:
+        * transforms/2d/set-transform-and-top.html:
+        * transforms/2d/transform-2d.html:
+        * transforms/2d/transform-accuracy.html:
+        * transforms/3d/general/3dtransform-values.html:
+        * transforms/3d/general/cssmatrix-3d-zoom.html:
+        * transforms/3d/general/matrix-with-zoom-3d.html:
+        * transforms/3d/general/transform-origin-z-change.html:
+        * transforms/3d/hit-testing/hit-preserves-3d.html:
+        * transforms/3d/point-mapping/3d-point-mapping-2.html:
+        * transforms/3d/point-mapping/3d-point-mapping-3.html:
+        * transforms/3d/point-mapping/3d-point-mapping-deep.html:
+        * transforms/3d/point-mapping/3d-point-mapping-origins.html:
+        * transforms/3d/point-mapping/3d-point-mapping-preserve-3d.html:
+        * transforms/no_transform_hit_testing.html:
+
 2012-06-15  Ryosuke Niwa  <rniwa@webkit.org>
 
         Remove empty directories.
index 232ec6b..476cce5 100644 (file)
@@ -1,6 +1,6 @@
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 iframe = document.createElement("IFRAME");
@@ -49,8 +49,8 @@ function testStorages(testCallback)
         debug("");
         localStorage.clear();
         sessionStorage.clear();
-        if (window.layoutTestController)
-            layoutTestController.notifyDone()
+        if (window.testRunner)
+            testRunner.notifyDone()
     }
 
     // When we're done testing with SessionStorage, this is run.
index 733cc65..0eb43fb 100644 (file)
@@ -2,8 +2,8 @@
 <head>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(a)
 {
index cd16593..7583f6e 100644 (file)
@@ -2,8 +2,8 @@
 <head>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(a)
 {
index b2134ec..a99a3cb 100644 (file)
@@ -2,8 +2,8 @@
 <head>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(a)
 {
index eed8850..1f9c240 100644 (file)
@@ -2,9 +2,9 @@
 <head>
 <script>
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(a)
@@ -14,8 +14,8 @@ function log(a)
 
 function finish()
 {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone()
+    if (window.testRunner)
+        testRunner.notifyDone()
 }
 
 function runTest()
index b2e4720..bc50ed7 100644 (file)
@@ -2,8 +2,8 @@
 <head>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(a)
 {
@@ -16,14 +16,14 @@ function runTest()
         log("window.localStorage DOES NOT exist");
         return;
     }
-    if (!window.layoutTestController) {
+    if (!window.testRunner) {
         log("Test only designed to be run under DumpRenderTree");
         return;
     }
     localStorage.clear();
     
     localStorage.setItem("testItem", "InitialValue");    
-    layoutTestController.setPrivateBrowsingEnabled(true);
+    testRunner.setPrivateBrowsingEnabled(true);
     log("Initial value of testItem is: " + localStorage.getItem("testItem"));
 
     try {
index f944d71..2c1896e 100644 (file)
@@ -24,8 +24,8 @@ function runTest()
     
     window.opener.log(secondWindowLog);
     
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 </script>
index 1b64210..64916fe 100644 (file)
@@ -2,8 +2,8 @@
 <head>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(a)
 {
index 01fa32a..c432436 100644 (file)
@@ -8,12 +8,12 @@
 <script>
 description("Prepare for StorageTracker tests by ensuring that every origin with local storage is deleted.");
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
     
 function finishTest() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function test()
@@ -25,9 +25,9 @@ function test()
     
     debug("This test should have no visible output on success.");
 
-    if (layoutTestController.originsWithLocalStorage().length > 0) {
-        layoutTestController.observeStorageTrackerNotifications(1);
-        layoutTestController.deleteAllLocalStorage();
+    if (testRunner.originsWithLocalStorage().length > 0) {
+        testRunner.observeStorageTrackerNotifications(1);
+        testRunner.deleteAllLocalStorage();
     } else {
         finishTest();
     }
index bada9e9..6f68abc 100644 (file)
@@ -8,12 +8,12 @@
 <script>
 description("StorageTracker test - write local storage for this origin. Should be called after origins-prepare.html.");
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
     
 function finishTest() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function test()
@@ -23,16 +23,16 @@ function test()
         return;
     }
     
-    if (layoutTestController.originsWithLocalStorage().length > 0) {
+    if (testRunner.originsWithLocalStorage().length > 0) {
         // An origin already exists so we can exit.
         testFailed("An origin already existed with local storage.");
-        layoutTestController.notifyDone();
+        testRunner.notifyDone();
     } else {
-        layoutTestController.syncLocalStorage();
+        testRunner.syncLocalStorage();
         
         localStorage.someData = 'writeme';
         // LayoutTestController's notifyDone will be called after the origin change notification comes in.
-        layoutTestController.observeStorageTrackerNotifications(1);
+        testRunner.observeStorageTrackerNotifications(1);
     }
 }
 
index da480d9..4ae49c5 100644 (file)
@@ -3,7 +3,7 @@ Test API to view origins that have local storage and to delete local storage by
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS layoutTestController.originsWithLocalStorage().toString() is "file__0"
+PASS testRunner.originsWithLocalStorage().toString() is "file__0"
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 70c4f47..e5287fe 100644 (file)
@@ -8,12 +8,12 @@
 <script>
 description("Test API to view origins that have local storage and to delete local storage by origin.");
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
     
 function finishTest() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function test()
@@ -23,13 +23,13 @@ function test()
         return;
     }
 
-    if (layoutTestController.originsWithLocalStorage().length > 0) {
-        shouldBeEqualToString("layoutTestController.originsWithLocalStorage().toString()", "file__0");
+    if (testRunner.originsWithLocalStorage().length > 0) {
+        shouldBeEqualToString("testRunner.originsWithLocalStorage().toString()", "file__0");
         // We're just going to delete the existing origin, so we'll get one origin change notification.
-        layoutTestController.observeStorageTrackerNotifications(1);
-        layoutTestController.deleteAllLocalStorage();
+        testRunner.observeStorageTrackerNotifications(1);
+        testRunner.deleteAllLocalStorage();
     } else {
-        layoutTestController.notifyDone();
+        testRunner.notifyDone();
         testFailed("Ran with no origins with local storage");
     }
 
index 94162bf..d247560 100644 (file)
@@ -8,12 +8,12 @@
 <script>
 description("StorageTracker test - write local storage for this origin. Should be called after storage-tracker-3-delete-all.html.");
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
     
 function finishTest() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function test()
@@ -25,14 +25,14 @@ function test()
     
     debug("This test should have no visible output on success.");
 
-    if (layoutTestController.originsWithLocalStorage().length > 0) {
+    if (testRunner.originsWithLocalStorage().length > 0) {
         // An origin already exists so we can exit.
         testFailed("An origin already existed with local storage.");
-        layoutTestController.notifyDone();
+        testRunner.notifyDone();
     } else {
-        layoutTestController.syncLocalStorage();
+        testRunner.syncLocalStorage();
         localStorage.someOtherData = 'writemeMore';
-        layoutTestController.observeStorageTrackerNotifications(1);
+        testRunner.observeStorageTrackerNotifications(1);
     }
 }
 
index da480d9..4ae49c5 100644 (file)
@@ -3,7 +3,7 @@ Test API to view origins that have local storage and to delete local storage by
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS layoutTestController.originsWithLocalStorage().toString() is "file__0"
+PASS testRunner.originsWithLocalStorage().toString() is "file__0"
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 3a2aab3..9596d7b 100644 (file)
@@ -8,12 +8,12 @@
 <script>
 description("Test API to view origins that have local storage and to delete local storage by origin.");
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
     
 function finishTest() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function test()
@@ -23,15 +23,15 @@ function test()
         return;
     }
 
-    if (layoutTestController.originsWithLocalStorage().length > 0) {
-        shouldBeEqualToString("layoutTestController.originsWithLocalStorage().toString()", "file__0");
+    if (testRunner.originsWithLocalStorage().length > 0) {
+        shouldBeEqualToString("testRunner.originsWithLocalStorage().toString()", "file__0");
         // We're just going to delete the existing origin, so we'll get one origin change notification.
-        layoutTestController.observeStorageTrackerNotifications(1);
+        testRunner.observeStorageTrackerNotifications(1);
         // At this point, we're guaranteed to have one origin with local storage.
-        layoutTestController.deleteLocalStorageForOrigin("file://");
+        testRunner.deleteLocalStorageForOrigin("file://");
     } else {
         testFailed("Ran with no origins with local storage.");
-        layoutTestController.notifyDone();
+        testRunner.notifyDone();
     }
 
 }
index 12727aa..e40ed6b 100644 (file)
@@ -8,12 +8,12 @@
 <script>
 description("StorageTracker test - write local storage for this origin. Should be called after storage-tracker-5-delete-one.html.");
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
     
 function finishTest() {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function test()
@@ -25,14 +25,14 @@ function test()
     
     debug("This test should have no visible output on success.");
 
-    if (layoutTestController.originsWithLocalStorage().length > 0) {
+    if (testRunner.originsWithLocalStorage().length > 0) {
         // An origin already exists so we can exit.
         testFailed("An origin already existed with local storage.");
-        layoutTestController.notifyDone();
+        testRunner.notifyDone();
     } else {
-        layoutTestController.syncLocalStorage();
+        testRunner.syncLocalStorage();
         localStorage.someOtherData = 'writemeMore';
-        layoutTestController.observeStorageTrackerNotifications(1);
+        testRunner.observeStorageTrackerNotifications(1);
     }
 }
 
index f016c0b..0cd145a 100644 (file)
@@ -3,8 +3,8 @@ Test API that reports local storage disk usage by origin. NOTE: this test DEPEND
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS layoutTestController.originsWithLocalStorage().toString() is "file__0"
-PASS layoutTestController.localStorageDiskUsageForOrigin('file://') > 6100 is true
+PASS testRunner.originsWithLocalStorage().toString() is "file__0"
+PASS testRunner.localStorageDiskUsageForOrigin('file://') > 6100 is true
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 5849bbb..b7ac4b5 100644 (file)
@@ -15,9 +15,9 @@ function test()
         return;
     }
 
-    if (layoutTestController.originsWithLocalStorage().length > 0) {
-        shouldBeEqualToString("layoutTestController.originsWithLocalStorage().toString()", "file__0");
-        shouldBeTrue("layoutTestController.localStorageDiskUsageForOrigin('file://') > 6100");
+    if (testRunner.originsWithLocalStorage().length > 0) {
+        shouldBeEqualToString("testRunner.originsWithLocalStorage().toString()", "file__0");
+        shouldBeTrue("testRunner.localStorageDiskUsageForOrigin('file://') > 6100");
     } else {
         testFailed("Ran with no origins with local storage.");
     }
index 71c216e..e669d82 100644 (file)
@@ -2,8 +2,8 @@
 <head>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(a)
 {
index fc43b83..d5efac7 100644 (file)
@@ -2,10 +2,10 @@
 <head>
 <script>
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.setCanOpenWindows();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.setCanOpenWindows();
+    testRunner.waitUntilDone();
 }
 
 function log(a)
index 828dfe7..c96a2b2 100644 (file)
@@ -1,7 +1,7 @@
 description("This test checks to ensure that window.localStorage and window.sessionStorage are not rendered unusable by setting a key with the same name as a storage function such that the function is hidden.");
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function doWedgeThySelf(storage) {
     storage.setItem("clear", "almost");
index 7a4b8d2..f35544a 100644 (file)
@@ -3,8 +3,8 @@
 <script src="resources/clearSessionStorage.js"></script>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(a)
 {
index 7321f9a..4cc74dc 100644 (file)
@@ -3,8 +3,8 @@
 <script src="resources/clearSessionStorage.js"></script>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(a)
 {
index 27266f1..75e6e51 100644 (file)
@@ -3,8 +3,8 @@
 <script src="resources/clearSessionStorage.js"></script>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(a)
 {
index 7922d0b..a98dee8 100644 (file)
@@ -3,9 +3,9 @@
 <script src="resources/clearSessionStorage.js"></script>
 <script>
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function log(a)
@@ -15,8 +15,8 @@ function log(a)
 
 function finish()
 {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone()
+    if (window.testRunner)
+        testRunner.notifyDone()
 }
 
 function runTest()
index 8dd7a6a..962a11b 100644 (file)
@@ -3,8 +3,8 @@
 <script src="resources/clearSessionStorage.js"></script>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(a)
 {
@@ -17,13 +17,13 @@ function runTest()
         log("window.sessionStorage DOES NOT exist");
         return;
     }
-    if (!window.layoutTestController) {
+    if (!window.testRunner) {
         log("Test only designed to be run under DumpRenderTree");
         return;
     }
     
     sessionStorage.setItem("testItem", "InitialValue");    
-    layoutTestController.setPrivateBrowsingEnabled(true);
+    testRunner.setPrivateBrowsingEnabled(true);
     log("Initial value of testItem is: " + sessionStorage.getItem("testItem"));
 
     try {
index b8dede6..df7652b 100644 (file)
@@ -24,8 +24,8 @@ function runTest()
     
     window.opener.log(secondWindowLog);
     
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 </script>
index 8e45521..e3efe90 100644 (file)
@@ -3,8 +3,8 @@
 <script src="resources/clearSessionStorage.js"></script>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(a)
 {
index 64a4e14..53fc828 100644 (file)
@@ -3,8 +3,8 @@
 <script src="resources/clearSessionStorage.js"></script>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(a)
 {
index 34f8f39..cc9fae9 100644 (file)
@@ -3,10 +3,10 @@
 <script src="resources/clearSessionStorage.js"></script>
 <script>
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.setCanOpenWindows();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.setCanOpenWindows();
+    testRunner.waitUntilDone();
 }
 
 function log(a)
index d01ba7c..5228851 100644 (file)
@@ -2,8 +2,8 @@
 <head>
 <script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 function log(a)
 {
index fb99f94..1bacb89 100644 (file)
@@ -17,8 +17,8 @@
 <script>
 
 description("Test IndexedDB: iterating backwards through an index, skipping duplicates");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 function test()
 {
index deca357..b935ee5 100644 (file)
@@ -24,9 +24,9 @@
 // goal of teaching people IndexedDB. That said, it does have a good amount of coverage and
 // serves as a living document describing what's expected to work and how within WebKit so it
 // seems well worth having checked in.
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 
@@ -404,8 +404,8 @@ function onIndexGetSuccess()
 function onAllDone()
 {
     log("Everything worked!");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 // The way setVersion is supposed to work:
index 847a58c..eec7776 100644 (file)
@@ -2,8 +2,8 @@ function finishTest()
 {
     log("TEST COMPLETE.");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function runTest()
index 2a512fb..6d7f9e3 100644 (file)
@@ -3,8 +3,8 @@
 <script>
 function finishTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function log(message)
@@ -13,9 +13,9 @@ function log(message)
 }
 
 function runTest() {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     var db = window.openDatabase("ChangeVersionFailureTest", "1", "Test the preflight step", 1024);
index 79bb9df..b82527b 100644 (file)
@@ -29,8 +29,8 @@ function changeVersionError(error)
 
 function finishTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
     log("TEST COMPLETE");
 }
 
@@ -54,10 +54,10 @@ function runTest()
 }
 
 function testPart1() {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllDatabases();
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.clearAllDatabases();
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     db1 = window.openDatabase("changeversion-test", "1", "Test for the database.changeVersion() function", 1024);
index 5cc52fd..7755357 100644 (file)
@@ -3,16 +3,16 @@
 <p>A JavaScript failure on the console is expected, however, as the global object is cleared when closing a frame.
 It actually helps to cause database activity by throwing an exception from a callback.</p>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
-    layoutTestController.dumpAsText();
+if (window.testRunner) {
+    testRunner.waitUntilDone();
+    testRunner.dumpAsText();
 }
 
 function startTest()
 {
     setTimeout("document.getElementsByTagName('iframe')[0].src = 'about:blank'", 100);
-    if (window.layoutTestController)
-        setTimeout("layoutTestController.notifyDone()", 500);
+    if (window.testRunner)
+        setTimeout("testRunner.notifyDone()", 500);
 }
 </script>
 <iframe src="resources/stress-frame.html" onload="startTest()"></iframe>
index 5b5989f..9acd429 100644 (file)
@@ -9,8 +9,8 @@ function log(message)
 function finishTest()
 {
     log("Test part 1 Complete");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function errorFunction(error)
@@ -35,10 +35,10 @@ function addData(db)
 
 function runTest()
 {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllDatabases();
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.clearAllDatabases();
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     var database;
index 36ec5b8..77897b5 100644 (file)
@@ -12,15 +12,15 @@ function executeEmptyStatement(transaction)
 {
     transaction.executeSql("");
     writeMessageToLog("Executed an empty statement. If you didn't see a crash or assertion, the test passed.");
-    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 db = openDatabase("EmptyStatementTest", "1.0", "Database for an empty statement test", 1);
     db.transaction(executeEmptyStatement);
index 3b9414d..3fd453b 100644 (file)
@@ -74,8 +74,8 @@ function runTransactionTests(transaction)
     for (i in expectException)
         runTransactionTest(transaction, expectException[i], true);
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function runTest()
index a3860c8..9cc6863 100644 (file)
@@ -13,8 +13,8 @@ function log(message)
 
 function terminateTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function executeStatement(expectedToPass, statement)
@@ -45,10 +45,10 @@ function executeStatement(expectedToPass, statement)
 
 function runTest()
 {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllDatabases();
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.clearAllDatabases();
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     db = openDatabase("ExecuteSQLAcceptsOnlyOneStatementTest", "1.0", "", 1);
index 7f56f79..4c9603b 100644 (file)
@@ -29,8 +29,8 @@ function stopTest(message)
 
     log(message);
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
     
 function updateDatabase()
index 9a2b27f..25680ea 100644 (file)
@@ -18,8 +18,8 @@ var forgottenDB = 0;
 var completed = 0;
 function checkCompletion()
 {
-    if (++completed == 2 && window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (++completed == 2 && window.testRunner)
+        testRunner.notifyDone();
 }
 
 function runTest()
index 9ab4b93..4f37a6c 100644 (file)
@@ -3,8 +3,8 @@ var complete = 0;
 function checkCompletion()
 {
     // The test should end after two transactions
-    if (++complete == 2 && window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (++complete == 2 && window.testRunner)
+        testRunner.notifyDone();
 }
 
 // Opens the database used in this test case
index 85cdabc..2feb3ad 100644 (file)
@@ -2,8 +2,8 @@ var complete = 0;
 
 function checkCompletion()
 {
-    if (++complete == 2 && window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (++complete == 2 && window.testRunner)
+        testRunner.notifyDone();
 }
 
 function runTest()
index 4ca0e1c..729676a 100644 (file)
@@ -3,16 +3,16 @@
 <script>
 function finishTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function runTest()
 {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllDatabases();
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.clearAllDatabases();
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     try {
index 98a4664..cedc851 100644 (file)
@@ -7,8 +7,8 @@ This test tests that the openDatabase() creation callback is called in the right
 var creationCallbacksExecuted = 0;
 function done()
 {
-    if ((++creationCallbacksExecuted == 2) && (window.layoutTestController))
-        layoutTestController.notifyDone();
+    if ((++creationCallbacksExecuted == 2) && (window.testRunner))
+        testRunner.notifyDone();
 }
 
 function creationCallback1(db)
@@ -26,11 +26,11 @@ function creationCallback2(db)
 document.body.foo = "FAIL: document.body.foo visible in isolated world.";
 document.body.bar = "PASS: document.body.bar visible in a callback created in this world.";
 
-if (window.layoutTestController) {
-    layoutTestController.clearAllDatabases();
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-    layoutTestController.evaluateScriptInIsolatedWorld(
+if (window.testRunner) {
+    testRunner.clearAllDatabases();
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+    testRunner.evaluateScriptInIsolatedWorld(
         0,
         "function creationCallback1(db)\n" +
         "{\n" +
index 081645c..64af63f 100644 (file)
@@ -8,18 +8,18 @@ function log(message)
 
 function finishTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function runTest()
 {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllDatabases();
-        layoutTestController.setDatabaseQuota(32768);
-        layoutTestController.dumpDatabaseCallbacks();
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.clearAllDatabases();
+        testRunner.setDatabaseQuota(32768);
+        testRunner.dumpDatabaseCallbacks();
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     var transactionsRun = 0;
index 4604113..2fbf5b3 100644 (file)
@@ -2,8 +2,8 @@
 <head>
 <script>
 function runTest() {
-    if (window.layoutTestController) 
-        layoutTestController.dumpAsText();
+    if (window.testRunner) 
+        testRunner.dumpAsText();
     
     try {    
         var db = openDatabase('5562470Test', '', 'Test for <rdar://problem/5562470> openDatabase does not work when the version string is empty', 1);
index 2a9264d..2238140 100644 (file)
@@ -2,9 +2,9 @@
 <head>
 <script>
 function runTest() {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.clearAllDatabases();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.clearAllDatabases();
     }
 
     try {
index f3607fd..ae2099f 100644 (file)
@@ -2,9 +2,9 @@
 <head>
 <script>
 function runTest() {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.clearAllDatabases();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.clearAllDatabases();
     }
     
     try {    
index 7a1a0c0..53f3b95 100644 (file)
@@ -35,7 +35,7 @@ function runTest()
     }, function(error) {
         log("Transaction failed: " + error.message);
     }, function() {
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     });
 }
index b9b5882..673a613 100644 (file)
@@ -67,8 +67,8 @@ function runPrivateBrowsingTests()
 {
     completed = 0;
 
-    if (window.layoutTestController)
-        layoutTestController.setPrivateBrowsingEnabled(true);
+    if (window.testRunner)
+        testRunner.setPrivateBrowsingEnabled(true);
     
     for (i in privateBrowsingStatements)
         theTransaction.executeSql(privateBrowsingStatements[i], [], privateBrowsingSuccessFunction, privateBrowsingErrorFunction);
@@ -78,15 +78,15 @@ function endTest()
 {
     writeMessageToLog("Test ended");
     
-    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 database = openDatabase("PrivateBrowsingNoReadNoWriteTest", "1.0", "Test private browsing no read/write safety", 1);
index 6e52523..702c3ce 100644 (file)
@@ -13,8 +13,8 @@ function log(message)
 function finishTest()
 {
     log("Test Complete");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function statementErrorFunction(tx, error)
@@ -88,12 +88,12 @@ function testDatabase(db)
 
 function runTest()
 {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllDatabases();
-        layoutTestController.dumpDatabaseCallbacks();
-        layoutTestController.setDatabaseQuota(40960);
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.clearAllDatabases();
+        testRunner.dumpDatabaseCallbacks();
+        testRunner.setDatabaseQuota(40960);
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     database1 = openDatabase("QuotaManagementDatabase1", "1.0", "Test for quota management <rdar://5628468>", 1);
index 5b817ba..beb1e89 100644 (file)
@@ -1,7 +1,7 @@
 function terminateTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function openTestDatabase()
index b2d862c..ad801cf 100644 (file)
@@ -9,8 +9,8 @@ function log(message)
 
 function terminateTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function openTestDatabase()
@@ -40,9 +40,9 @@ function runReadTransaction(db)
 }
 
 function runTest() {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     try {
index d1eb410..f52a36f 100644 (file)
@@ -20,9 +20,9 @@ function setLocationHash(hash) {
 
 function setupAndRunTest()
 {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
     document.getElementById("console").innerText = "";
     runTest();
index 6e0f09c..68c52e1 100644 (file)
@@ -9,8 +9,8 @@ function log(message)
 function finishTest()
 {
     log("Test part 2 Complete");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function errorFunction(error)
@@ -30,9 +30,9 @@ function addData(db)
 
 function runTest()
 {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     try {
index 36fcd01..8e5d3cf 100644 (file)
@@ -7,8 +7,8 @@ function writeMessageToLog(message)
 
 function notifyDone(str) {
     writeMessageToLog(str);
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 var testValues = {
@@ -75,9 +75,9 @@ function createTestDBStmt(tx)
 }
 
 function runTest() {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
     var db = openDatabase("DataTypeTest", "1.0", "Database for sql data type test", 1);
     if (db)
index 2d2c97c..7dd9555 100644 (file)
@@ -1,7 +1,7 @@
 function finishTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 var TOTAL_TESTS = 7;
@@ -100,8 +100,8 @@ function testVersionMismatch(db)
 
 function runTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.clearAllDatabases();
+    if (window.testRunner)
+        testRunner.clearAllDatabases();
 
     var db = openDatabaseWithSuffix("SQLErrorCodesTest", "1.0", "Tests the error codes.", 1);
     testTransactionThrowsException(db);
index 196e42b..1e7523d 100644 (file)
@@ -7,8 +7,8 @@ This test tests that the statement error callback is called in the right world.
 var statementErrorCallbacksInvoked = 0;
 function done()
 {
-    if ((++statementErrorCallbacksInvoked == 2) && (window.layoutTestController))
-        layoutTestController.notifyDone();
+    if ((++statementErrorCallbacksInvoked == 2) && (window.testRunner))
+        testRunner.notifyDone();
 }
 
 function statementErrorCallback1(tx, error)
@@ -26,11 +26,11 @@ function statementErrorCallback2(tx, error)
 document.body.foo = "FAIL: document.body.foo visible in isolated world.";
 document.body.bar = "PASS: document.body.bar visible in a callback created in this world.";
 
-if (window.layoutTestController) {
-    layoutTestController.clearAllDatabases();
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-    layoutTestController.evaluateScriptInIsolatedWorld(
+if (window.testRunner) {
+    testRunner.clearAllDatabases();
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+    testRunner.evaluateScriptInIsolatedWorld(
         0,
         "function statementErrorCallback1(tx, error)\n" +
         "{\n" +
index 6db836d..4ad4c77 100644 (file)
@@ -10,8 +10,8 @@ function log(message)
 function finishTest()
 {
     log("Test Complete");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 var txCallbackCount = 0;
@@ -55,10 +55,10 @@ function runTransaction(expectedToFail, statementErrorCallback)
 
 function runTest()
 {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllDatabases();
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.clearAllDatabases();
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     database = openDatabase("StatementErrorCallbackTest", "1.0", "statement error callback test", 1024);
index 4fac754..54d3fde 100644 (file)
@@ -7,8 +7,8 @@ This test tests that the statement success callback is called in the right world
 var statementSuccessCallbacksInvoked = 0;
 function done()
 {
-    if ((++statementSuccessCallbacksInvoked == 2) && (window.layoutTestController))
-        layoutTestController.notifyDone();
+    if ((++statementSuccessCallbacksInvoked == 2) && (window.testRunner))
+        testRunner.notifyDone();
 }
 
 function statementSuccessCallback1(tx, data)
@@ -26,11 +26,11 @@ function statementSuccessCallback2(tx, data)
 document.body.foo = "FAIL: document.body.foo visible in isolated world.";
 document.body.bar = "PASS: document.body.bar visible in a callback created in this world.";
 
-if (window.layoutTestController) {
-    layoutTestController.clearAllDatabases();
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-    layoutTestController.evaluateScriptInIsolatedWorld(
+if (window.testRunner) {
+    testRunner.clearAllDatabases();
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+    testRunner.evaluateScriptInIsolatedWorld(
         0,
         "function statementSuccessCallback1(tx, data)\n" +
         "{\n" +
index c237aba..724b0c3 100644 (file)
@@ -10,8 +10,8 @@ function log(message)
 function finishTest()
 {
     log("Test Complete");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function errorFunction(error)
@@ -31,10 +31,10 @@ function successFunction(message)
 
 function runTest()
 {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllDatabases();
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.clearAllDatabases();
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
     
     var database = openDatabase("SuccessCallbackDatabase", "1.0", "Test for success callback <rdar://5737692>", 1);
index 4a08c89..17e7d11 100644 (file)
@@ -1,7 +1,7 @@
 function terminateTest()
 {
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function logAndTerminateTest(message, error)
index 4bcc732..8499282 100644 (file)
@@ -1,15 +1,15 @@
 <html>
 <head>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var db = openDatabase("15976Test", "1.0", "Test for http://bugs.webkit.org/show_bug.cgi?id=15976", 1);
 db.transaction(function(tx) {
-   if (window.layoutTestController)
-       window.setTimeout(function() { layoutTestController.notifyDone() }, 0);
+   if (window.testRunner)
+       window.setTimeout(function() { testRunner.notifyDone() }, 0);
    throw "TransactionCallbackError";
 });
 </script>
index 6825d70..f6cafaa 100644 (file)
@@ -7,8 +7,8 @@ This test tests that the transaction callback is called in the right world.
 var transactionCallbacksInvoked = 0;
 function done()
 {
-    if ((++transactionCallbacksInvoked == 2) && (window.layoutTestController))
-        layoutTestController.notifyDone();
+    if ((++transactionCallbacksInvoked == 2) && (window.testRunner))
+        testRunner.notifyDone();
 }
 
 function transactionCallback1(tx)
@@ -26,11 +26,11 @@ function transactionCallback2(tx)
 document.body.foo = "FAIL: document.body.foo visible in isolated world.";
 document.body.bar = "PASS: document.body.bar visible in a callback created in this world.";
 
-if (window.layoutTestController) {
-    layoutTestController.clearAllDatabases();
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-    layoutTestController.evaluateScriptInIsolatedWorld(
+if (window.testRunner) {
+    testRunner.clearAllDatabases();
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+    testRunner.evaluateScriptInIsolatedWorld(
         0,
         "function transactionCallback1(tx)\n" +
         "{\n" +
index 521894d..4e670dc 100644 (file)
@@ -7,8 +7,8 @@ This test tests that the transaction error callback is called in the right world
 var transactionErrorCallbacksInvoked = 0;
 function done()
 {
-    if ((++transactionErrorCallbacksInvoked == 2) && (window.layoutTestController))
-        layoutTestController.notifyDone();
+    if ((++transactionErrorCallbacksInvoked == 2) && (window.testRunner))
+        testRunner.notifyDone();
 }
 
 function transactionErrorCallback1(tx)
@@ -26,11 +26,11 @@ function transactionErrorCallback2(tx)
 document.body.foo = "FAIL: document.body.foo visible in isolated world.";
 document.body.bar = "PASS: document.body.bar visible in a callback created in this world.";
 
-if (window.layoutTestController) {
-    layoutTestController.clearAllDatabases();
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-    layoutTestController.evaluateScriptInIsolatedWorld(
+if (window.testRunner) {
+    testRunner.clearAllDatabases();
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+    testRunner.evaluateScriptInIsolatedWorld(
         0,
         "function transactionErrorCallback1(tx)\n" +
         "{\n" +
index 90b2ed0..ec2d4eb 100644 (file)
@@ -7,7 +7,7 @@ function log(message)
     document.getElementById("console").innerHTML += message + "<br>";
 }
 
-// signal to layoutTestController when this reaches zero.
+// signal to testRunner when this reaches zero.
 var testCount = 4;
 // we first retrieve and store the number of rows already in our test database.
 // our goal is to keep the number unchanged through the tests.
@@ -22,8 +22,8 @@ function finishTest()
 
     log("All Tests are complete.");
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 function successCallback()
@@ -67,10 +67,10 @@ function statementCallbackThrowsException(errorCallback)
 
 function runTest()
 {
-    if (window.layoutTestController) {
-        layoutTestController.clearAllDatabases();
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.clearAllDatabases();
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     database = openDatabase("ErrorCallbackDatabase", "1.0", "Test for error callback", 1);
index ca2df94..280a4fe 100644 (file)
@@ -7,8 +7,8 @@ This test tests that the transaction success callback is called in the right wor
 var transactionSuccessCallbacksInvoked = 0;
 function done()
 {
-    if ((++transactionSuccessCallbacksInvoked == 2) && (window.layoutTestController))
-        layoutTestController.notifyDone();
+    if ((++transactionSuccessCallbacksInvoked == 2) && (window.testRunner))
+        testRunner.notifyDone();
 }
 
 function transactionSuccessCallback1(tx)
@@ -26,11 +26,11 @@ function transactionSuccessCallback2(tx)
 document.body.foo = "FAIL: document.body.foo visible in isolated world.";
 document.body.bar = "PASS: document.body.bar visible in a callback created in this world.";
 
-if (window.layoutTestController) {
-    layoutTestController.clearAllDatabases();
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-    layoutTestController.evaluateScriptInIsolatedWorld(
+if (window.testRunner) {
+    testRunner.clearAllDatabases();
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+    testRunner.evaluateScriptInIsolatedWorld(
         0,
         "function transactionSuccessCallback1(tx)\n" +
         "{\n" +
index 2d08a6e..8240660 100644 (file)
@@ -13,9 +13,9 @@
     var lastSuccess = 0;
     var failed = false;
 
-   if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        window.layoutTestController.waitUntilDone();
+   if (window.testRunner) {
+        testRunner.dumpAsText();
+        window.testRunner.waitUntilDone();
     }
 
     function isEmpty(row, col) {
@@ -47,8 +47,8 @@
         ypos += cellHeight;
       }
       document.body.innerHTML = (failed ? "FAIL!!!<br/>" : "SUCCESS!!!<br/>") +logMsg;
-      if (window.layoutTestController) {
-          window.layoutTestController.notifyDone();
+      if (window.testRunner) {
+          window.testRunner.notifyDone();
       }
     }
   </script>
index 2328dd4..ee43a8e 100644 (file)
@@ -17,9 +17,9 @@
                     [false, false, false]];
 
 
-    if (window.layoutTestController) {
-        window.layoutTestController.dumpAsText();
-        window.layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        window.testRunner.dumpAsText();
+        window.testRunner.waitUntilDone();
     }
 
     function clearHitArray() {
@@ -81,8 +81,8 @@
         ypos += cellHeight;
       }
       document.body.innerHTML =(failed ? "FAIL!!!<br/>" : "SUCCESS!!!<br/>") +logMsg;
-      if (window.layoutTestController) {
-          window.layoutTestController.notifyDone();
+      if (window.testRunner) {
+          window.testRunner.notifyDone();
       }
     }
 </script>
index f895d20..5858068 100644 (file)
@@ -17,9 +17,9 @@
     var logMsg = "";
     var failed = false;
 
-    if (window.layoutTestController) {
-        window.layoutTestController.dumpAsText();
-        window.layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        window.testRunner.dumpAsText();
+        window.testRunner.waitUntilDone();
     }
 
     for (var row = 0; row < 10; ++row) {
@@ -59,8 +59,8 @@
         var outline2 = document.getElementById("outline2");
         outline2.style.outline = "none";
         document.body.innerHTML =(failed ? "FAIL!!!<br/>" : "SUCCESS!!!<br/>") +logMsg;
-        if (window.layoutTestController) {
-            window.layoutTestController.notifyDone();
+        if (window.testRunner) {
+            window.testRunner.notifyDone();
         }
     }
 
index 76fa4b5..966ae15 100644 (file)
@@ -15,9 +15,9 @@
                       [false, false, false],
                       [false, false, false]];
 
-      if (window.layoutTestController) {
-          window.layoutTestController.dumpAsText();
-          window.layoutTestController.waitUntilDone();
+      if (window.testRunner) {
+          window.testRunner.dumpAsText();
+          window.testRunner.waitUntilDone();
       }
 
       function clearHitArray() {
@@ -71,8 +71,8 @@
         ypos += cellHeight;
       }
       document.body.innerHTML =(failed ? "FAIL!!!<br/>" : "SUCCESS!!!<br/>") +logMsg;
-      if (window.layoutTestController) {
-          window.layoutTestController.notifyDone();
+      if (window.testRunner) {
+          window.testRunner.notifyDone();
       }
     }
 
index 4cc3625..7b37932 100644 (file)
@@ -14,9 +14,9 @@
     var lastSuccess = 0;
     var failed = false;
 
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        window.layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        window.testRunner.waitUntilDone();
     }
 
     function cellHit(cell) {
@@ -41,8 +41,8 @@
         ypos += cellHeight;
       }
       document.body.innerHTML =(failed ? "FAIL!!!<br/>" : "SUCCESS!!!<br/>") +logMsg;
-      if (window.layoutTestController) {
-          window.layoutTestController.notifyDone();
+      if (window.testRunner) {
+          window.testRunner.notifyDone();
       }
     }
 
index b20a8c4..fb0d67d 100644 (file)
@@ -7,14 +7,14 @@
 <!--\r
     function Setup() { 
         setTimeout('RepaintBug()', 10);
-        if (window.layoutTestController)
-            layoutTestController.waitUntilDone();
+        if (window.testRunner)
+            testRunner.waitUntilDone();
     }
     function RepaintBug() {\r
         var div1 = document.getElementById("bug2");\r
         div1.style.color = 'green';\r
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 //-->
 </script>
index 938d489..6a56a63 100644 (file)
@@ -6,14 +6,14 @@
 <!--\r
     function Setup() { 
         setTimeout('RepaintBug()', 10);
-        if (window.layoutTestController)
-            layoutTestController.waitUntilDone();
+        if (window.testRunner)
+            testRunner.waitUntilDone();
     }
     function RepaintBug() {\r
         var div2 = document.getElementById("bug2");
         div2.style.color = 'green';\r
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }\r
 //-->\r
 </script>\r
index 0cb478a..e6b78fa 100755 (executable)
 }
 </style>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 function finish() {
     document.body.innerHTML = "WebKit Bug 87445 - RenderTableSection::paintCell.<br/>Test passes if it does not crash.";
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 
 onload = function() {
index 91c1821..4fb18a5 100644 (file)
@@ -43,13 +43,13 @@ Some text. <a id=a1 href="#1">A link</a>
     }
     function runTests()
     {
-        if (window.layoutTestController && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
+        if (window.testRunner && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
             description('Test touch-adjustment on a block where we also touch the inner text and outside link.');
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
             testDirectTouches();
             isSuccessfullyParsed();
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
     }
 </script>
index ff59fef..6ea6ad8 100644 (file)
 
     function runTests()
     {
-        if (window.layoutTestController && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
+        if (window.testRunner && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
             description('Test various ways to trigger input-widgets. On a touch interface, all the actions should be triggerable with either a touch down or a touch tap.');
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
             testDirectTouches();
             testDirectFatFingers();
             testIndirectFatFingers();
             isSuccessfullyParsed();
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
     }
 </script>
index 1c0ce7d..27c5bdf 100644 (file)
 
     function runTests()
     {
-        if (window.layoutTestController && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
+        if (window.testRunner && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
             description('Tests if labels are treated as clickable if the input they control is.');
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
             testDirectTouches();
             testIndirectTouches();
             isSuccessfullyParsed();
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
     }
 </script>
index 74fd4df..4534ad0 100644 (file)
     }
     function runTests()
     {
-        if (window.layoutTestController && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
+        if (window.testRunner && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
             description('Test touch-adjustment on links in an iframe. Making sure we iframe position is correctly adjusted for.');
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
             testDirectTouches();
             isSuccessfullyParsed();
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
     }
 </script>
index 8f6bdcd..4e577f8 100644 (file)
@@ -105,14 +105,14 @@ Box without a local click handler.
 
     function runTests()
     {
-        if (window.layoutTestController && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
+        if (window.testRunner && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
             description('Test the case where a clickable target is nested inside a document that is monitoring clicks. The target with the local event-handler should be chosen if multiple targets are touched.');
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
             testDirectTouches();
             testPreferedTouch();
             isSuccessfullyParsed();
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
     }
 </script>
index 5d30dd2..e1b99ff 100644 (file)
 
     function runTests()
     {
-        if (window.layoutTestController && window.internals && internals.touchNodeAdjustedToBestClickableNode && internals.setDelegatesScrolling) {
+        if (window.testRunner && window.internals && internals.touchNodeAdjustedToBestClickableNode && internals.setDelegatesScrolling) {
             description('Test iframe with main frame scroll offset case of tap-to-zoom mechanics.');
             window.scrollBy(0,500);
             internals.setDelegatesScrolling(true, document);
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
             testDirectTouches();
             isSuccessfullyParsed();
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
     }
 </script>
index 0a97378..3015696 100644 (file)
 
     function runTests()
     {
-        if (window.layoutTestController && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
+        if (window.testRunner && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
             description('Test touch adjustment when main frame is scroll offset.');
             window.scrollBy(0,400);
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
             testDirectTouches();
             testAdjustedTouches();
             isSuccessfullyParsed();
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
     }
 </script>
index e833e0a..494e16c 100644 (file)
@@ -90,15 +90,15 @@ hi there <a id="6" href="#6">some link that is breaking multiple lines just for
 
     function runTests()
     {
-        if (window.layoutTestController && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
+        if (window.testRunner && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
             description('Test touch-adjustment on inline links. Making sure we can hit over line-breaks, and can miss when tapping between parts of a line-broken link.');
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
             testDirectTouches();
             testDirectMisses();
             testIndirectTouches();
             isSuccessfullyParsed();
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
     }
 </script>
index 1c354ab..20c3155 100644 (file)
 
     function runTests()
     {
-        if (window.layoutTestController && window.internals && internals.bestZoomableAreaForTouchPoint) {
+        if (window.testRunner && window.internals && internals.bestZoomableAreaForTouchPoint) {
             description('Test basic cases of tap-to-zoom mechanics.');
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
             testDirectTouches();
             isSuccessfullyParsed();
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
     }
 </script>
index 65f0394..28f3ba0 100644 (file)
@@ -36,13 +36,13 @@ px; width: 200px; height: 20px; }
 
     function runTests()
     {
-        if (window.layoutTestController && window.internals && internals.bestZoomableAreaForTouchPoint) {
+        if (window.testRunner && window.internals && internals.bestZoomableAreaForTouchPoint) {
             description('Test that targetted area is picked even if the touch area is not fully contained.');
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
             testDirectTouches();
             isSuccessfullyParsed();
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
     }
 </script>
index 16003c3..0300654 100644 (file)
@@ -24,9 +24,9 @@
   </style>
   <script src="resources/transform-test-utils.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
 
     var gTests = [
@@ -70,8 +70,8 @@
     {
       testTransforms();
 
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
   </script>
 </head>
index 064ac28..f65fd62 100644 (file)
@@ -29,7 +29,7 @@ body {
 
 function runTest() {
 
-    if (!window.layoutTestController) {
+    if (!window.testRunner) {
 
         var id1 = "a";
         var id2 = "b";
index 3b08852..3ab525f 100644 (file)
@@ -33,9 +33,9 @@ function runTest() {
     checkPosition("a");
     checkPosition("b");
 
-    if (window.layoutTestController) {
-        window.layoutTestController.dumpAsText();
-        window.layoutTestController.notifyDone();
+    if (window.testRunner) {
+        window.testRunner.dumpAsText();
+        window.testRunner.notifyDone();
     }
 }
 </script>
@@ -46,8 +46,8 @@ function runTest() {
 <div class="box" id="b">B</div>
 
 <script>
-    if (window.layoutTestController)
-        window.layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        window.testRunner.waitUntilDone();
 
     setTimeout(move, 10);
     function move() {
index 6db5b46..af7ecbf 100644 (file)
@@ -24,9 +24,9 @@
   </style>
   <script src="resources/transform-test-utils.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
 
     var gTests = [
     {
       testTransforms();
 
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
   </script>
 </head>
index 4670c2b..98e1f94 100644 (file)
@@ -24,9 +24,9 @@
   </style>
   <script src="resources/transform-test-utils.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
 
     var gTests = [
@@ -39,8 +39,8 @@
     {
       testTransforms();
 
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
   </script>
 </head>
index 6039326..3875aac 100644 (file)
@@ -20,9 +20,9 @@
   </style>
   <script src="../../2d/resources/transform-test-utils.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
 
     var gTests = [
@@ -51,8 +51,8 @@
     {
       testTransforms();
 
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
   </script>
 </head>
index a122f0f..a9ce8b0 100644 (file)
@@ -29,7 +29,7 @@ body {
 
 function runTest() {
 
-    if (!window.layoutTestController) {
+    if (!window.testRunner) {
 
         var id1 = "a";
         var id2 = "b";
index 2420f4b..d163f4f 100644 (file)
@@ -31,7 +31,7 @@ body {
 <script type="text/javascript">
 
 function runTest() {
-    if (!window.layoutTestController) {
+    if (!window.testRunner) {
 
         var id1 = "a";
         var id2 = "b";
index fd5143b..7e98c64 100644 (file)
   }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText(true);
+      testRunner.waitUntilDone();
     }
     
     function doTest()
     {
       window.setTimeout(function() {
         document.getElementById('target').style.webkitTransformOriginZ = '100px';
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, 0);
     }
 
index 00639e4..c4b168c 100644 (file)
@@ -27,8 +27,8 @@
       }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText();
+    if (window.testRunner)
+      testRunner.dumpAsText();
     function runTest()
     {
       var hit = document.elementFromPoint(100, 100);
index 00db04a..636d028 100644 (file)
@@ -13,7 +13,7 @@
       // document.getElementById('overflow').scrollTop = 60;
       
       // In non-test mode, show the mouse coords for testing
-      if (!window.layoutTestController)
+      if (!window.testRunner)
         document.body.addEventListener('mousemove', mousemoved, false);
 
       dispatchEvent(120, 128, 'box4', 2, 2);
index 1d3cc1c..87db834 100644 (file)
@@ -7,7 +7,7 @@
     function test()
     {
       // In non-test mode, show the mouse coords for testing
-      if (!window.layoutTestController)
+      if (!window.testRunner)
         document.body.addEventListener('mousemove', mousemoved, false);
 
       dispatchEvent(158, 83, 'card', 2, 2);
index 1a39817..60b637c 100644 (file)
@@ -13,7 +13,7 @@
       // document.getElementById('overflow').scrollTop = 60;
       
       // In non-test mode, show the mouse coords for testing
-      if (!window.layoutTestController)
+      if (!window.testRunner)
         document.body.addEventListener('mousemove', mousemoved, false);
 
       dispatchEvent(45, 45, 'box1', 3, 3);
index f59d0e1..dccd1b4 100644 (file)
@@ -14,7 +14,7 @@
       // document.getElementById('overflow').scrollTop = 60;
       
       // In non-test mode, show the mouse coords for testing
-      if (!window.layoutTestController)
+      if (!window.testRunner)
         document.body.addEventListener('mousemove', mousemoved, false);
 
       dispatchEvent(48, 48, 'box1', 6, 6);
index c683518..088af44 100644 (file)
@@ -7,7 +7,7 @@
     function test()
     {
       // In non-test mode, show the mouse coords for testing
-      if (!window.layoutTestController)
+      if (!window.testRunner)
         document.body.addEventListener('mousemove', mousemoved, false);
 
       dispatchEvent(44, 44, 'box1', 2, 2);
index 57a506a..16b55ca 100644 (file)
@@ -32,8 +32,8 @@
          results.innerText = "Pass.";
        }
 
-       if (window.layoutTestController)
-         layoutTestController.dumpAsText();
+       if (window.testRunner)
+         testRunner.dumpAsText();
      }
 
   </script>