Make RenderFrame(Host) own a RenderWidget(Host).

content/renderer/render_frame_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 26 matching lines @@
 
 #if defined(OS_ANDROID)
 #include "content/renderer/media/android/renderer_media_player_manager.h"
 #endif
 
 class GURL;
 class TransportDIB;
 struct FrameHostMsg_AddNavigationTransitionData_Params;
 struct FrameMsg_Navigate_Params;
 struct FrameMsg_RequestNavigation_Params;
+struct FrameMsg_NewFrame_WidgetParams;

[Charlie Reis, 2014/12/18 18:04:14]

nit: Alphabetize

[kenrb, 2015/01/05 21:15:31]

Done.

 
 namespace blink {
 class WebGeolocationClient;
 class WebMouseEvent;
 class WebContentDecryptionModule;
 class WebMediaPlayer;
 class WebPushClient;
 class WebSecurityOrigin;
 struct WebCompositionUnderline;
 struct WebContextMenuData;
@@ skipping 54 matching lines @@
   // identified by |parent_routing_id| or as the top-level frame if the latter
   // is MSG_ROUTING_NONE. If |proxy_routing_id| is MSG_ROUTING_NONE, it creates
   // the Blink WebLocalFrame and inserts it in the proper place in the frame
   // tree. Otherwise, the frame is semi-orphaned until it commits, at which
   // point it replaces the proxy identified by |proxy_routing_id|.
   // Note: This is called only when RenderFrame is being created in response to
   // IPC message from the browser process. All other frame creation is driven
   // through Blink and Create.
   static void CreateFrame(int routing_id,
                           int parent_routing_id,
-                          int proxy_routing_id);
+                          int proxy_routing_id,
+                          const FrameMsg_NewFrame_WidgetParams& params);
 
   // Returns the RenderFrameImpl for the given routing ID.
   static RenderFrameImpl* FromRoutingID(int routing_id);
 
   // Just like RenderFrame::FromWebFrame but returns the implementation.
   static RenderFrameImpl* FromWebFrame(blink::WebFrame* web_frame);
 
   // Used by content_layouttest_support to hook into the creation of
   // RenderFrameImpls.
   using CreateRenderFrameImplFunction = RenderFrameImpl* (*)(RenderViewImpl*,
@@ skipping 580 matching lines @@
   // RenderFrame. See https://crbug.com/357747.
   RenderFrameProxy* render_frame_proxy_;
   bool is_detaching_;
 
   // If this frame was created to replace a proxy, this will store the routing
   // id of the proxy to replace at commit-time, at which time it will be
   // cleared.
   // TODO(creis): Remove this after switching to PlzNavigate.
   int proxy_routing_id_;
 
+  // Used when the RenderFrame is a local frame root; for now RenderWidgets are

[nasko, 2014/12/17 22:51:30]

nit: s/local frame root/local root/

[Charlie Reis, 2014/12/18 18:04:14]

nit: Split into two sentences rather than using a semicolon (since it's long and
complex).

[kenrb, 2015/01/05 21:15:31]

Done.

+  // added only when a child frame is in a different process from its parent
+  // frame, but eventually this will also apply to top-level frames.
+  // FIXME(kenrb): Correct the above statement when top-level frames have their

[nasko, 2014/12/17 22:51:30]

nit: s/FIXME/TODO/

[kenrb, 2015/01/05 21:15:31]

Done.

+  // own RenderWidgets.
+  scoped_refptr<RenderWidget> render_widget_;
+
 #if defined(ENABLE_PLUGINS)
   // Current text input composition text. Empty if no composition is in
   // progress.
   base::string16 pepper_composition_text_;
 
   PluginPowerSaverHelper* plugin_power_saver_helper_;
 #endif
 
   RendererWebCookieJarImpl cookie_jar_;
 
@@ skipping 95 matching lines @@
 #endif
 
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_