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

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

Issue 1412173006: Properly recreate swapped out RenderView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase on top of refactor. Created 5 years, 2 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
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 dc76abd1ca480a5bf233dff67dadbef6122dbfe5..b43007f59010a209e0f3d84f22dc2f27e67b5a41 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -1793,7 +1793,8 @@ scoped_ptr<RenderFrameHostImpl> RenderFrameHostManager::CreateRenderFrame(
// If we are reusing the RenderViewHost and it doesn't already have a
// RenderWidgetHostView, we need to create one if this is the main frame.
- if (!render_view_host->GetWidget()->GetView() &&
+ if (render_view_host->IsRenderViewLive() &&
+ !render_view_host->GetWidget()->GetView() &&
frame_tree_node_->IsMainFrame()) {
delegate_->CreateRenderWidgetHostViewForRenderManager(render_view_host);
}
@@ -1802,7 +1803,6 @@ scoped_ptr<RenderFrameHostImpl> RenderFrameHostManager::CreateRenderFrame(
// Create a new RenderFrameHost if we don't find an existing one.
int32 widget_routing_id = MSG_ROUTING_NONE;
- proxy = nullptr;
nasko 2015/10/22 23:48:09 This is the main part of this fix. When a proxy ex
// A RenderFrame in a different process from its parent RenderFrame
// requires a RenderWidget for input/layout/painting.
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698