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

Unified Diff: Source/core/loader/FrameLoader.cpp

Issue 1069743002: Stop parsing of current document before starting a next load. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/FrameLoader.cpp
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
index 5045aeeda408497c361a98c5375b226bae6a7db3..55115796776f5a85956240de087dea4594bba556 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -1230,6 +1230,14 @@ void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest, FrameLoadType ty
return;
}
+ // FIXME: This is an odd set of steps to shut down parsing and it's unclear why it works.
+ // It's also unclear why other steps don't work.
+ if (m_frame->document()->parsing()) {
+ finishedParsing();
+ m_frame->document()->setParsingState(Document::FinishedParsing);
+ }
+ m_frame->document()->setReadyState(Document::Complete);
+
if (m_provisionalDocumentLoader) {
m_provisionalDocumentLoader->stopLoading();
if (m_provisionalDocumentLoader)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698