Changeset 139959 in webkit

Timestamp:

Jan 16, 2013 8:35:43 PM (11 years ago)

Author:

tonyg@chromium.org

Message:

Disable an ASSERT for the threaded parser
​https://bugs.webkit.org/show_bug.cgi?id=107087

Reviewed by Adam Barth.

Since tokenizing happens on the background thread, when the tree builder runs there isn't a valid tokenizer for which to check the state.
The background parser has minimal code to update its tokenizer's state properly.

No new tests because covered by existing fast/parser tests.

• html/parser/HTMLParserOptions.cpp:

(WebCore::HTMLParserOptions::HTMLParserOptions):

• html/parser/HTMLParserOptions.h:

(HTMLParserOptions):

• html/parser/HTMLTreeBuilder.cpp:

(WebCore::HTMLTreeBuilder::processEndTag):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/HTMLParserOptions.cpp (modified) (1 diff)
• html/parser/HTMLParserOptions.h (modified) (1 diff)
• html/parser/HTMLTreeBuilder.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-16  Tony Gentilcore  <tonyg@chromium.org>
+
+        Disable an ASSERT for the threaded parser
+        https://bugs.webkit.org/show_bug.cgi?id=107087
+
+        Reviewed by Adam Barth.
+
+        Since tokenizing happens on the background thread, when the tree builder runs there isn't a valid tokenizer for which to check the state.
+        The background parser has minimal code to update its tokenizer's state properly.
+
+        No new tests because covered by existing fast/parser tests.
+
+        * html/parser/HTMLParserOptions.cpp:
+        (WebCore::HTMLParserOptions::HTMLParserOptions):
+        * html/parser/HTMLParserOptions.h:
+        (HTMLParserOptions):
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processEndTag):
+
 2013-01-16  MORITA Hajime  <morrita@google.com>
 

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

@@ -43 +43 @@
 #if ENABLE(THREADED_HTML_PARSER)
     useThreading = settings && settings->threadedHTMLParser();
+#else
+    useThreading = false;
 #endif
     maximumDOMTreeDepth = settings ? settings->maximumHTMLParserDOMTreeDepth() : Settings::defaultMaximumHTMLParserDOMTreeDepth;

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

@@ -36 +36 @@
     bool pluginsEnabled;
     bool usePreHTML5ParserQuirks;
-#if ENABLE(THREADED_HTML_PARSER)
     bool useThreading;
-#endif
     unsigned maximumDOMTreeDepth;
 

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

@@ -2158 +2158 @@
             // quirks are enabled. We must set the tokenizer's state to
             // DataState explicitly if the tokenizer didn't have a chance to.
-            ASSERT(m_parser->tokenizer()->state() == HTMLTokenizerState::DataState || m_options.usePreHTML5ParserQuirks);
+            ASSERT(m_parser->tokenizer()->state() == HTMLTokenizerState::DataState || m_options.usePreHTML5ParserQuirks || m_options.useThreading);
             m_parser->tokenizer()->setState(HTMLTokenizerState::DataState);
             return;