Merge WebKit at r66666 : Initial merge by git.

Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f

2 files changed, 16 insertions, 7 deletions

diff --git a/LayoutTests/fast/js/resources/js-test-post.js b/LayoutTests/fast/js/resources/js-test-post.js
index 88882c5..11a9e5f 100644
--- a/LayoutTests/fast/js/resources/js-test-post.js
+++ b/LayoutTests/fast/js/resources/js-test-post.js
@@ -1,13 +1,9 @@
-function finishJSTest()
-{
-    shouldBeTrue("successfullyParsed");
-    debug('<br /><span class="pass">TEST COMPLETE</span>');
-    if (window.jsTestIsAsync && window.layoutTestController)
-        layoutTestController.notifyDone();
-}
+wasPostTestScriptParsed = true;
 
 if (window.jsTestIsAsync) {
     if (window.layoutTestController)
         layoutTestController.waitUntilDone();
+    if (window.wasFinishJSTestCalled)
+        finishJSTest();
 } else
     finishJSTest();
diff --git a/LayoutTests/fast/js/resources/js-test-pre.js b/LayoutTests/fast/js/resources/js-test-pre.js
index aaab749..87db5d4 100644
--- a/LayoutTests/fast/js/resources/js-test-pre.js
+++ b/LayoutTests/fast/js/resources/js-test-pre.js
@@ -280,3 +280,16 @@ function gc() {
             gcRec(10)
     }
 }
+
+// It's possible for an async test to call finishJSTest() before js-test-post.js
+// has been parsed.
+function finishJSTest()
+{
+    wasFinishJSTestCalled = true;
+    if (!window.wasPostTestScriptParsed)
+        return;
+    shouldBeTrue("successfullyParsed");
+    debug('<br /><span class="pass">TEST COMPLETE</span>');
+    if (window.jsTestIsAsync && window.layoutTestController)
+        layoutTestController.notifyDone();
+}