| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 0e2189151a474775131a77c13fd679a8149e501b..7bcff2120e2e9fc8ea8ec348cde5ce26f961fc4f 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -820,8 +820,9 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
|
| }
|
|
|
| void RenderViewImpl::Initialize(RenderViewImplParams* params) {
|
| - main_render_frame_.reset(new RenderFrameImpl(
|
| - this, params->main_frame_routing_id));
|
| + RenderFrameImpl* main_frame = RenderFrameImpl::Create(
|
| + this, params->main_frame_routing_id);
|
| + main_render_frame_.reset(main_frame);
|
|
|
| #if defined(ENABLE_PLUGINS)
|
| pepper_helper_.reset(new PepperPluginDelegateImpl(this));
|
| @@ -899,7 +900,7 @@ void RenderViewImpl::Initialize(RenderViewImplParams* params) {
|
| ShouldUseTransitionCompositing(device_scale_factor_));
|
|
|
| webkit_glue::ApplyWebPreferences(webkit_preferences_, webview());
|
| - webview()->initializeMainFrame(this);
|
| + webview()->initializeMainFrame(main_render_frame_.get());
|
|
|
| if (switches::IsTouchDragDropEnabled())
|
| webview()->settings()->setTouchDragDropEnabled(true);
|
| @@ -2264,7 +2265,7 @@ bool RenderViewImpl::enumerateChosenDirectory(
|
|
|
| void RenderViewImpl::initializeHelperPluginWebFrame(
|
| WebKit::WebHelperPlugin* plugin) {
|
| - plugin->initializeFrame(this);
|
| + plugin->initializeFrame(main_render_frame_.get());
|
| }
|
|
|
| void RenderViewImpl::didStartLoading() {
|
|
|