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

content/renderer/render_widget.h

 // Copyright (c) 2012 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_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 
 #include <deque>
 #include <map>
 
@@ skipping 36 matching lines @@
 struct ViewMsg_Resize_Params;
 class ViewHostMsg_UpdateRect;
 
 namespace IPC {
 class SyncMessage;
 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 {
 struct InputHandlerScrollResult;
 class OutputSurface;
 class SwapPromise;
 }
 
 namespace gfx {
 class Range;
@@ skipping 20 matching lines @@
       NON_EXPORTED_BASE(virtual public blink::WebWidgetClient),
       public base::RefCounted<RenderWidget> {
  public:
   // Creates a new RenderWidget.  The opener_id is the routing ID of the
   // RenderView that this widget lives inside.
   static RenderWidget* Create(int32 opener_id,
                               CompositorDependencies* compositor_deps,
                               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);
 
   int32 routing_id() const { return routing_id_; }
   int32 surface_id() const { return surface_id_; }
   CompositorDependencies* compositor_deps() const { return compositor_deps_; }
   blink::WebWidget* webwidget() const { return webwidget_; }
   gfx::Size size() const { return size_; }
   bool has_focus() const { return has_focus_; }
   bool is_fullscreen() const { return is_fullscreen_; }
   bool is_hidden() const { return is_hidden_; }
   bool handling_input_event() const { return handling_input_event_; }
   // Temporary for debugging purposes...
   bool closing() const { return closing_; }
   bool is_swapped_out() { return is_swapped_out_; }
   ui::MenuSourceType context_menu_source_type() {
     return context_menu_source_type_;
   }
   bool has_host_context_menu_location() {
     return has_host_context_menu_location_;
   }
   gfx::Point host_context_menu_location() {
     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);
 
   // Functions to track all RenderFrame objects associated with this
   // RenderWidget.
   void RegisterRenderFrame(RenderFrameImpl* frame);
   void UnregisterRenderFrame(RenderFrameImpl* frame);
 
 #if defined(VIDEO_HOLE)
@@ skipping 651 matching lines @@
   ui::MenuSourceType context_menu_source_type_;
   bool has_host_context_menu_location_;
   gfx::Point host_context_menu_location_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_