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

Unified Diff: content/renderer/render_view_impl.cc

Issue 117603002: Always create FrameTreeNodes and RenderFrameHosts for every frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add checks for allocation and insertion. Created 7 years 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
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index ab5adf84d3975068af5cfec77a0c2d0e45928c25..1d7d6a34eaf763bd3fca554f942bae26b96a6cad 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -949,7 +949,7 @@ void RenderViewImpl::Initialize(RenderViewImplParams* params) {
main_render_frame_.reset(
RenderFrameImpl::Create(this, params->main_frame_routing_id));
// The main frame WebFrame object is closed by
- // RenderViewImpl::frameDetached().
+ // RenderFrameImpl::frameDetached().
webview()->setMainFrame(WebFrame::create(main_render_frame_.get()));
main_render_frame_->MainWebFrameCreated(webview()->mainFrame());
@@ -3069,6 +3069,10 @@ void RenderViewImpl::didDisownOpener(blink::WebFrame* frame) {
}
void RenderViewImpl::frameDetached(WebFrame* frame) {
+ // NOTE: We may get here for either the main frame or for subframes. The
+ // RenderFrameImpl will be deleted immediately after this call for subframes
+ // but not for the main frame, which is kept around in a scoped_ptr.
awong 2013/12/27 21:59:36 nit: kept around in a scoped_ptr -> owned by |main
nasko 2013/12/27 22:14:53 Done.
+
FOR_EACH_OBSERVER(RenderViewObserver, observers_, FrameDetached(frame));
}
« content/renderer/render_frame_impl.cc ('K') | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698