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

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

Issue 1659013003: Don't reset LoadEventProgress if frame unload has already started. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Better fix Created 4 years, 11 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/HTMLFrameOwnerElement.h ('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 27cc4b93872c298865140447341d021f73a9bb7a..cd59f695f15c80487e07b3f64008bea19f1da635 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -1042,6 +1042,9 @@ bool FrameLoader::prepareForCommit()
ThreadState::current()->schedulePageNavigationGCIfNeeded(ratio);
}
+ // TODO(dcheng): See comment in LocalFrame::detach() about sequencing this
+ // immediately before detachChildren() instead.
+ SubframeLoadingDisabler disabler(m_frame->document());
dcheng 2016/02/03 08:42:17 Here, m_frame->document() might be null during the
if (m_documentLoader) {
client()->dispatchWillClose();
dispatchUnloadEvent();
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698