Changeset 106898 in webkit

Timestamp:

Feb 6, 2012 8:05:21 PM (12 years ago)

Author:

dgrogan@chromium.org

Message:

js-test-pre.js: relay calls to testPassed, testFailed, debug, etc from
worker to document.
​https://bugs.webkit.org/show_bug.cgi?id=76762

Reviewed by Ojan Vafai.

• fast/filesystem/resources/async-operations.js:
• fast/filesystem/resources/directory-entry-to-uri.js:
• fast/filesystem/resources/file-entry-to-uri-sync.js:
• fast/filesystem/resources/file-entry-to-uri.js:
• fast/filesystem/resources/file-from-file-entry-sync.js:
• fast/filesystem/resources/file-from-file-entry.js:
• fast/filesystem/resources/file-writer-abort-continue.js:
• fast/filesystem/resources/file-writer-abort-depth.js:
• fast/filesystem/resources/file-writer-abort.js:
• fast/filesystem/resources/file-writer-events.js:
• fast/filesystem/resources/file-writer-gc-blob.js:
• fast/filesystem/resources/file-writer-sync-truncate-extend.js:
• fast/filesystem/resources/file-writer-sync-write-overlapped.js:
• fast/filesystem/resources/file-writer-truncate-extend.js:
• fast/filesystem/resources/file-writer-write-overlapped.js:
• fast/filesystem/resources/fs-worker-common.js:
• fast/filesystem/resources/fs-worker-test-util.js: Removed.
• fast/filesystem/resources/simple-persistent-sync.js:
• fast/filesystem/resources/simple-persistent.js:
• fast/filesystem/resources/simple-readonly.js:
• fast/filesystem/resources/simple-required-arguments-getdirectory.js:
• fast/filesystem/resources/simple-required-arguments-getfile.js:
• fast/filesystem/resources/simple-required-arguments-getmetadata.js:
• fast/filesystem/resources/simple-required-arguments-remove.js:
• fast/filesystem/resources/simple-temporary-sync.js:
• fast/filesystem/resources/simple-temporary.js:
• fast/filesystem/resources/sync-operations.js:
• fast/filesystem/workers/async-operations.html:
• fast/filesystem/workers/file-entry-to-uri-sync.html:
• fast/filesystem/workers/file-from-file-entry-sync.html:
• fast/filesystem/workers/file-from-file-entry.html:
• fast/filesystem/workers/file-writer-events.html:
• fast/filesystem/workers/file-writer-gc-blob.html:
• fast/filesystem/workers/file-writer-sync-truncate-extend.html:
• fast/filesystem/workers/file-writer-sync-write-overlapped.html:
• fast/filesystem/workers/file-writer-truncate-extend.html:
• fast/filesystem/workers/file-writer-write-overlapped.html:
• fast/filesystem/workers/simple-persistent-sync.html:
• fast/filesystem/workers/simple-persistent.html:
• fast/filesystem/workers/simple-temporary-sync.html:
• fast/filesystem/workers/simple-temporary.html:
• fast/filesystem/workers/sync-operations.html:
• fast/js/resources/js-test-pre.js:

(testPassed):
(testFailed):
(finishJSTest):
(startWorker.worker.onmessage):
(startWorker.worker.onerror):
(startWorker):

• storage/indexeddb/basics-workers.html:
• storage/indexeddb/resources/basics.js:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/filesystem/resources/async-operations.js (modified) (1 diff)
• fast/filesystem/resources/directory-entry-to-uri.js (modified) (1 diff)
• fast/filesystem/resources/file-entry-to-uri-sync.js (modified) (1 diff)
• fast/filesystem/resources/file-entry-to-uri.js (modified) (1 diff)
• fast/filesystem/resources/file-from-file-entry-sync.js (modified) (1 diff)
• fast/filesystem/resources/file-from-file-entry.js (modified) (1 diff)
• fast/filesystem/resources/file-writer-abort-continue.js (modified) (1 diff)
• fast/filesystem/resources/file-writer-abort-depth.js (modified) (1 diff)
• fast/filesystem/resources/file-writer-abort.js (modified) (1 diff)
• fast/filesystem/resources/file-writer-events.js (modified) (1 diff)
• fast/filesystem/resources/file-writer-gc-blob.js (modified) (1 diff)
• fast/filesystem/resources/file-writer-sync-truncate-extend.js (modified) (1 diff)
• fast/filesystem/resources/file-writer-sync-write-overlapped.js (modified) (1 diff)
• fast/filesystem/resources/file-writer-truncate-extend.js (modified) (1 diff)
• fast/filesystem/resources/file-writer-write-overlapped.js (modified) (1 diff)
• fast/filesystem/resources/fs-worker-common.js (modified) (1 diff)
• fast/filesystem/resources/fs-worker-test-util.js (deleted)
• fast/filesystem/resources/simple-persistent-sync.js (modified) (1 diff)
• fast/filesystem/resources/simple-persistent.js (modified) (1 diff)
• fast/filesystem/resources/simple-readonly.js (modified) (1 diff)
• fast/filesystem/resources/simple-required-arguments-getdirectory.js (modified) (1 diff)
• fast/filesystem/resources/simple-required-arguments-getfile.js (modified) (1 diff)
• fast/filesystem/resources/simple-required-arguments-getmetadata.js (modified) (1 diff)
• fast/filesystem/resources/simple-required-arguments-remove.js (modified) (1 diff)
• fast/filesystem/resources/simple-temporary-sync.js (modified) (1 diff)
• fast/filesystem/resources/simple-temporary.js (modified) (1 diff)
• fast/filesystem/resources/sync-operations.js (modified) (1 diff)
• fast/filesystem/workers/async-operations.html (modified) (1 diff)
• fast/filesystem/workers/file-entry-to-uri-sync.html (modified) (1 diff)
• fast/filesystem/workers/file-from-file-entry-sync.html (modified) (1 diff)
• fast/filesystem/workers/file-from-file-entry.html (modified) (1 diff)
• fast/filesystem/workers/file-writer-events.html (modified) (1 diff)
• fast/filesystem/workers/file-writer-gc-blob.html (modified) (1 diff)
• fast/filesystem/workers/file-writer-sync-truncate-extend.html (modified) (1 diff)
• fast/filesystem/workers/file-writer-sync-write-overlapped.html (modified) (1 diff)
• fast/filesystem/workers/file-writer-truncate-extend.html (modified) (1 diff)
• fast/filesystem/workers/file-writer-write-overlapped.html (modified) (1 diff)
• fast/filesystem/workers/simple-persistent-sync.html (modified) (1 diff)
• fast/filesystem/workers/simple-persistent.html (modified) (1 diff)
• fast/filesystem/workers/simple-temporary-sync.html (modified) (1 diff)
• fast/filesystem/workers/simple-temporary.html (modified) (1 diff)
• fast/filesystem/workers/sync-operations.html (modified) (1 diff)
• fast/js/resources/js-test-pre.js (modified) (3 diffs)
• storage/indexeddb/basics-workers.html (modified) (1 diff)
• storage/indexeddb/index-basics-workers.html (modified) (1 diff)
• storage/indexeddb/objectstore-basics-workers.html (modified) (1 diff)
• storage/indexeddb/resources/basics.js (modified) (1 diff)
• storage/indexeddb/resources/idb-worker-common.js (deleted)
• storage/indexeddb/resources/index-basics.js (modified) (1 diff)
• storage/indexeddb/resources/objectstore-basics.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-06  David Grogan  <dgrogan@chromium.org>
+
+        js-test-pre.js: relay calls to testPassed, testFailed, debug, etc from
+        worker to document.
+        https://bugs.webkit.org/show_bug.cgi?id=76762
+
+        Reviewed by Ojan Vafai.
+
+        * fast/filesystem/resources/async-operations.js:
+        * fast/filesystem/resources/directory-entry-to-uri.js:
+        * fast/filesystem/resources/file-entry-to-uri-sync.js:
+        * fast/filesystem/resources/file-entry-to-uri.js:
+        * fast/filesystem/resources/file-from-file-entry-sync.js:
+        * fast/filesystem/resources/file-from-file-entry.js:
+        * fast/filesystem/resources/file-writer-abort-continue.js:
+        * fast/filesystem/resources/file-writer-abort-depth.js:
+        * fast/filesystem/resources/file-writer-abort.js:
+        * fast/filesystem/resources/file-writer-events.js:
+        * fast/filesystem/resources/file-writer-gc-blob.js:
+        * fast/filesystem/resources/file-writer-sync-truncate-extend.js:
+        * fast/filesystem/resources/file-writer-sync-write-overlapped.js:
+        * fast/filesystem/resources/file-writer-truncate-extend.js:
+        * fast/filesystem/resources/file-writer-write-overlapped.js:
+        * fast/filesystem/resources/fs-worker-common.js:
+        * fast/filesystem/resources/fs-worker-test-util.js: Removed.
+        * fast/filesystem/resources/simple-persistent-sync.js:
+        * fast/filesystem/resources/simple-persistent.js:
+        * fast/filesystem/resources/simple-readonly.js:
+        * fast/filesystem/resources/simple-required-arguments-getdirectory.js:
+        * fast/filesystem/resources/simple-required-arguments-getfile.js:
+        * fast/filesystem/resources/simple-required-arguments-getmetadata.js:
+        * fast/filesystem/resources/simple-required-arguments-remove.js:
+        * fast/filesystem/resources/simple-temporary-sync.js:
+        * fast/filesystem/resources/simple-temporary.js:
+        * fast/filesystem/resources/sync-operations.js:
+        * fast/filesystem/workers/async-operations.html:
+        * fast/filesystem/workers/file-entry-to-uri-sync.html:
+        * fast/filesystem/workers/file-from-file-entry-sync.html:
+        * fast/filesystem/workers/file-from-file-entry.html:
+        * fast/filesystem/workers/file-writer-events.html:
+        * fast/filesystem/workers/file-writer-gc-blob.html:
+        * fast/filesystem/workers/file-writer-sync-truncate-extend.html:
+        * fast/filesystem/workers/file-writer-sync-write-overlapped.html:
+        * fast/filesystem/workers/file-writer-truncate-extend.html:
+        * fast/filesystem/workers/file-writer-write-overlapped.html:
+        * fast/filesystem/workers/simple-persistent-sync.html:
+        * fast/filesystem/workers/simple-persistent.html:
+        * fast/filesystem/workers/simple-temporary-sync.html:
+        * fast/filesystem/workers/simple-temporary.html:
+        * fast/filesystem/workers/sync-operations.html:
+        * fast/js/resources/js-test-pre.js:
+        (testPassed):
+        (testFailed):
+        (finishJSTest):
+        (startWorker.worker.onmessage):
+        (startWorker.worker.onerror):
+        (startWorker):
+        * storage/indexeddb/basics-workers.html:
+        * storage/indexeddb/resources/basics.js:
+
 2012-02-06  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/LayoutTests/fast/filesystem/resources/async-operations.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../resources/fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('../resources/fs-test-util.js');
 }

trunk/LayoutTests/fast/filesystem/resources/directory-entry-to-uri.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('fs-test-util.js');
 }

trunk/LayoutTests/fast/filesystem/resources/file-entry-to-uri-sync.js

@@ -1 +1 @@
 importScripts('fs-worker-common.js');
+importScripts('../../js/resources/js-test-pre.js');
 
 description("Obtaining URL from FileEntry.");

trunk/LayoutTests/fast/filesystem/resources/file-entry-to-uri.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('fs-test-util.js');
 }

trunk/LayoutTests/fast/filesystem/resources/file-from-file-entry-sync.js

@@ -1 +1 @@
 // FIXME: move this under workers/resources
 importScripts('fs-worker-common.js');
+importScripts('../../js/resources/js-test-pre.js');
 
 description("Obtaining File from FileEntrySync.");

trunk/LayoutTests/fast/filesystem/resources/file-from-file-entry.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('fs-test-util.js');
 }

trunk/LayoutTests/fast/filesystem/resources/file-writer-abort-continue.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('file-writer-utils.js');
 }

trunk/LayoutTests/fast/filesystem/resources/file-writer-abort-depth.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('file-writer-utils.js');
 }

trunk/LayoutTests/fast/filesystem/resources/file-writer-abort.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('file-writer-utils.js');
 }

trunk/LayoutTests/fast/filesystem/resources/file-writer-events.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('file-writer-utils.js');
 }

trunk/LayoutTests/fast/filesystem/resources/file-writer-gc-blob.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('file-writer-utils.js');
     function gc() {

trunk/LayoutTests/fast/filesystem/resources/file-writer-sync-truncate-extend.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../resources/fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('../resources/fs-test-util.js');
     importScripts('../resources/file-writer-utils.js');

trunk/LayoutTests/fast/filesystem/resources/file-writer-sync-write-overlapped.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../resources/fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('../resources/fs-test-util.js');
     importScripts('../resources/file-writer-utils.js');

trunk/LayoutTests/fast/filesystem/resources/file-writer-truncate-extend.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('file-writer-utils.js');
 }

trunk/LayoutTests/fast/filesystem/resources/file-writer-write-overlapped.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('file-writer-utils.js');
 }

trunk/LayoutTests/fast/filesystem/resources/fs-worker-common.js

@@ -1 @@
-function debug(message)
-{
-    postMessage("MESG:" + message);
-}
-
-function finishJSTest()
-{
-    postMessage("DONE:");
-}
-
-function description(message)
-{
-    postMessage('DESC:' + message);
-}
-
-function testPassed(msg) {
-    postMessage("PASS:" + msg);
-}
-
-function testFailed(msg) {
-    postMessage("FAIL:" + msg);
-}
-
-function shouldBe(_a, _b)
-{
-  if (typeof _a != "string" || typeof _b != "string")
-    debug("WARN: shouldBe() expects string arguments");
-  var _av = eval(_a);
-  var _bv = eval(_b);
-  if (_av === _bv)
-    testPassed(_a + " is " + _b);
-  else
-    testFailed(_a + " should be " + _bv + " (of type " + typeof _bv + "). Was " + _av + " (of type " + typeof _av + ").");
-}
-
-function shouldBeTrue(_a) { shouldBe(_a, "true"); }
-
 function removeAllInDirectorySync(directory) {
     if (!directory)

trunk/LayoutTests/fast/filesystem/resources/simple-persistent-sync.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../resources/fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('../resources/fs-test-util.js');
 }

trunk/LayoutTests/fast/filesystem/resources/simple-persistent.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../resources/fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('../resources/fs-test-util.js');
 }

trunk/LayoutTests/fast/filesystem/resources/simple-readonly.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../resources/fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('../resources/fs-test-util.js');
 }

trunk/LayoutTests/fast/filesystem/resources/simple-required-arguments-getdirectory.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../resources/fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('../resources/fs-test-util.js');
 }

trunk/LayoutTests/fast/filesystem/resources/simple-required-arguments-getfile.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../resources/fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('../resources/fs-test-util.js');
 }

trunk/LayoutTests/fast/filesystem/resources/simple-required-arguments-getmetadata.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../resources/fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('../resources/fs-test-util.js');
 }

trunk/LayoutTests/fast/filesystem/resources/simple-required-arguments-remove.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../resources/fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('../resources/fs-test-util.js');
 }

trunk/LayoutTests/fast/filesystem/resources/simple-temporary-sync.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../resources/fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('../resources/fs-test-util.js');
 }

trunk/LayoutTests/fast/filesystem/resources/simple-temporary.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../resources/fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('../resources/fs-test-util.js');
 }

trunk/LayoutTests/fast/filesystem/resources/sync-operations.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../resources/fs-worker-common.js');
+    importScripts('../../js/resources/js-test-pre.js');
     importScripts('../resources/fs-test-util.js');
 }

trunk/LayoutTests/fast/filesystem/workers/async-operations.html

@@ -2 +2 @@
 <head>
 <script src="../../js/resources/js-test-pre.js"></script>
-<script src="../resources/fs-worker-test-util.js"></script>
 </head>
 <body>

trunk/LayoutTests/fast/filesystem/workers/file-entry-to-uri-sync.html

@@ -2 +2 @@
 <head>
 <script src="../../js/resources/js-test-pre.js"></script>
-<script src="../resources/fs-worker-test-util.js"></script>
 </head>
 <body>

trunk/LayoutTests/fast/filesystem/workers/file-from-file-entry-sync.html

@@ -2 +2 @@
 <head>
 <script src="../../js/resources/js-test-pre.js"></script>
-<script src="../resources/fs-worker-test-util.js"></script>
 </head>
 <body>

trunk/LayoutTests/fast/filesystem/workers/file-from-file-entry.html

@@ -2 +2 @@
 <head>
 <script src="../../js/resources/js-test-pre.js"></script>
-<script src="../resources/fs-worker-test-util.js"></script>
 </head>
 <body>

trunk/LayoutTests/fast/filesystem/workers/file-writer-events.html

@@ -4 +4 @@
     <title>File Writer Events Worker</title>
     <script src="../../js/resources/js-test-pre.js"></script>
-    <script src="../resources/fs-worker-test-util.js"></script>
  </head>
  <body>

trunk/LayoutTests/fast/filesystem/workers/file-writer-gc-blob.html

@@ -4 +4 @@
     <title>File Writer GC Blob Worker</title>
     <script src="../../js/resources/js-test-pre.js"></script>
-    <script src="../resources/fs-worker-test-util.js"></script>
  </head>
  <body>

trunk/LayoutTests/fast/filesystem/workers/file-writer-sync-truncate-extend.html

@@ -4 +4 @@
     <title>File Writer Sync Truncate-To-Extend</title>
     <script src="../../js/resources/js-test-pre.js"></script>
-    <script src="../resources/fs-worker-test-util.js"></script>
  </head>
  <body>

trunk/LayoutTests/fast/filesystem/workers/file-writer-sync-write-overlapped.html

@@ -4 +4 @@
     <title>File Writer Sync Truncate-To-Extend</title>
     <script src="../../js/resources/js-test-pre.js"></script>
-    <script src="../resources/fs-worker-test-util.js"></script>
  </head>
  <body>

trunk/LayoutTests/fast/filesystem/workers/file-writer-truncate-extend.html

@@ -4 +4 @@
     <title>File Writer Truncate-To-Extend Worker</title>
     <script src="../../js/resources/js-test-pre.js"></script>
-    <script src="../resources/fs-worker-test-util.js"></script>
  </head>
  <body>

trunk/LayoutTests/fast/filesystem/workers/file-writer-write-overlapped.html

@@ -4 +4 @@
     <title>File Writer Write Overlapped Worker</title>
     <script src="../../js/resources/js-test-pre.js"></script>
-    <script src="../resources/fs-worker-test-util.js"></script>
  </head>
  <body>

trunk/LayoutTests/fast/filesystem/workers/simple-persistent-sync.html

@@ -2 +2 @@
 <head>
 <script src="../../js/resources/js-test-pre.js"></script>
-<script src="../resources/fs-worker-test-util.js"></script>
 </head>
 <body>

trunk/LayoutTests/fast/filesystem/workers/simple-persistent.html

@@ -2 +2 @@
 <head>
 <script src="../../js/resources/js-test-pre.js"></script>
-<script src="../resources/fs-worker-test-util.js"></script>
 </head>
 <body>

trunk/LayoutTests/fast/filesystem/workers/simple-temporary-sync.html

@@ -2 +2 @@
 <head>
 <script src="../../js/resources/js-test-pre.js"></script>
-<script src="../resources/fs-worker-test-util.js"></script>
 </head>
 <body>

trunk/LayoutTests/fast/filesystem/workers/simple-temporary.html

@@ -2 +2 @@
 <head>
 <script src="../../js/resources/js-test-pre.js"></script>
-<script src="../resources/fs-worker-test-util.js"></script>
 </head>
 <body>

trunk/LayoutTests/fast/filesystem/workers/sync-operations.html

@@ -2 +2 @@
 <head>
 <script src="../../js/resources/js-test-pre.js"></script>
-<script src="../resources/fs-worker-test-util.js"></script>
 </head>
 <body>

trunk/LayoutTests/fast/js/resources/js-test-pre.js

@@ -48 +48 @@
         span.innerHTML = msg + '<br />';
     };
-
-    function isWorker()
-    {
-        return typeof document === 'undefined';
-    }
 
     var css =
@@ -84 +79 @@
 
 })();
+
+function isWorker()
+{
+    // It's conceivable that someone would stub out 'document' in a worker so
+    // also check for childNodes, an arbitrary DOM-related object that is
+    // meaningless in a WorkerContext.
+    return (typeof document === 'undefined' || typeof document.childNodes === 'undefined') && !!self.importScripts;
+}
 
 function descriptionQuiet(msg) { description(msg, true); }
@@ -425 +428 @@
         layoutTestController.notifyDone();
 }
+
+function startWorker(testScriptURL)
+{
+    self.jsTestIsAsync = true;
+    debug('Starting worker: ' + testScriptURL);
+    var worker = new Worker(testScriptURL);
+    worker.onmessage = function(event)
+    {
+        var workerPrefix = "[Worker] ";
+        if (event.data.length < 5 || event.data.charAt(4) != ':') {
+          debug(workerPrefix + event.data);
+          return;
+        }
+        var code = event.data.substring(0, 4);
+        var payload = workerPrefix + event.data.substring(5);
+        if (code == "PASS")
+            testPassed(payload);
+        else if (code == "FAIL")
+            testFailed(payload);
+        else if (code == "DESC")
+            description(payload);
+        else if (code == "DONE")
+            finishJSTest();
+        else
+            debug(workerPrefix + event.data);
+    };
+
+    worker.onerror = function(event)
+    {
+        debug('Got error from worker: ' + event.message);
+        finishJSTest();
+    }
+}
+
+if (isWorker()) {
+    description = function(msg, quiet) {
+        postMessage('DESC:' + msg);
+    }
+    testFailed = function(msg) {
+        postMessage('FAIL:' + msg);
+    }
+    testPassed = function(msg) {
+        postMessage('PASS:' + msg);
+    }
+    finishJSTest = function() {
+        postMessage('DONE:');
+    }
+    debug = function(msg) {
+        postMessage(msg);
+    }
+}

trunk/LayoutTests/storage/indexeddb/basics-workers.html

@@ -3 +3 @@
 <script src="../../fast/js/resources/js-test-pre.js"></script>
 <script src="resources/shared.js"></script>
-<script src="../../fast/filesystem/resources/fs-worker-test-util.js"></script>
 </head>
 <body>

trunk/LayoutTests/storage/indexeddb/index-basics-workers.html

@@ -3 +3 @@
 <script src="../../fast/js/resources/js-test-pre.js"></script>
 <script src="resources/shared.js"></script>
-<script src="../../fast/filesystem/resources/fs-worker-test-util.js"></script>
 </head>
 <body>

trunk/LayoutTests/storage/indexeddb/objectstore-basics-workers.html

@@ -3 +3 @@
 <script src="../../fast/js/resources/js-test-pre.js"></script>
 <script src="resources/shared.js"></script>
-<script src="../../fast/filesystem/resources/fs-worker-test-util.js"></script>
 </head>
 <body>

trunk/LayoutTests/storage/indexeddb/resources/basics.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../../../fast/js/resources/js-test-pre.js');
-    importScripts('idb-worker-common.js');
     importScripts('shared.js');
 }

trunk/LayoutTests/storage/indexeddb/resources/index-basics.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../../../fast/js/resources/js-test-pre.js');
-    importScripts('idb-worker-common.js');
     importScripts('shared.js');
 }

trunk/LayoutTests/storage/indexeddb/resources/objectstore-basics.js

@@ -1 +1 @@
 if (this.importScripts) {
     importScripts('../../../fast/js/resources/js-test-pre.js');
-    importScripts('idb-worker-common.js');
     importScripts('shared.js');
 }