third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp - Issue 2099583002: When pumping tokens yield for scripts waiting for resources.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2099583002: When pumping tokens yield for scripts waiting for resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Improved test. Created 4 years, 6 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

« third_party/WebKit/LayoutTests/fast/parser/resources/write-script-waiting-for-style-crash.html ('K') | « third_party/WebKit/LayoutTests/fast/parser/write-script-waiting-for-style-crash-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp

diff --git a/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp b/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp

index aa007910512d3a0bd953112c939a71c091ab4275..e3be0bd6a112211784b50078c31b3a306698d820 100644

--- a/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp

+++ b/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp

@@ -265,14 +265,11 @@ bool HTMLDocumentParser::canTakeNextToken()

if (isStopped())

return false;

- if (isWaitingForScripts()) {

- // If we're paused waiting for a script, we try to execute scripts before continuing.

+ // If we're paused waiting for a script, we try to execute scripts before continuing.

+ if (m_treeBuilder->hasParserBlockingScript())

runScriptsForPausedTreeBuilder();

- if (isStopped())

- return false;

- if (isWaitingForScripts())

- return false;

- }

+ if (isStopped() || isWaitingForScripts())

+ return false;

// FIXME: It's wrong for the HTMLDocumentParser to reach back to the

// LocalFrame, but this approach is how the old parser handled