Changeset 160875 in webkit

Timestamp:

Dec 19, 2013, 4:39:14 PM (11 years ago)

Author:

ap@apple.com

Message:

Layout Test plugins/destroy-during-npp-new.html is flaky
​https://bugs.webkit.org/show_bug.cgi?id=126027

• plugins/destroy-during-npp-new.html: Streamlined the test a little bit to see

what changes, if anything. There should be no effect on what is tested.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• plugins/destroy-during-npp-new.html (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-12-19  Alexey Proskuryakov  <ap@apple.com>
+
+        Layout Test plugins/destroy-during-npp-new.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=126027
+
+        * plugins/destroy-during-npp-new.html: Streamlined the test a little bit to see
+        what changes, if anything. There should be no effect on what is tested.
+
 2013-12-19  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/LayoutTests/plugins/destroy-during-npp-new.html

@@ -9 +9 @@
 
     var newWindow = window.open("data:text/html,Hello world!")
+    if (!newWindow)
+        alert("Please disable pop-up blocker");
 
-    function tryCloseWindow(w) {
-        if (!w)
+    function finishWhenClosed() {
+        if (newWindow.closed) {
+            if (window.testRunner)
+                testRunner.notifyDone();
             return;
-
-        w.close();
-
-        function doneIfClosed() {
-            if (w.closed) {
-                if (window.testRunner)
-                    testRunner.notifyDone();
-                return;
-            }
-            setTimeout(doneIfClosed, 1);
-        };
-        doneIfClosed();
-    }
+        }
+        setTimeout(finishWhenClosed, 1);
+    };
 
     window.onload = function() {
-        tryCloseWindow(newWindow);
+        newWindow.close();
 
         var testPlugin = document.getElementById('testPlugin');
         if (!testPlugin || !testPlugin.parentNode)
             document.documentElement.appendChild(document.createTextNode("SUCCESS"));
+
+        finishWhenClosed();
     }
     </script>