Changeset 106684 in webkit

Timestamp:

Feb 3, 2012 12:46:37 PM (12 years ago)

Author:

dgrogan@chromium.org

Message:

Make js-test-pre.js more worker friendly
​https://bugs.webkit.org/show_bug.cgi?id=77487

Replace uses of 'window' with 'self'.

Reviewed by Ojan Vafai.

• fast/js/resources/js-test-pre.js:
• storage/indexeddb/resources/basics.js:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/js/resources/js-test-pre.js (modified) (3 diffs)
• storage/indexeddb/resources/basics.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-03  David Grogan  <dgrogan@chromium.org>
+
+        Make js-test-pre.js more worker friendly
+        https://bugs.webkit.org/show_bug.cgi?id=77487
+
+        Replace uses of 'window' with 'self'.
+
+        Reviewed by Ojan Vafai.
+
+        * fast/js/resources/js-test-pre.js:
+        * storage/indexeddb/resources/basics.js:
+
 2012-02-03  Jochen Eisinger  <jochen@chromium.org>
 

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

@@ -1 +1 @@
 // svg/dynamic-updates tests set enablePixelTesting=true, as we want to dump text + pixel results
-if (window.layoutTestController)
-    layoutTestController.dumpAsText(window.enablePixelTesting);
+if (self.layoutTestController)
+    layoutTestController.dumpAsText(self.enablePixelTesting);
 
 var description, debug, successfullyParsed, errorMessage;
@@ -78 +78 @@
         insertStyleSheet();
 
-    window.onerror = function(message)
+    self.onerror = function(message)
     {
         errorMessage = message;
@@ -419 +419 @@
 {
     wasFinishJSTestCalled = true;
-    if (!window.wasPostTestScriptParsed)
+    if (!self.wasPostTestScriptParsed)
         return;
     isSuccessfullyParsed();
-    if (window.jsTestIsAsync && window.layoutTestController)
+    if (self.jsTestIsAsync && self.layoutTestController)
         layoutTestController.notifyDone();
 }

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

@@ -1 +1 @@
 if (this.importScripts) {
-    // FIXME: Change js-test-pre.js to use self in place of window where
-    // possible, so we can remove the next line.  http://webkit.org/b/76762
-    window = self;
     importScripts('../../../fast/js/resources/js-test-pre.js');
     importScripts('idb-worker-common.js');