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

Unified Diff: content/renderer/render_view_impl.cc

Issue 25503004: Create a new RenderFrameHost per child frame when --site-per-process is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move global map insert/erase behind the flag. Created 7 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
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 6f4f90870915b5e2290a047811d99645bf84a447..bdc108994632706ba23cdbd9d4fddc4860a52bdd 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -833,9 +833,6 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
}
void RenderViewImpl::Initialize(RenderViewImplParams* params) {
- RenderFrameImpl* main_frame = RenderFrameImpl::Create(
- this, params->main_frame_routing_id);
- main_render_frame_.reset(main_frame);
routing_id_ = params->routing_id;
surface_id_ = params->surface_id;
if (params->opener_id != MSG_ROUTING_NONE && params->is_renderer_created)
@@ -900,7 +897,12 @@ void RenderViewImpl::Initialize(RenderViewImplParams* params) {
ShouldUseAcceleratedFixedRootBackground(device_scale_factor_));
ApplyWebPreferences(webkit_preferences_, webview());
- webview()->initializeMainFrame(main_render_frame_.get());
+
+ main_render_frame_.reset(
+ RenderFrameImpl::Create(this, params->main_frame_routing_id));
+ // The main frame WebFrame object is closed by
+ // RenderViewImpl::frameDetached().
+ webview()->setMainFrame(WebFrame::create(main_render_frame_.get()));
if (switches::IsTouchDragDropEnabled())
webview()->settings()->setTouchDragDropEnabled(true);

Powered by Google App Engine
This is Rietveld 408576698