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

content/browser/frame_host/render_frame_host_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_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 33 matching lines @@
 namespace content {
 
 class CrossProcessFrameConnector;
 class CrossSiteTransferringRequest;
 class FrameTree;
 class FrameTreeNode;
 class RenderFrameHostDelegate;
 class RenderFrameProxyHost;
 class RenderProcessHost;
 class RenderViewHostImpl;
+class RenderWidgetHostDelegate;
 class RenderWidgetHostImpl;
 struct ContextMenuParams;
 struct GlobalRequestID;
 struct Referrer;
 struct ShowDesktopNotificationHostMsgParams;
 struct TransitionLayerData;
 
 class CONTENT_EXPORT RenderFrameHostImpl
     : public RenderFrameHost,
       public BrowserAccessibilityDelegate {
@@ skipping 57 matching lines @@
   // after they are blocked in RenderWidgetHelper::CreateNewWindow.
   void Init();
 
   int routing_id() const { return routing_id_; }
   void OnCreateChildFrame(int new_routing_id,
                           const std::string& frame_name);
 
   RenderViewHostImpl* render_view_host() { return render_view_host_; }
   RenderFrameHostDelegate* delegate() { return delegate_; }
   FrameTreeNode* frame_tree_node() { return frame_tree_node_; }
+
+  void CreateRenderWidgetHost(RenderWidgetHostDelegate* delegate,

[Charlie Reis, 2014/10/01 17:01:08]

Please add a comment saying when this should be called, since we don't call it
for all frames.

[kenrb, 2014/10/01 19:27:51]

Done.

+                              bool hidden);
   // TODO(nasko): The RenderWidgetHost will be owned by RenderFrameHost in

[Charlie Reis, 2014/10/01 17:01:08]

Can we update this comment now?

[kenrb, 2014/10/01 19:27:51]

Done.

   // the future, so update this accessor to return the right pointer.
   RenderWidgetHostImpl* GetRenderWidgetHost();
 
   // This function is called when this is a swapped out RenderFrameHost that
   // lives in the same process as the parent frame. The
   // |cross_process_frame_connector| allows the non-swapped-out
   // RenderFrameHost for a frame to communicate with the parent process
   // so that it may composite drawing data.
   //
   // Ownership is not transfered.
@@ skipping 289 matching lines @@
   // The FrameTreeNode which this RenderFrameHostImpl is hosted in.
   FrameTreeNode* frame_tree_node_;
 
   // The mapping of pending JavaScript calls created by
   // ExecuteJavaScript and their corresponding callbacks.
   std::map<int, JavaScriptResultCallback> javascript_callbacks_;
 
   // Map from notification_id to a callback to cancel them.
   std::map<int, base::Closure> cancel_notification_callbacks_;
 
+  // RenderFrameHosts that need management of the rendering and input events
+  // for their frame subtrees require RenderWidgetHosts. This typically
+  // means main frames and frames that are rendered in different processes from

[Charlie Reis, 2014/10/01 17:01:08]

We don't use this for the main frame, do we?  Aren't we using the RVH as our
widget in that case?

[kenrb, 2014/10/01 19:27:51]

We will, but not yet. I have changed it accordingly.

+  // their parent frames.
+  scoped_ptr<RenderWidgetHostImpl> render_widget_host_impl_;

[nasko, 2014/10/01 16:37:14]

nit: it might be shorter to just drop the "impl_" part of the name, we know we
are inside content and deal with the impl classes.

[kenrb, 2014/10/01 19:27:51]

Ok.

+
   int routing_id_;
   bool is_swapped_out_;
   bool renderer_initialized_;
 
   // Whether we should buffer outgoing Navigate messages rather than sending
   // them. This will be true when a RenderFrameHost is created for a cross-site
   // request, until we hear back from the onbeforeunload handler of the old
   // RenderFrameHost.
   bool navigations_suspended_;
 
@@ skipping 17 matching lines @@
   base::Callback<void(ui::AXEvent, int)> accessibility_testing_callback_;
   // The most recently received accessibility tree - for testing only.
   scoped_ptr<ui::AXTree> ax_tree_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_