Reviewed by Darin.
authorap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 5 Nov 2007 14:30:59 +0000 (14:30 +0000)
committerap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 5 Nov 2007 14:30:59 +0000 (14:30 +0000)
        http://bugs.webkit.org/show_bug.cgi?id=15841
        fast/dom/Document/early-document-access.html crashes under GuardMalloc

        * fast/dom/Document/early-document-access.html: Don't check for open() timeout;
        wait for popup window to close as long as it takes.

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

LayoutTests/ChangeLog
LayoutTests/fast/dom/Document/early-document-access.html

index b48d2216d1c926837b5a164f73586a779f45eb7c..408a26a788742a0cf7180bd33e8ad6a7579fc44d 100644 (file)
@@ -1,3 +1,13 @@
+2007-11-05  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15841
+        fast/dom/Document/early-document-access.html crashes under GuardMalloc
+
+        * fast/dom/Document/early-document-access.html: Don't check for open() timeout;
+        wait for popup window to close as long as it takes.
+
 2007-11-03  Darin Adler  <darin@apple.com>
 
         Reviewed by Maciej.
index 781a9b9f248200e07bac333b9b7d394ed1915214..5e6f771ca12bda68ce6dcdf279f99668cbdc4858 100644 (file)
         newWindow = window.open('resources/early-document-access-popup.html');
         if (newWindow) {
             newWindow.document; // access the document
-            setTimeout(fail, 5000); // fail if we take longer than 5 seconds
         } else {
             document.body.innerText = 'FAIL: window.open failed to make a window.';
-            layoutTestController.notifyDone();
+            if (window.layoutTestController)
+                layoutTestController.notifyDone();
         }
     }
 
     function done() {
-        newWindow.close();
         if (window.layoutTestController)
-            setTimeout("layoutTestController.notifyDone()", 100);
+            if (layoutTestController.windowCount() == 1)
+                layoutTestController.notifyDone();
+            else
+                setTimeout("done()", 100);
     }
 
     function pass() {
         document.body.innerText = 'PASS';
+        newWindow.close();
         done();
     }
 
     function fail() {
         document.body.innerText = 'FAIL';
+        newWindow.close();
         done();
     }
     </script>