Changeset 142200 in webkit

Timestamp:

Feb 7, 2013 4:24:31 PM (11 years ago)

Author:

abarth@webkit.org

Message:

fast/parser/document-write-noscript.html fails for threaded HTML parser
​https://bugs.webkit.org/show_bug.cgi?id=109237

Reviewed by Eric Seidel.

Source/WebCore:

If there are multiple calls to document.write in an external script, we
need to wait for them all to complete before invalidating the
speculative tokens. Instead of doing this when we unwind the
document.write call stack, we do this when we're about to resume
parsing after script execution.

Test: fast/parser/document-write-basic.html

• html/parser/HTMLDocumentParser.cpp:

(WebCore::HTMLDocumentParser::processParsedChunkFromBackgroundParser):
(WebCore::HTMLDocumentParser::insert):
(WebCore::HTMLDocumentParser::resumeParsingAfterScriptExecution):

LayoutTests:

This tests basic document.write functionality. There doesn't appear to
be another fast/parser test that covers this basic case (although it's
convered in some more complicated test cases incidentally.)

• fast/parser/document-write-basic-expected.txt: Added.
• fast/parser/document-write-basic.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/parser/document-write-basic-expected.txt (added)
• LayoutTests/fast/parser/document-write-basic.html (added)
• LayoutTests/fast/parser/document-write-partial-script-external-expected.txt (added)
• LayoutTests/fast/parser/document-write-partial-script-external.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/parser/HTMLDocumentParser.cpp (modified) (5 diffs)
• Source/WebCore/html/parser/HTMLDocumentParser.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-07  Adam Barth  <abarth@webkit.org>
+
+        fast/parser/document-write-noscript.html fails for threaded HTML parser
+        https://bugs.webkit.org/show_bug.cgi?id=109237
+
+        Reviewed by Eric Seidel.
+
+        This tests basic document.write functionality.  There doesn't appear to
+        be another fast/parser test that covers this basic case (although it's
+        convered in some more complicated test cases incidentally.)
+
+        * fast/parser/document-write-basic-expected.txt: Added.
+        * fast/parser/document-write-basic.html: Added.
+
 2013-02-07  Keishi Hattori  <keishi@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-07  Adam Barth  <abarth@webkit.org>
+
+        fast/parser/document-write-noscript.html fails for threaded HTML parser
+        https://bugs.webkit.org/show_bug.cgi?id=109237
+
+        Reviewed by Eric Seidel.
+
+        If there are multiple calls to document.write in an external script, we
+        need to wait for them all to complete before invalidating the
+        speculative tokens. Instead of doing this when we unwind the
+        document.write call stack, we do this when we're about to resume
+        parsing after script execution.
+
+        Test: fast/parser/document-write-basic.html
+
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::processParsedChunkFromBackgroundParser):
+        (WebCore::HTMLDocumentParser::insert):
+        (WebCore::HTMLDocumentParser::resumeParsingAfterScriptExecution):
+
 2013-02-07  Lamarque V. Souza  <Lamarque.Souza@basyskom.com>
 

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

@@ -288 +288 @@
 }
 
+void HTMLDocumentParser::checkForSpeculationFailure()
+{
+    if (!m_tokenizer)
+        return;
+    // FIXME: If the tokenizer is in the same state as when we started this function,
+    // then we haven't necessarily failed our speculation.
+    didFailSpeculation(m_token.release(), m_tokenizer.release());
+}
+
 void HTMLDocumentParser::didFailSpeculation(PassOwnPtr<HTMLToken> token, PassOwnPtr<HTMLTokenizer> tokenizer)
 {
@@ -306 +315 @@
     RefPtr<HTMLDocumentParser> protect(this);
 
-    ASSERT(!m_currentChunk);
     m_currentChunk = chunk;
     OwnPtr<CompactHTMLTokenStream> tokens = m_currentChunk->tokens.release();
@@ -342 +350 @@
     }
 
-    m_currentChunk.clear();
+    checkForSpeculationFailure();
+
     InspectorInstrumentation::didWriteHTML(cookie, lineNumber().zeroBasedInt());
 }
@@ -484 +493 @@
     pumpTokenizerIfPossible(ForceSynchronous);
 
-#if ENABLE(THREADED_HTML_PARSER)
-    if (!inPumpSession() && m_haveBackgroundParser) {
-        // FIXME: If the tokenizer is in the same state as when we started this function,
-        // then we haven't necessarily failed our speculation.
-        didFailSpeculation(m_token.release(), m_tokenizer.release());
-        return;
-    }
-#endif
-
     if (isWaitingForScripts()) {
         // Check the document.write() output with a separate preload scanner as
@@ -715 +715 @@
 
 #if ENABLE(THREADED_HTML_PARSER)
-    if (shouldUseThreading()) {
+    if (m_haveBackgroundParser) {
+        checkForSpeculationFailure();
+
         while (!m_speculations.isEmpty()) {
             processParsedChunkFromBackgroundParser(m_speculations.takeFirst());

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

@@ -130 +130 @@
     void startBackgroundParser();
     void stopBackgroundParser();
+    void checkForSpeculationFailure();
     void didFailSpeculation(PassOwnPtr<HTMLToken>, PassOwnPtr<HTMLTokenizer>);
     void processParsedChunkFromBackgroundParser(PassOwnPtr<ParsedChunk>);