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

Unified Diff: content/browser/frame_host/render_frame_proxy_host.cc

Issue 1151393003: Add ref-count on RenderViewHost for each new RenderFrameProxyHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes based on Nick's review. Created 5 years, 7 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
Index: content/browser/frame_host/render_frame_proxy_host.cc
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index 6d41f873516b9a088bb9d4fed4aa3eb8a267dc65..f0f5808f74fecacce8b0224e4fb4b311ec91de8d 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -44,17 +44,21 @@ RenderFrameProxyHost* RenderFrameProxyHost::FromID(int process_id,
}
RenderFrameProxyHost::RenderFrameProxyHost(SiteInstance* site_instance,
+ RenderViewHostImpl* render_view_host,
FrameTreeNode* frame_tree_node)
: routing_id_(site_instance->GetProcess()->GetNextRoutingID()),
site_instance_(site_instance),
process_(site_instance->GetProcess()),
frame_tree_node_(frame_tree_node),
- render_frame_proxy_created_(false) {
+ render_frame_proxy_created_(false),
+ render_view_host_(render_view_host) {
GetProcess()->AddRoute(routing_id_, this);
CHECK(g_routing_id_frame_proxy_map.Get().insert(
std::make_pair(
RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_),
this)).second);
+ CHECK(render_view_host_);
+ frame_tree_node_->frame_tree()->AddRenderViewHostRef(render_view_host_);
if (!frame_tree_node_->IsMainFrame() &&
frame_tree_node_->parent()
@@ -82,6 +86,7 @@ RenderFrameProxyHost::~RenderFrameProxyHost() {
Send(new FrameMsg_DeleteProxy(routing_id_));
}
+ frame_tree_node_->frame_tree()->ReleaseRenderViewHostRef(render_view_host_);
GetProcess()->RemoveRoute(routing_id_);
g_routing_id_frame_proxy_map.Get().erase(
RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_));
« no previous file with comments | « content/browser/frame_host/render_frame_proxy_host.h ('k') | content/browser/site_per_process_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698