Delete entry in WebFrame->RenderFrameProxy map at WebFrame::close time.

content/renderer/render_frame_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 712 matching lines @@
 
 RenderFrameImpl::~RenderFrameImpl() {
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, RenderFrameGone());
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnDestruct());
 
 #if defined(VIDEO_HOLE)
   if (contains_media_player_)
     render_view_->UnregisterVideoHoleFrame(this);
 #endif
 
-  if (render_frame_proxy_)
-    delete render_frame_proxy_;
+  // RenderFrameProxy is only "owned" by RenderFrameImpl in the case it is the
+  // main frame. Ensure it is deleted along with this object.
+  if (!is_subframe_ && render_frame_proxy_)

[ncarter (slow), 2015/05/07 23:33:36]

I was initially worried that this frameDetached call would trigger a new Detach
IPC, but it seems it's safe: the proxies detached this way are never subframes,
so they'll never have parents, so we won't reach the detach IPC.

So I think we're okay.

[nasko, 2015/05/07 23:46:05]

I did at the subframe check exactly to guard against that. It also shouldn't
have ever been called for subframes.

+    render_frame_proxy_->frameDetached();

[ncarter (slow), 2015/05/07 23:33:36]

Gosh it's kinda gross that the rfph dtor calls back into this class
(render_frame->set_render_frame_proxy(null)) before returning. But, I suppose
hard to avoid when you have circular references.

Might be worth adding a comment like this:

render_frame_proxy_->frameDetached();  // deletes/clears |render_frame_proxy_|

[nasko, 2015/05/07 23:46:05]

I'm hopeful that the CL I'm working on is going to allow us to get rid of this.
I've added a comment in the meantime :(.

 
   render_view_->UnregisterRenderFrame(this);
   g_routing_id_frame_map.Get().erase(routing_id_);
   RenderThread::Get()->RemoveRoute(routing_id_);
 }
 
 void RenderFrameImpl::SetWebFrame(blink::WebLocalFrame* web_frame) {
   DCHECK(!frame_);
 
   std::pair<FrameMap::iterator, bool> result = g_frame_map.Get().insert(
@@ skipping 4187 matching lines @@
 #elif defined(ENABLE_BROWSER_CDMS)
         cdm_manager_,
 #endif
         this);
   }
 
   return cdm_factory_;
 }
 
 }  // namespace content