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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1014703003: Allow IPCs during RenderFrameObserver::FrameDetached() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments Created 5 years, 9 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 | « content/public/renderer/render_frame_observer.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 437e8c98be937398ffd4b3ca46cdfb4c5b964f16..aed52c0bf82d40c895af739605c6d24d8eaea474 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2080,18 +2080,16 @@ void RenderFrameImpl::frameDetached(blink::WebFrame* frame) {
bool is_subframe = !!frame->parent();
+ FOR_EACH_OBSERVER(RenderFrameObserver, observers_, FrameDetached());
+ FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
+ FrameDetached(frame));
+
Send(new FrameHostMsg_Detach(routing_id_));
// The |is_detaching_| flag disables Send(). FrameHostMsg_Detach must be
- // sent before setting |is_detaching_| to true. In contrast, Observers
- // should only be notified afterwards so they cannot call back into here and
- // have IPCs fired off.
+ // sent before setting |is_detaching_| to true.
is_detaching_ = true;
- FOR_EACH_OBSERVER(RenderFrameObserver, observers_, FrameDetached());
- FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
- FrameDetached(frame));
-
// We need to clean up subframes by removing them from the map and deleting
// the RenderFrameImpl. In contrast, the main frame is owned by its
// containing RenderViewHost (so that they have the same lifetime), so only
« no previous file with comments | « content/public/renderer/render_frame_observer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698