Move ViewHostMsg_CreateWidget to mojom

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 <memory>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 11 matching lines @@
 #include "base/sys_info.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_synthetic_delay.h"
 #include "build/build_config.h"
 #include "cc/output/compositor_frame_sink.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "content/common/content_switches_internal.h"
 #include "content/common/input/synthetic_gesture_packet.h"
 #include "content/common/input_messages.h"
+#include "content/common/render_message_filter.mojom.h"
 #include "content/common/swapped_out_messages.h"
 #include "content/common/text_input_state.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/renderer/cursor_utils.h"
 #include "content/renderer/devtools/render_widget_screen_metrics_emulator.h"
 #include "content/renderer/external_popup_menu.h"
 #include "content/renderer/gpu/frame_swap_message_queue.h"
@@ skipping 275 matching lines @@
           ? g_create_render_widget(compositor_deps, blink::WebPopupTypeNone,
                                    screen_info, false, hidden, false)
           : new RenderWidget(compositor_deps, blink::WebPopupTypeNone,
                              screen_info, false, hidden, false));
   widget->SetRoutingID(routing_id);
   widget->for_oopif_ = true;
   // DoInit increments the reference count on |widget|, keeping it alive after
   // this function returns.
   if (widget->DoInit(MSG_ROUTING_NONE,
                      RenderWidget::CreateWebFrameWidget(widget.get(), frame),
-                     nullptr)) {
+                     CreateWidgetCallback())) {
     if (g_render_widget_initialized)
       g_render_widget_initialized(widget.get());
     return widget.get();
   }
   return nullptr;
 }
 
 // static
 blink::WebFrameWidget* RenderWidget::CreateWebFrameWidget(
     RenderWidget* render_widget,
@@ skipping 36 matching lines @@
 
   // If we are swapping out, we will call ReleaseProcess, allowing the process
   // to exit if all of its RenderViews are swapped out.  We wait until the
   // WasSwappedOut call to do this, to allow the unload handler to finish.
   // If we are swapping in, we call AddRefProcess to prevent the process from
   // exiting.
   if (!is_swapped_out_)
     RenderProcess::current()->AddRefProcess();
 }
 
+bool RenderWidget::CreateWidget(int32_t opener_id,
+                                blink::WebPopupType popup_type,
+                                int32_t* routing_id) {
+  RenderThreadImpl::current_render_message_filter()->CreateNewWidget(
+      opener_id, popup_type, routing_id);
+  return true;
+}
+
 bool RenderWidget::Init(int32_t opener_id) {
-  bool success = DoInit(
-      opener_id, RenderWidget::CreateWebWidget(this),
-      new ViewHostMsg_CreateWidget(opener_id, popup_type_, &routing_id_));
+  bool success = DoInit(opener_id, RenderWidget::CreateWebWidget(this),
+      base::Bind(&RenderWidget::CreateWidget, base::Unretained(this),
+           opener_id, popup_type_, &routing_id_));
   if (success) {
     SetRoutingID(routing_id_);
     return true;
   }
   return false;
 }
 
 bool RenderWidget::DoInit(int32_t opener_id,
                           WebWidget* web_widget,
-                          IPC::SyncMessage* create_widget_message) {
+                          CreateWidgetCallback create_widget_callback) {
   DCHECK(!webwidget_internal_);
 
   if (opener_id != MSG_ROUTING_NONE)
     opener_id_ = opener_id;
 
   webwidget_internal_ = web_widget;
   webwidget_mouse_lock_target_.reset(
       new WebWidgetLockTarget(webwidget_internal_));
   mouse_lock_dispatcher_.reset(new RenderWidgetMouseLockDispatcher(this));
 
   bool result = true;
-  if (create_widget_message)
-    result = RenderThread::Get()->Send(create_widget_message);
+  if (!create_widget_callback.is_null())
+    result = std::move(create_widget_callback).Run();
 
   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 1667 matching lines @@
 bool RenderWidget::isPointerLocked() {
   return mouse_lock_dispatcher_->IsMouseLockedTo(
       webwidget_mouse_lock_target_.get());
 }
 
 blink::WebWidget* RenderWidget::GetWebWidget() const {
   return webwidget_internal_;
 }
 
 }  // namespace content