Changeset 143661 in webkit

Timestamp:

Feb 21, 2013 4:21:33 PM (11 years ago)

Author:

tonyg@chromium.org

Message:

Make BackgroundHTMLParser rewind the preload scanner instead of clear it
​https://bugs.webkit.org/show_bug.cgi?id=110517

Reviewed by Adam Barth.

No new tests becuase no new functionality.

• html/parser/BackgroundHTMLParser.cpp:

(WebCore::BackgroundHTMLParser::resumeFrom):
(WebCore::BackgroundHTMLParser::pumpTokenizer):
(WebCore::BackgroundHTMLParser::sendTokensToMainThread):

• html/parser/BackgroundHTMLParser.h:

(Checkpoint):

• html/parser/HTMLDocumentParser.cpp:

(WebCore::HTMLDocumentParser::didFailSpeculation):

• html/parser/HTMLDocumentParser.h:

(ParsedChunk):

• html/parser/HTMLPreloadScanner.cpp:

(WebCore::TokenPreloadScanner::createCheckpoint):
(WebCore):
(WebCore::TokenPreloadScanner::rewindTo):

• html/parser/HTMLPreloadScanner.h:

(WebCore):
(TokenPreloadScanner):
(WebCore::TokenPreloadScanner::Checkpoint::Checkpoint):
(Checkpoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/BackgroundHTMLParser.cpp (modified) (3 diffs)
• html/parser/BackgroundHTMLParser.h (modified) (1 diff)
• html/parser/HTMLDocumentParser.cpp (modified) (1 diff)
• html/parser/HTMLDocumentParser.h (modified) (1 diff)
• html/parser/HTMLPreloadScanner.cpp (modified) (1 diff)
• html/parser/HTMLPreloadScanner.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-21  Tony Gentilcore  <tonyg@chromium.org>
+
+        Make BackgroundHTMLParser rewind the preload scanner instead of clear it
+        https://bugs.webkit.org/show_bug.cgi?id=110517
+
+        Reviewed by Adam Barth.
+
+        No new tests becuase no new functionality.
+
+        * html/parser/BackgroundHTMLParser.cpp:
+        (WebCore::BackgroundHTMLParser::resumeFrom):
+        (WebCore::BackgroundHTMLParser::pumpTokenizer):
+        (WebCore::BackgroundHTMLParser::sendTokensToMainThread):
+        * html/parser/BackgroundHTMLParser.h:
+        (Checkpoint):
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::didFailSpeculation):
+        * html/parser/HTMLDocumentParser.h:
+        (ParsedChunk):
+        * html/parser/HTMLPreloadScanner.cpp:
+        (WebCore::TokenPreloadScanner::createCheckpoint):
+        (WebCore):
+        (WebCore::TokenPreloadScanner::rewindTo):
+        * html/parser/HTMLPreloadScanner.h:
+        (WebCore):
+        (TokenPreloadScanner):
+        (WebCore::TokenPreloadScanner::Checkpoint::Checkpoint):
+        (Checkpoint):
+
 2013-02-21  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -140 +140 @@
     m_tokenizer = checkpoint->tokenizer.release();
     m_input.rewindTo(checkpoint->inputCheckpoint, checkpoint->unparsedInput);
-    m_preloadScanner.clear(); // FIXME: We should rewind the preload scanner rather than clearing it.
+    m_preloadScanner->rewindTo(checkpoint->preloadScannerCheckpoint);
     pumpTokenizer();
 }
@@ -235 +235 @@
                 token.setXSSInfo(xssInfo.release());
 
-            if (m_preloadScanner)
-                m_preloadScanner->scan(token, m_pendingPreloads);
+            m_preloadScanner->scan(token, m_pendingPreloads);
 
             m_pendingTokens->append(token);
@@ -263 +262 @@
     chunk->tokens = m_pendingTokens.release();
     chunk->preloads.swap(m_pendingPreloads);
-    chunk->checkpoint = m_input.createCheckpoint();
+    chunk->inputCheckpoint = m_input.createCheckpoint();
+    chunk->preloadScannerCheckpoint = m_preloadScanner->createCheckpoint();
     callOnMainThread(bind(&HTMLDocumentParser::didReceiveParsedChunkFromBackgroundParser, m_parser, chunk.release()));
 

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

@@ -68 +68 @@
         OwnPtr<HTMLTokenizer> tokenizer;
         HTMLInputCheckpoint inputCheckpoint;
+        TokenPreloadScannerCheckpoint preloadScannerCheckpoint;
         String unparsedInput;
     };

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

@@ -316 +316 @@
     checkpoint->token = token;
     checkpoint->tokenizer = tokenizer;
-    checkpoint->inputCheckpoint = m_currentChunk->checkpoint;
+    checkpoint->inputCheckpoint = m_currentChunk->inputCheckpoint;
+    checkpoint->preloadScannerCheckpoint = m_currentChunk->preloadScannerCheckpoint;
     checkpoint->unparsedInput = m_input.current().toString().isolatedCopy();
     m_input.current().clear();

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

@@ -90 +90 @@
         OwnPtr<CompactHTMLTokenStream> tokens;
         PreloadRequestStream preloads;
-        HTMLInputCheckpoint checkpoint;
+        HTMLInputCheckpoint inputCheckpoint;
+        TokenPreloadScannerCheckpoint preloadScannerCheckpoint;
     };
     void didReceiveParsedChunkFromBackgroundParser(PassOwnPtr<ParsedChunk>);

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

@@ -263 +263 @@
 }
 
+TokenPreloadScannerCheckpoint TokenPreloadScanner::createCheckpoint()
+{
+    TokenPreloadScannerCheckpoint checkpoint = m_checkpoints.size();
+    m_checkpoints.append(Checkpoint(m_predictedBaseElementURL, m_inStyle
+#if ENABLE(TEMPLATE_ELEMENT)
+                                    , m_templateCount
+#endif
+                                    ));
+    return checkpoint;
+}
+
+void TokenPreloadScanner::rewindTo(TokenPreloadScannerCheckpoint checkpointIndex)
+{
+    ASSERT(checkpointIndex < m_checkpoints.size()); // If this ASSERT fires, checkpointIndex is invalid.
+    const Checkpoint& checkpoint = m_checkpoints[checkpointIndex];
+    m_predictedBaseElementURL = checkpoint.predictedBaseElementURL;
+    m_inStyle = checkpoint.inStyle;
+#if ENABLE(TEMPLATE_ELEMENT)
+    m_templateCount = checkpoint.templateCount;
+#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.
+}
+
 void TokenPreloadScanner::scan(const HTMLToken& token, Vector<OwnPtr<PreloadRequest> >& requests)
 {

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

@@ -32 +32 @@
 #include "HTMLToken.h"
 #include "SegmentedString.h"
+#include <wtf/Vector.h>
 
 namespace WebCore {
+
+typedef size_t TokenPreloadScannerCheckpoint;
 
 class HTMLParserOptions;
@@ -51 +54 @@
 
     void setPredictedBaseElementURL(const KURL& url) { m_predictedBaseElementURL = url; }
+
+    // A TokenPreloadScannerCheckpoint is valid until the next call to rewindTo,
+    // at which point all outstanding checkpoints are invalidated.
+    TokenPreloadScannerCheckpoint createCheckpoint();
+    void rewindTo(TokenPreloadScannerCheckpoint);
 
     bool isSafeToSendToAnotherThread()
@@ -86 +94 @@
     void updatePredictedBaseURL(const Token&);
 
+    struct Checkpoint {
+        Checkpoint(const KURL& predictedBaseElementURL, bool inStyle
+#if ENABLE(TEMPLATE_ELEMENT)
+            , size_t templateCount
+#endif
+            )
+            : predictedBaseElementURL(predictedBaseElementURL)
+            , inStyle(inStyle)
+#if ENABLE(TEMPLATE_ELEMENT)
+            , templateCount(templateCount)
+#endif
+        {
+        }
+
+        KURL predictedBaseElementURL;
+        bool inStyle;
+#if ENABLE(TEMPLATE_ELEMENT)
+        size_t templateCount;
+#endif
+    };
+
     CSSPreloadScanner m_cssScanner;
-    KURL m_documentURL;
+    const KURL m_documentURL;
     KURL m_predictedBaseElementURL;
     bool m_inStyle;
@@ -94 +123 @@
     size_t m_templateCount;
 #endif
+
+    Vector<Checkpoint> m_checkpoints;
 };