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

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 1142123002: Remove swapped-out usage in --site-per-process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another round of fixes. Created 5 years, 6 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/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 4e81849d222a27d2e458cb6ff239ea2f4f4749de..3495a1585e27bf807e0814e5e3e8d6e516601fdf 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -278,6 +278,7 @@ bool RenderViewHostImpl::CreateRenderView(
int opener_route_id,
int proxy_route_id,
int32 max_page_id,
+ const FrameReplicationState& replicated_frame_state,
bool window_was_created_with_opener) {
TRACE_EVENT0("renderer_host,navigation",
"RenderViewHostImpl::CreateRenderView");
@@ -319,6 +320,7 @@ bool RenderViewHostImpl::CreateRenderView(
// Ensure the RenderView sets its opener correctly.
params.opener_route_id = opener_route_id;
params.swapped_out = !is_active_;
+ params.replicated_frame_state = replicated_frame_state;
params.proxy_routing_id = proxy_route_id;
params.hidden = is_hidden();
params.never_visible = delegate_->IsNeverVisible();
@@ -328,11 +330,6 @@ bool RenderViewHostImpl::CreateRenderView(
params.min_size = min_size_for_auto_resize();
params.max_size = max_size_for_auto_resize();
GetResizeParams(&params.initial_size);
- if (!is_active_) {
- params.replicated_frame_state =
- static_cast<RenderFrameHostImpl*>(GetMainFrame())->frame_tree_node()
- ->current_replication_state();
- }
if (!Send(new ViewMsg_New(params)))
return false;
@@ -353,10 +350,12 @@ bool RenderViewHostImpl::CreateRenderView(
// Let our delegate know that we created a RenderView.
delegate_->RenderViewCreated(this);
- // Since this method creates the main RenderFrame in the renderer process,
+ // Since this method can create the main RenderFrame in the renderer process,
// set the proper state on its corresponding RenderFrameHost.
- RenderFrameHostImpl::FromID(GetProcess()->GetID(), main_frame_routing_id_)
- ->SetRenderFrameCreated(true);
+ if (main_frame_routing_id_ != MSG_ROUTING_NONE) {
+ RenderFrameHostImpl::FromID(GetProcess()->GetID(), main_frame_routing_id_)
+ ->SetRenderFrameCreated(true);
+ }
return true;
}
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/browser/site_per_process_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698