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

content/renderer/render_widget.h

Index: content/renderer/render_widget.h
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 093ea8d9379b79d39d31bb6033ed5f7cd5d3d189..f94fa1a0fcf40e6892f2b35db444ed25b911b657 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -54,12 +54,15 @@ class SyncMessageFilter;
 
 namespace blink {
 struct WebDeviceEmulationParams;
+class WebFrameWidget;
 class WebGestureEvent;
 class WebKeyboardEvent;
+class WebLocalFrame;
 class WebMouseEvent;
 class WebNode;
 struct WebPoint;
 class WebTouchEvent;
+class WebView;
 }
 
 namespace cc {
@@ -100,6 +103,17 @@ class CONTENT_EXPORT RenderWidget
                               blink::WebPopupType popup_type,
                               const blink::WebScreenInfo& screen_info);
 
+  // Creates a new RenderWidget that will be attached to a RenderFrame.
+  static RenderWidget* CreateForFrame(int routing_id,
+                                      int surface_id,
+                                      bool hidden,
+                                      const blink::WebScreenInfo& screen_info,
+                                      CompositorDependencies* compositor_deps,
+                                      blink::WebLocalFrame* frame);
+
+  static blink::WebWidget* CreateWebFrameWidget(RenderWidget* render_widget,
+                                                blink::WebLocalFrame* frame);
+
   // Creates a WebWidget based on the popup type.
   static blink::WebWidget* CreateWebWidget(RenderWidget* render_widget);
 
@@ -125,6 +139,9 @@ class CONTENT_EXPORT RenderWidget
     return host_context_menu_location_;
   }
 
+  // ScreenInfo exposed so it can be passed to subframe RenderWidgets.
+  blink::WebScreenInfo screen_info() const { return screen_info_; }
+
   // Functions to track out-of-process frames for special notifications.
   void RegisterRenderFrameProxy(RenderFrameProxy* proxy);
   void UnregisterRenderFrameProxy(RenderFrameProxy* proxy);