Changeset 143685 in webkit

Timestamp:

Feb 21, 2013 8:03:41 PM (11 years ago)

Author:

tonyg@chromium.org

Message:

Invalidate outstanding checkpoints for the background input stream and preload scanner
​https://bugs.webkit.org/show_bug.cgi?id=110537

Reviewed by Adam Barth.

fast/tokenizer/write-before-load.html caused duplicate didFailSpeculation() calls for the same checkpoint.
One was triggered by processParsedChunkFromBackgroundParser and the other by resumeParsingAfterScriptExecution.
This change ensures that after we send a checkpoint, it is cleared so it won't be sent again until the next
processParsedChunkFromBackgroundParser().

No new tests because no new functionality.

• html/parser/BackgroundHTMLInputStream.cpp:

(WebCore::BackgroundHTMLInputStream::rewindTo):

• html/parser/HTMLDocumentParser.cpp:

(WebCore::HTMLDocumentParser::didFailSpeculation):

• html/parser/HTMLPreloadScanner.cpp:

(WebCore::TokenPreloadScanner::rewindTo):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-21  Tony Gentilcore  <tonyg@chromium.org>
+
+        Invalidate outstanding checkpoints for the background input stream and preload scanner
+        https://bugs.webkit.org/show_bug.cgi?id=110537
+
+        Reviewed by Adam Barth.
+
+        fast/tokenizer/write-before-load.html caused duplicate didFailSpeculation() calls for the same checkpoint.
+        One was triggered by processParsedChunkFromBackgroundParser and the other by resumeParsingAfterScriptExecution.
+        This change ensures that after we send a checkpoint, it is cleared so it won't be sent again until the next
+        processParsedChunkFromBackgroundParser().
+
+        No new tests because no new functionality.
+
+        * html/parser/BackgroundHTMLInputStream.cpp:
+        (WebCore::BackgroundHTMLInputStream::rewindTo):
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::didFailSpeculation):
+        * html/parser/HTMLPreloadScanner.cpp:
+        (WebCore::TokenPreloadScanner::rewindTo):
+
 2013-02-21  Dean Jackson  <dino@apple.com>
 

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

@@ -72 +72 @@
         m_current.close();
 
-    // FIXME: We should be able to actively invalidate all the outstanding checkpoints
-    // by clearing m_segments and m_checkpoints, but that causes
-    // fast/tokenizer/write-before-load.html to hit the ASSERT at the beginning of
-    // this function.
+    m_segments.clear();
+    m_checkpoints.clear();
 }
 

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

@@ -309 +309 @@
 void HTMLDocumentParser::didFailSpeculation(PassOwnPtr<HTMLToken> token, PassOwnPtr<HTMLTokenizer> tokenizer)
 {
+    if (!m_currentChunk)
+        return;
+
     m_weakFactory.revokeAll();
     m_speculations.clear();
@@ -320 +323 @@
     checkpoint->unparsedInput = m_input.current().toString().isolatedCopy();
     m_input.current().clear();
+    m_currentChunk.clear();
 
     ASSERT(checkpoint->unparsedInput.isSafeToSendToAnotherThread());

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

@@ -284 +284 @@
 #endif
     m_cssScanner.reset();
-
-    // FIXME: We should be able to actively invalidate all the outstanding checkpoints
-    // by clearing m_checkpoints, but that causes fast/tokenizer/write-before-load.html
-    // to hit the ASSERT at the beginning of this function.
+    m_checkpoints.clear();
 }