Chromium Code Reviews| Index: content/renderer/render_view_impl.cc |
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
| index 2b2b03b19a53f31c83889db35462897da5d601e0..d4d1c345e23a6d69e9f16a186ee0235e324fe1ff 100644 |
| --- a/content/renderer/render_view_impl.cc |
| +++ b/content/renderer/render_view_impl.cc |
| @@ -835,9 +835,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) |
| @@ -902,7 +899,11 @@ void RenderViewImpl::Initialize(RenderViewImplParams* params) { |
| ShouldUseAcceleratedFixedRootBackground(device_scale_factor_)); |
| ApplyWebPreferences(webkit_preferences_, webview()); |
| - webview()->initializeMainFrame(main_render_frame_.get()); |
| + main_render_frame_.reset( |
|
Charlie Reis
2013/09/27 19:19:21
nit: Add blank line before, now that we have a blo
awong
2013/09/27 20:50:09
Done.
|
| + 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); |