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

content/renderer/render_widget.cc

 // 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.
 
 #include "content/renderer/render_widget.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 430 matching lines @@
   DCHECK(opener_id != MSG_ROUTING_NONE);
   scoped_refptr<RenderWidget> widget(
       new RenderWidget(popup_type, screen_info, false, false, false));
   if (widget->Init(opener_id)) {  // adds reference on success.
     return widget.get();
   }
   return NULL;
 }
 
 // static
+RenderWidget* RenderWidget::CreateForFrame(
+    int routing_id, bool hidden, const blink::WebScreenInfo& screen_info) {

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

style: params need to be on separate lines each

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

Done.

+  DCHECK(routing_id != MSG_ROUTING_NONE);
+  scoped_refptr<RenderWidget> widget(
+      new RenderWidget(blink::WebPopupTypeNone,
+                       screen_info,
+                       false,
+                       hidden,
+                       false));
+  widget->routing_id_ = routing_id;
+  //TODO(kenrb): Change CreateWebWidget to CreateWebFrameWidget before landing!
+  if (widget->DoInit(MSG_ROUTING_NONE,
+                     RenderWidget::CreateWebWidget(widget.get()),
+                     0))

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

nit: s/0/nullptr/

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

Done.

+    return widget.get();

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

style: {} needed because the if clause spans multiple lines

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

Done.

+  return NULL;
+}
+
+// static
 WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) {
   switch (render_widget->popup_type_) {
     case blink::WebPopupTypeNone:  // Nothing to create.
       break;
     case blink::WebPopupTypeSelect:
     case blink::WebPopupTypeSuggestion:
       return WebPopupMenu::create(render_widget);
     case blink::WebPopupTypePage:
       return WebPagePopup::create(render_widget);
     default:
@@ skipping 12 matching lines @@
 bool RenderWidget::DoInit(int32 opener_id,
                           WebWidget* web_widget,
                           IPC::SyncMessage* create_widget_message) {
   DCHECK(!webwidget_);
 
   if (opener_id != MSG_ROUTING_NONE)
     opener_id_ = opener_id;
 
   webwidget_ = web_widget;
 
-  bool result = RenderThread::Get()->Send(create_widget_message);
+  bool result = true;
+  if (create_widget_message)
+    result = RenderThread::Get()->Send(create_widget_message);
+
   if (result) {
     RenderThread::Get()->AddRoute(routing_id_, this);
     // Take a reference on behalf of the RenderThread.  This will be balanced
     // when we receive ViewMsg_Close.
     AddRef();
     if (RenderThreadImpl::current()) {
       RenderThreadImpl::current()->WidgetCreated();
       if (is_hidden_)
         RenderThreadImpl::current()->WidgetHidden();
     }
@@ skipping 1687 matching lines @@
 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) {
   video_hole_frames_.AddObserver(frame);
 }
 
 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) {
   video_hole_frames_.RemoveObserver(frame);
 }
 #endif  // defined(VIDEO_HOLE)
 
 }  // namespace content