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

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

Issue 2021373003: Disable frame navigations during DocumentLoader detach in FrameLoader::startLoad (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 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 | « third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index b165a2e788363496aed321df4557f0904602bf14..c090baac93f7f594cbfb6e7638b502b0a912b1e1 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -1378,7 +1378,10 @@ void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest, FrameLoadType ty
return;
m_frame->document()->cancelParsing();
- detachDocumentLoader(m_provisionalDocumentLoader);
+ if (m_provisionalDocumentLoader) {
+ FrameNavigationDisabler navigationDisabler(*m_frame);
+ detachDocumentLoader(m_provisionalDocumentLoader);
+ }
// beforeunload fired above, and detaching a DocumentLoader can fire
// events, which can detach this frame.
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698