Separate RenderViewHost from RenderWidgetHost, part 4: delegate

content/browser/renderer_host/render_widget_host_impl.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/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 #include <set>
 #include <utility>
 
@@ skipping 155 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostImpl
 
 RenderWidgetHostImpl::RenderWidgetHostImpl(RenderWidgetHostDelegate* delegate,
                                            RenderProcessHost* process,
                                            int32_t routing_id,
                                            bool hidden)
     : view_(NULL),
       renderer_initialized_(false),
       delegate_(delegate),
+      owner_delegate_(nullptr),
       process_(process),
       routing_id_(routing_id),
       is_loading_(false),
       is_hidden_(hidden),
       repaint_ack_pending_(false),
       resize_ack_pending_(false),
       color_profile_out_of_date_(false),
       auto_resize_enabled_(false),
       waiting_for_screen_rects_ack_(false),
       needs_repainting_on_restore_(false),
@@ skipping 32 matching lines @@
   if (!hidden)
     process_->WidgetRestored();
 
   latency_tracker_.Initialize(routing_id_, GetProcess()->GetID());
 
   input_router_.reset(new InputRouterImpl(
       process_, this, this, routing_id_, GetInputRouterConfigForPlatform()));
 
   touch_emulator_.reset();
 
-  RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
-      IsRenderView() ? RenderViewHost::From(this) : NULL);
-  if (BrowserPluginGuest::IsGuest(rvh) ||
-      !base::CommandLine::ForCurrentProcess()->HasSwitch(
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(

[ncarter (slow), 2015/10/26 18:35:02]

You fixed the glitch :)

[Avi (use Gerrit), 2015/10/26 19:41:28]

Yes.

           switches::kDisableHangMonitor)) {
     hang_monitor_timeout_.reset(new TimeoutMonitor(
         base::Bind(&RenderWidgetHostImpl::RendererIsUnresponsive,
                    weak_factory_.GetWeakPtr())));
   }
 
   new_content_rendering_timeout_.reset(new TimeoutMonitor(
       base::Bind(&RenderWidgetHostImpl::ClearDisplayedGraphics,
                  weak_factory_.GetWeakPtr())));
 }
@@ skipping 24 matching lines @@
     int32_t routing_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   RoutingIDWidgetMap* widgets = g_routing_id_widget_map.Pointer();
   RoutingIDWidgetMap::iterator it = widgets->find(
       RenderWidgetHostID(process_id, routing_id));
   return it == widgets->end() ? NULL : it->second;
 }
 
 // static
 scoped_ptr<RenderWidgetHostIterator> RenderWidgetHost::GetRenderWidgetHosts() {
-  RenderWidgetHostIteratorImpl* hosts = new RenderWidgetHostIteratorImpl();
-  RoutingIDWidgetMap* widgets = g_routing_id_widget_map.Pointer();
-  for (RoutingIDWidgetMap::const_iterator it = widgets->begin();
-       it != widgets->end();
-       ++it) {
-    RenderWidgetHost* widget = it->second;
+  scoped_ptr<RenderWidgetHostIteratorImpl> hosts(
+      new RenderWidgetHostIteratorImpl());
+  for (auto& it : g_routing_id_widget_map.Get()) {
+    RenderWidgetHost* widget = it.second;
 
-    if (!widget->IsRenderView()) {
+    RenderViewHost* rvh = RenderViewHost::From(widget);
+    if (!rvh) {
       hosts->Add(widget);
       continue;
     }
 
-    // Add only active RenderViewHosts.
-    RenderViewHost* rvh = RenderViewHost::From(widget);
+    // For RenderViewHosts, add only active ones.
     if (static_cast<RenderViewHostImpl*>(rvh)->is_active())
       hosts->Add(widget);
   }
 
-  return scoped_ptr<RenderWidgetHostIterator>(hosts);
+  return hosts.Pass();
 }
 
 // static
 scoped_ptr<RenderWidgetHostIterator>
 RenderWidgetHostImpl::GetAllRenderWidgetHosts() {
-  RenderWidgetHostIteratorImpl* hosts = new RenderWidgetHostIteratorImpl();
-  RoutingIDWidgetMap* widgets = g_routing_id_widget_map.Pointer();
-  for (RoutingIDWidgetMap::const_iterator it = widgets->begin();
-       it != widgets->end();
-       ++it) {
-    hosts->Add(it->second);
-  }
+  scoped_ptr<RenderWidgetHostIteratorImpl> hosts(
+      new RenderWidgetHostIteratorImpl());
+  for (auto& it : g_routing_id_widget_map.Get())
+    hosts->Add(it.second);
 
-  return scoped_ptr<RenderWidgetHostIterator>(hosts);
+  return hosts.Pass();
 }
 
 // static
 RenderWidgetHostImpl* RenderWidgetHostImpl::From(RenderWidgetHost* rwh) {
   return static_cast<RenderWidgetHostImpl*>(rwh);
 }
 
 void RenderWidgetHostImpl::SetView(RenderWidgetHostViewBase* view) {
   if (view)
     view_weak_ = view->GetWeakPtr();
@@ skipping 109 matching lines @@
     DCHECK(rv);
   }
 
   Destroy();
 }
 
 bool RenderWidgetHostImpl::IsLoading() const {
   return is_loading_;
 }
 
-bool RenderWidgetHostImpl::IsRenderView() const {

[ncarter (slow), 2015/10/26 18:35:02]

In a class that I once knew
lived the call IsRenderView()
But what a load of ballyhoo
It was to leak the layers through
So farewell, farewell, farewell, you:
I'll not forget how much you blew.

[Avi (use Gerrit), 2015/10/26 19:41:28]

Acknowledged.

-  return false;
-}
-
 bool RenderWidgetHostImpl::OnMessageReceived(const IPC::Message &msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostImpl, msg)
     IPC_MESSAGE_HANDLER(FrameHostMsg_RenderProcessGone, OnRenderProcessGone)
     IPC_MESSAGE_HANDLER(InputHostMsg_QueueSyntheticGesture,
                         OnQueueSyntheticGesture)
     IPC_MESSAGE_HANDLER(InputHostMsg_ImeCancelComposition,
                         OnImeCancelComposition)
     IPC_MESSAGE_HANDLER(ViewHostMsg_Close, OnClose)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateScreenRects_ACK,
@@ skipping 249 matching lines @@
     delegate_->RenderWidgetGotFocus(this);
 }
 
 void RenderWidgetHostImpl::Focus() {
   is_focused_ = true;
 
   Send(new InputMsg_SetFocus(routing_id_, true));
 
   // Also send page-level focus state to other SiteInstances involved in
   // rendering the current FrameTree.
-  if (IsRenderView() && delegate_)
+  if (RenderViewHost::From(this) && delegate_)
     delegate_->ReplicatePageFocus(true);
 }
 
 void RenderWidgetHostImpl::Blur() {
   is_focused_ = false;
 
   // If there is a pending mouse lock request, we don't want to reject it at
   // this point. The user can switch focus back to this view and approve the
   // request later.
   if (IsMouseLocked())
     view_->UnlockMouse();
 
   if (touch_emulator_)
     touch_emulator_->CancelTouch();
 
   Send(new InputMsg_SetFocus(routing_id_, false));
 
   // Also send page-level focus state to other SiteInstances involved in
   // rendering the current FrameTree.
-  if (IsRenderView() && delegate_)
+  if (RenderViewHost::From(this) && delegate_)
     delegate_->ReplicatePageFocus(false);
 }
 
 void RenderWidgetHostImpl::LostCapture() {
   if (touch_emulator_)
     touch_emulator_->CancelTouch();
 
   Send(new InputMsg_MouseCaptureLost(routing_id_));
 }
 
@@ skipping 1454 matching lines @@
 }
 
 #if defined(OS_WIN)
 gfx::NativeViewAccessible
     RenderWidgetHostImpl::GetParentNativeViewAccessible() {
   return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL;
 }
 #endif
 
 }  // namespace content