Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(829)

Unified Diff: Source/core/html/parser/HTMLDocumentParser.cpp

Issue 14876022: Threaded HTML parser ASSERTs on Android (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/http/tests/resources/slow-notify-done.php ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/parser/HTMLDocumentParser.cpp
diff --git a/Source/core/html/parser/HTMLDocumentParser.cpp b/Source/core/html/parser/HTMLDocumentParser.cpp
index 863f0381c27e21abf718e94a07f26914d1260fc6..01b8b206d783a13ae83d142279db58eee2b7f8bd 100644
--- a/Source/core/html/parser/HTMLDocumentParser.cpp
+++ b/Source/core/html/parser/HTMLDocumentParser.cpp
@@ -404,13 +404,6 @@ void HTMLDocumentParser::processParsedChunkFromBackgroundParser(PassOwnPtr<Parse
for (Vector<CompactHTMLToken>::const_iterator it = tokens->begin(); it != tokens->end(); ++it) {
ASSERT(!isWaitingForScripts());
- m_textPosition = it->textPosition();
-
- constructTreeFromCompactHTMLToken(*it);
-
- if (isStopped())
- break;
-
if (!isParsingFragment()
&& document()->frame() && document()->frame()->navigationScheduler()->locationChangePending()) {
@@ -423,6 +416,13 @@ void HTMLDocumentParser::processParsedChunkFromBackgroundParser(PassOwnPtr<Parse
break;
}
+ m_textPosition = it->textPosition();
+
+ constructTreeFromCompactHTMLToken(*it);
+
+ if (isStopped())
+ break;
+
if (isWaitingForScripts()) {
ASSERT(it + 1 == tokens->end()); // The </script> is assumed to be the last token of this bunch.
runScriptsForPausedTreeBuilder();
« no previous file with comments | « LayoutTests/http/tests/resources/slow-notify-done.php ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698