Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 8f613a3e0a929e8139f5d71557d2e9444d828b02..f7eaccf6f4b866695d4bb6f9bf64811f19534c31 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -809,8 +809,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)); |
@@ -886,7 +887,8 @@ void RenderViewImpl::Initialize(RenderViewImplParams* params) { |
ShouldUseTransitionCompositing(device_scale_factor_)); |
webkit_glue::ApplyWebPreferences(webkit_preferences_, webview()); |
- webview()->initializeMainFrame(this); |
+ webview()->initializeMainFrame(main_render_frame_.get()); |
+ //webview()->initializeMainFrame(this); |
jochen (gone - plz use gerrit)
2013/06/19 16:09:28
nit. just delete this
nasko
2013/06/19 17:15:03
Done.
|
if (switches::IsTouchDragDropEnabled()) |
webview()->settings()->setTouchDragDropEnabled(true); |
@@ -2253,7 +2255,7 @@ bool RenderViewImpl::enumerateChosenDirectory( |
void RenderViewImpl::initializeHelperPluginWebFrame( |
WebKit::WebHelperPlugin* plugin) { |
- plugin->initializeFrame(this); |
+ plugin->initializeFrame(main_render_frame_.get()); |
} |
void RenderViewImpl::didStartLoading() { |