Changeset 140446 in webkit

Timestamp:

Jan 22, 2013, 11:55:01 AM (12 years ago)

Author:

abarth@webkit.org

Message:

Wean BackgroundHTMLParser off HTMLInputStream
​https://bugs.webkit.org/show_bug.cgi?id=107575

Reviewed by Eric Seidel.

The BackgroundHTMLParser doesn't need to use HTMLInputStream because it
doesn't need to handle nested calls to document.write. Instead, we can
just use a SegmentedString directly, which will let us checkpoint
m_input for speculation.

• html/parser/BackgroundHTMLParser.cpp:

(WebCore::BackgroundHTMLParser::append):
(WebCore::BackgroundHTMLParser::finish):
(WebCore::BackgroundHTMLParser::markEndOfFile):
(WebCore):
(WebCore::BackgroundHTMLParser::pumpTokenizer):

• html/parser/BackgroundHTMLParser.h:

(BackgroundHTMLParser):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-22  Adam Barth  <abarth@webkit.org>
+
+        Wean BackgroundHTMLParser off HTMLInputStream
+        https://bugs.webkit.org/show_bug.cgi?id=107575
+
+        Reviewed by Eric Seidel.
+
+        The BackgroundHTMLParser doesn't need to use HTMLInputStream because it
+        doesn't need to handle nested calls to document.write. Instead, we can
+        just use a SegmentedString directly, which will let us checkpoint
+        m_input for speculation.
+
+        * html/parser/BackgroundHTMLParser.cpp:
+        (WebCore::BackgroundHTMLParser::append):
+        (WebCore::BackgroundHTMLParser::finish):
+        (WebCore::BackgroundHTMLParser::markEndOfFile):
+        (WebCore):
+        (WebCore::BackgroundHTMLParser::pumpTokenizer):
+        * html/parser/BackgroundHTMLParser.h:
+        (BackgroundHTMLParser):
+
 2013-01-22  Sergio Villar Senin  <svillar@igalia.com>
 

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

@@ -102 +102 @@
 void BackgroundHTMLParser::append(const String& input)
 {
-    m_input.appendToEnd(input);
+    m_input.append(SegmentedString(input));
     pumpTokenizer();
 }
@@ -114 +114 @@
 void BackgroundHTMLParser::finish()
 {
-    ASSERT(!m_input.haveSeenEndOfFile());
-    m_input.markEndOfFile();
+    markEndOfFile();
     pumpTokenizer();
+}
+
+void BackgroundHTMLParser::markEndOfFile()
+{
+    // FIXME: This should use InputStreamPreprocessor::endOfFileMarker
+    // once InputStreamPreprocessor is split off into its own header.
+    const LChar endOfFileMarker = 0;
+
+    ASSERT(!m_input.isClosed());
+    m_input.append(SegmentedString(String(&endOfFileMarker, 1)));
+    m_input.close();
 }
 
@@ -160 +170 @@
         return;
 
-    while (m_tokenizer->nextToken(m_input.current(), m_token)) {
+    while (m_tokenizer->nextToken(m_input, m_token)) {
         m_pendingTokens.append(CompactHTMLToken(m_token));
         m_token.clear();

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

@@ -30 +30 @@
 
 #include "CompactHTMLToken.h"
-#include "HTMLInputStream.h"
 #include "HTMLParserOptions.h"
 #include "HTMLToken.h"
@@ -61 +60 @@
     explicit BackgroundHTMLParser(const HTMLParserOptions&, ParserIdentifier);
 
+    void markEndOfFile();
     void pumpTokenizer();
     void simulateTreeBuilder(const CompactHTMLToken&);
@@ -66 +66 @@
     void sendTokensToMainThread();
 
-    HTMLInputStream m_input;
+    SegmentedString m_input;
     HTMLToken m_token;
     bool m_isPausedWaitingForScripts;