| Index: content/browser/frame_host/render_frame_host_impl.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
|
| index 18a88eb441030f40bbeb1fb55ee33ec8085b8d4f..cd50205f58165bb2bec56f12995c0a707b8134e3 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -258,11 +258,18 @@ RenderFrameHostImpl::~RenderFrameHostImpl() {
|
| if (delegate_ && render_frame_created_)
|
| delegate_->RenderFrameDeleted(this);
|
|
|
| - // If this was swapped out, it already decremented the active frame count of
|
| - // the SiteInstance it belongs to.
|
| - if (IsRFHStateActive(rfh_state_))
|
| + if (IsRFHStateActive(rfh_state_)) {
|
| + // If this was swapped out, it already decremented the active frame count of
|
| + // the SiteInstance it belongs to.
|
| GetSiteInstance()->decrement_active_frame_count();
|
|
|
| + // In the case of swapping with a RenderFrameProxy, cleanup is already
|
| + // handled on the renderer process side. However, in all other cases the
|
| + // corresponding RenderFrame also needs to be cleaned up.
|
| + if (render_frame_created_)
|
| + Send(new FrameMsg_Detach(routing_id_));
|
| + }
|
| +
|
| // NULL out the swapout timer; in crash dumps this member will be null only if
|
| // the dtor has run.
|
| swapout_event_monitor_timeout_.reset();
|
|
|