| 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..750e62baf3ed3a4afc4bbc5d4fecbd9c659bd369 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,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);
|
|
|