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

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

Issue 1290053003: Handle LocalFrame being nestedly detached by subframe. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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 | « LayoutTests/fast/frames/detach-frame-repeated-no-crash-expected.txt ('k') | 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 d30381816e394784adbab83d4f7480a317701995..0cc4801b3fc93292853195e6554b456b4bbb59eb 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -479,7 +479,8 @@ void FrameLoader::finishedParsing()
// Null-checking the FrameView indicates whether or not we're in the destructor.
RefPtrWillBeRawPtr<LocalFrame> protect(m_frame->view() ? m_frame.get() : nullptr);
- m_progressTracker->finishedParsing();
+ if (m_progressTracker)
Nate Chapin 2015/08/17 17:01:58 Is there any work that needs to be done in the fra
sof 2015/08/18 05:24:13 It won't do any work before the detach check just
+ m_progressTracker->finishedParsing();
if (client())
client()->dispatchDidFinishDocumentLoad(m_documentLoader->isCommittedButEmpty());
« no previous file with comments | « LayoutTests/fast/frames/detach-frame-repeated-no-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698