Source/core/loader/FrameLoader.cpp - Issue 725593004: Prevent the load event from firing inside DOMContentLoaded

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: Source/core/loader/FrameLoader.cpp

Issue 725593004: Prevent the load event from firing inside DOMContentLoaded (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Done->FinishedParsing Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Source/core/loader/FrameLoader.cpp

diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp

index 581bd951484e77c319e9d868fd074afaad4b7d4d..74d5f443e8ec75911a9d18de9e657fe2a965623b 100644

--- a/Source/core/loader/FrameLoader.cpp

+++ b/Source/core/loader/FrameLoader.cpp

@@ -181,7 +181,7 @@ void FrameLoader::stopLoading()

{

if (m_frame->document() && m_frame->document()->parsing()) {

finishedParsing();

- m_frame->document()->setParsing(false);

+ m_frame->document()->setParsingState(Document::FinishedParsing);

}

if (Document* doc = m_frame->document()) {

@@ -468,7 +468,7 @@ void FrameLoader::checkCompleted()

return;

// Are we still parsing?

- if (m_frame->document()->parsing())

+ if (m_frame->document()->parsing() || m_frame->document()->isInDOMContentLoaded())

return;

// Still waiting imports?

« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/xml/parser/XMLDocumentParser.cpp » ('j') | no next file with comments »