Handle parser-blocking script cancellations while nested.

Gracefully handle cancellation of a parser-blocking script load that was initiated while already executing scripts. That is, quietly stop waiting for it to load without notifying the host. R=marja@chromium.org,kouhei@chromium.org,haraken@chromium.org BUG=398090 Review URL: https://codereview.chromium.org/710933003 git-svn-id: svn://svn.chromium.org/blink/trunk@185122 bbb929c8-8fbe-4397-9dbb-9b2b20218538

Handle parser-blocking script cancellations while nested.
Gracefully handle cancellation of a parser-blocking script load that was initiated while already executing scripts. That is, quietly stop waiting for it to load without notifying the host. R=marja@chromium.org,kouhei@chromium.org,haraken@chromium.org BUG=398090 Review URL: https://codereview.chromium.org/710933003 git-svn-id: svn://svn.chromium.org/blink/trunk@185122 bbb929c8-8fbe-4397-9dbb-9b2b20218538
66dbeb14 · sigbjornf@opera.com · bc379acc · 66dbeb14 · 66dbeb14 · 66dbeb14
Commit 66dbeb14 authored Nov 11, 2014 by sigbjornf@opera.com
5 changed files
--- a/third_party/WebKit/LayoutTests/fast/parser/document-write-then-close-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/parser/document-write-then-close-expected.txt
+Cancelling a document.write()-inserted and blocking script shouldn't fail.
+
+PASS if no crash.
--- a/third_party/WebKit/LayoutTests/fast/parser/document-write-then-close.html
+++ b/third_party/WebKit/LayoutTests/fast/parser/document-write-then-close.html
+<!DOCTYPE html>
+<p>Cancelling a document.write()-inserted and blocking script shouldn't fail.</p>
+<p>PASS if no crash.</p>
+<script>
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.setCanOpenWindows();
+    testRunner.waitUntilDone();
+}
+window.open("resources/document-write-then-close.html");
+</script>
--- a/third_party/WebKit/LayoutTests/fast/parser/resources/document-write-then-close.html
+++ b/third_party/WebKit/LayoutTests/fast/parser/resources/document-write-then-close.html
+<!DOCTYPE html>
+<script>
+document.write("<script src='" + "irrelevant.js" + "'></scr" + "ipt>");
+window.close();
+if (window.testRunner)
+    testRunner.notifyDone();
+</script>
--- a/third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.cpp
+++ b/third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.cpp
@@ -165,8 +165,34 @@ void HTMLScriptRunner::executePendingScriptAndDispatchEvent(PendingScript& pendi
    ASSERT(!isExecutingScript());
 }

+void HTMLScriptRunner::stopWatchingResourceForLoad(Resource* resource)
+{
+    if (m_parserBlockingScript.resource() == resource) {
+        m_parserBlockingScript.stopWatchingForLoad(this);
+        m_parserBlockingScript.releaseElementAndClear();
+        return;
+    }
+    for (PendingScript& script : m_scriptsToExecuteAfterParsing) {
+        if (script.resource() == resource) {
+            script.stopWatchingForLoad(this);
+            script.releaseElementAndClear();
+            return;
+        }
+    }
+}
+
 void HTMLScriptRunner::notifyFinished(Resource* cachedResource)
 {
+    // Handle cancellations of parser-blocking script loads without
+    // notifying the host (i.e., parser) if these were initiated by nested
+    // document.write()s. The cancellation may have been triggered by
+    // script execution to signal an abrupt stop (e.g., window.close().)
+    //
+    // The parser is unprepared to be told, and doesn't need to be.
+    if (isExecutingScript() && cachedResource->wasCanceled()) {
+        stopWatchingResourceForLoad(cachedResource);
+        return;
+    }
    m_host->notifyScriptLoaded(cachedResource);
 }


--- a/third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.h
+++ b/third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.h
@@ -82,6 +82,8 @@ private:

    bool isPendingScriptReady(const PendingScript&);

+    void stopWatchingResourceForLoad(Resource*);
+
    RawPtrWillBeMember<Document> m_document;
    RawPtrWillBeMember<HTMLScriptRunnerHost> m_host;
    PendingScript m_parserBlockingScript;