Separate RenderViewHost from RenderWidgetHost, part 5: move calls to the RenderWidgetHostDelegate.

content/browser/renderer_host/render_widget_host_impl.cc

Index: content/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index cc7def8580adc072b2a0119b72d1e6b8d12fdabf..ba28d82caff30c36ede13224e9baed558de7f65b 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -565,7 +565,8 @@ bool RenderWidgetHostImpl::GetResizeParams(
   *resize_params = ViewMsg_Resize_Params();
 
   GetWebScreenInfo(&resize_params->screen_info);
-  resize_params->resizer_rect = GetRootWindowResizerRect();
+  if (delegate_)
+    resize_params->resizer_rect = delegate_->GetRootWindowResizerRect();
 
   if (view_) {
     resize_params->new_size = view_->GetRequestedRendererSize();
@@ -1096,7 +1097,8 @@ void RenderWidgetHostImpl::ForwardKeyboardEvent(
   if (key_event.type == WebKeyboardEvent::Char &&
       (key_event.windowsKeyCode == ui::VKEY_RETURN ||
        key_event.windowsKeyCode == ui::VKEY_SPACE)) {
-    OnUserGesture();
+    if (delegate_)
+      delegate_->OnUserGesture();
   }
 
   // Double check the type to make sure caller hasn't sent us nonsense that
@@ -1367,14 +1369,13 @@ void RenderWidgetHostImpl::ImeCancelComposition() {
             std::vector<blink::WebCompositionUnderline>(), 0, 0));
 }
 
-gfx::Rect RenderWidgetHostImpl::GetRootWindowResizerRect() const {
-  return gfx::Rect();
-}
-
 void RenderWidgetHostImpl::RequestToLockMouse(bool user_gesture,

[ncarter (slow), 2015/10/30 04:08:12]

Maybe inline this function? It's only got one caller; seems it only existed for
the sake of inheritance.

[Avi (use Gerrit), 2015/10/30 20:06:29]

Done.

                                               bool last_unlocked_by_target) {
-  // Directly reject to lock the mouse. Subclass can override this method to
-  // decide whether to allow mouse lock or not.
+  if (delegate_) {
+    delegate_->RequestToLockMouse(user_gesture, last_unlocked_by_target);
+    return;
+  }
+  // If there's no delegate, just reject it.
   GotResponseToLockMouseRequest(false);
 }
 
@@ -1432,13 +1433,15 @@ void RenderWidgetHostImpl::RendererIsUnresponsive() {
       Source<RenderWidgetHost>(this),
       NotificationService::NoDetails());
   is_unresponsive_ = true;
-  NotifyRendererUnresponsive();
+  if (delegate_)
+    delegate_->RendererUnresponsive(this);
 }
 
 void RenderWidgetHostImpl::RendererIsResponsive() {
   if (is_unresponsive_) {
     is_unresponsive_ = false;
-    NotifyRendererResponsive();
+    if (delegate_)
+      delegate_->RendererResponsive(this);
   }
 }
 
@@ -1852,7 +1855,8 @@ InputEventAckState RenderWidgetHostImpl::FilterInputEvent(
 
   if (event.type == WebInputEvent::MouseDown ||
       event.type == WebInputEvent::GestureTapDown) {
-    OnUserGesture();
+    if (delegate_)
+      delegate_->OnUserGesture();

[ncarter (slow), 2015/10/30 04:08:12]

This is a behavior change for non-view widgets. What are the implications?

For subframe widgets this looks like a bug fix as far as I can tell.

However, for popup widgets (or the fullscreen widget?), are there any
consequences? If there was an original intent to prevent this from happening for
for non-view widgets, do you know why?

   }
 
   if (delegate_) {
@@ -1986,10 +1990,6 @@ bool RenderWidgetHostImpl::IgnoreInputEvents() const {
   return ignore_input_events_ || process_->IgnoreInputEvents();
 }
 
-void RenderWidgetHostImpl::StartUserGesture() {

[ncarter (slow), 2015/10/30 04:08:12]

Nice find.

-  OnUserGesture();
-}
-
 void RenderWidgetHostImpl::SetBackgroundOpaque(bool opaque) {
   Send(new ViewMsg_SetBackgroundOpaque(GetRoutingID(), opaque));
 }
@@ -2070,7 +2070,8 @@ void RenderWidgetHostImpl::DelayedAutoResized() {
   if (!auto_resize_enabled_)
     return;
 
-  OnRenderAutoResized(new_size);
+  if (delegate_)
+    delegate_->ResizeDueToAutoResize(new_size);

[ncarter (slow), 2015/10/30 04:08:12]

So in theory, right, this would allow non-view widgets to notify the WebContents
of auto-size events. Which would be bad, except that auto resize happens only to
ever be enabled for view widgets. And that's why this is a safe transformation
to make now.

Do I have that right?

 }
 
 void RenderWidgetHostImpl::DetachDelegate() {