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

Unified Diff: content/browser/frame_host/render_frame_host_manager.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_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 73a82785072d1a0d3ecc6d67adc62b847ae163dc..4389f931e5d9565f5b36c93f4cd104517d65d28d 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -598,7 +598,8 @@ void RenderFrameHostManager::SwapOutOldFrame(
// (There should not be one yet.)
CHECK(!GetRenderFrameProxyHost(old_render_frame_host->GetSiteInstance()));
RenderFrameProxyHost* proxy = new RenderFrameProxyHost(
- old_render_frame_host->GetSiteInstance(), frame_tree_node_);
+ old_render_frame_host->GetSiteInstance(),
+ old_render_frame_host->render_view_host(), frame_tree_node_);
CHECK(proxy_hosts_.insert(std::make_pair(old_site_instance_id, proxy)).second)
<< "Inserting a duplicate item.";
@@ -640,8 +641,8 @@ void RenderFrameHostManager::DiscardUnusedFrame(
render_frame_host->CancelSuspendedNavigations();
CHECK(!GetRenderFrameProxyHost(site_instance));
- RenderFrameProxyHost* proxy =
- new RenderFrameProxyHost(site_instance, frame_tree_node_);
+ RenderFrameProxyHost* proxy = new RenderFrameProxyHost(
+ site_instance, render_frame_host->render_view_host(), frame_tree_node_);
proxy_hosts_[site_instance->GetId()] = proxy;
// Check if the RenderFrameHost is already swapped out, to avoid swapping it
@@ -1501,7 +1502,8 @@ scoped_ptr<RenderFrameHostImpl> RenderFrameHostManager::CreateRenderFrame(
new_render_frame_host->GetProcess()->AddPendingView();
} else {
proxy = new RenderFrameProxyHost(
- new_render_frame_host->GetSiteInstance(), frame_tree_node_);
+ new_render_frame_host->GetSiteInstance(),
+ new_render_frame_host->render_view_host(), frame_tree_node_);
proxy_hosts_[instance->GetId()] = proxy;
proxy_routing_id = proxy->GetRoutingID();
proxy->TakeFrameHostOwnership(new_render_frame_host.Pass());
@@ -1568,7 +1570,9 @@ int RenderFrameHostManager::CreateRenderFrameProxy(SiteInstance* instance) {
return proxy->GetRoutingID();
if (!proxy) {
- proxy = new RenderFrameProxyHost(instance, frame_tree_node_);
+ proxy = new RenderFrameProxyHost(
+ instance, frame_tree_node_->frame_tree()->GetRenderViewHost(instance),
+ frame_tree_node_);
proxy_hosts_[instance->GetId()] = proxy;
}
proxy->InitRenderFrameProxy();

Powered by Google App Engine
This is Rietveld 408576698