Changeset 140842 in webkit

Timestamp:

Jan 25, 2013 10:04:37 AM (11 years ago)

Author:

tonyg@chromium.org

Message:

Abort parsing when pending location change for threaded HTML parser
​https://bugs.webkit.org/show_bug.cgi?id=107876

Reviewed by Eric Seidel.

The main thread parser does this in canTakeNextToken. Adding this check to the threaded parser causes us to pass
fast/loader/location-change-aborts-parsing.html.

No new tests because covered by existing tests.

• html/parser/HTMLDocumentParser.cpp:

(WebCore::HTMLDocumentParser::processTokensFromBackgroundParser):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/HTMLDocumentParser.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-25  Tony Gentilcore  <tonyg@chromium.org>
+
+        Abort parsing when pending location change for threaded HTML parser
+        https://bugs.webkit.org/show_bug.cgi?id=107876
+
+        Reviewed by Eric Seidel.
+
+        The main thread parser does this in canTakeNextToken. Adding this check to the threaded parser causes us to pass
+        fast/loader/location-change-aborts-parsing.html.
+
+        No new tests because covered by existing tests.
+
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::processTokensFromBackgroundParser):
+
 2013-01-25  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp

@@ -304 +304 @@
             break;
 
-        // FIXME: We'll probably need to check document()->frame()->navigationScheduler()->locationChangePending())
-        // as we do in canTakeNextToken;
+        if (!isParsingFragment()
+            && document()->frame() && document()->frame()->navigationScheduler()->locationChangePending())
+            break;
 
         if (isWaitingForScripts()) {