Changeset 140209 in webkit

Timestamp:

Jan 18, 2013 2:34:28 PM (11 years ago)

Author:

tonyg@chromium.org

Message:

Run defer scripts in the threaded HTML parser
​https://bugs.webkit.org/show_bug.cgi?id=107320

Reviewed by Eric Seidel.

No new tests because covered by http/tests/misc/script-defer.html.

• html/parser/HTMLDocumentParser.cpp:

(WebCore::HTMLDocumentParser::prepareToStopParsing):
(WebCore::HTMLDocumentParser::didReceiveTokensFromBackgroundParser):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-18  Tony Gentilcore  <tonyg@chromium.org>
+
+        Run defer scripts in the threaded HTML parser
+        https://bugs.webkit.org/show_bug.cgi?id=107320
+
+        Reviewed by Eric Seidel.
+
+        No new tests because covered by http/tests/misc/script-defer.html.
+
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::prepareToStopParsing):
+        (WebCore::HTMLDocumentParser::didReceiveTokensFromBackgroundParser):
+
 2013-01-18  Robert Hogan  <robert@webkit.org>
 

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

@@ -149 +149 @@
     // NOTE: This pump should only ever emit buffered character tokens,
     // so ForceSynchronous vs. AllowYield should be meaningless.
-    pumpTokenizerIfPossible(ForceSynchronous);
+    if (!shouldUseThreading())
+        pumpTokenizerIfPossible(ForceSynchronous);
     
     if (isStopped())
@@ -299 +300 @@
         if (it->type() == HTMLTokenTypes::EndOfFile) {
             ASSERT(it + 1 == tokens.end()); // The EOF is assumed to be the last token of this bunch.
-            DocumentParser::prepareToStopParsing();
-            document()->setReadyState(Document::Interactive);
-            end();
+            prepareToStopParsing();
             return;
         }