Remove final RenderWidgetHostImpl dependency from OverscrollController

content/browser/renderer_host/overscroll_controller.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/overscroll_controller.h"
 
+#include "base/logging.h"
 #include "content/browser/renderer_host/overscroll_controller_delegate.h"
-#include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/public/browser/overscroll_configuration.h"
-#include "content/public/browser/render_widget_host_view.h"
 
 using WebKit::WebInputEvent;
 
 namespace content {
 
-OverscrollController::OverscrollController(
-    RenderWidgetHostImpl* render_widget_host)
-    : render_widget_host_(render_widget_host),
-      overscroll_mode_(OVERSCROLL_NONE),
+OverscrollController::OverscrollController()
+    : overscroll_mode_(OVERSCROLL_NONE),
       scroll_state_(STATE_UNKNOWN),
       overscroll_delta_x_(0.f),
       overscroll_delta_y_(0.f),
       delegate_(NULL) {
 }
 
 OverscrollController::~OverscrollController() {
 }
 
 OverscrollController::Disposition OverscrollController::DispatchEvent(
@@ skipping 108 matching lines @@
   if (overscroll_mode_ == OVERSCROLL_NONE)
     return false;
 
   // Complete the overscroll gesture if there was a mouse move or a scroll-end
   // after the threshold.
   if (event.type != WebKit::WebInputEvent::MouseMove &&
       event.type != WebKit::WebInputEvent::GestureScrollEnd &&
       event.type != WebKit::WebInputEvent::GestureFlingStart)
     return false;
 
-  RenderWidgetHostView* view = render_widget_host_->GetView();
-  if (!view->IsShowing())
+  if (!delegate_)

[jdduke (slow), 2013/10/21 19:56:53]

Are there cases where we want to process overscroll without a valid |delegate_|?
 I would think |delegate_|'s lifetime here is closely associated with the view?
This may be a change in behavior we don't want, but it's hard for me to say
without knowing more.

[sadrul, 2013/10/21 23:28:35]

There shouldn't be such cases. This can probably be replaced with a
DCHECK(delegate_);

[jdduke (slow), 2013/10/22 15:15:58]

Done.

     return false;
 
-  const gfx::Rect& bounds = view->GetViewBounds();
+  gfx::Rect bounds = delegate_->GetVisibleBounds();
   if (bounds.IsEmpty())
     return false;
 
   if (event.type == WebKit::WebInputEvent::GestureFlingStart) {
     // Check to see if the fling is in the same direction of the overscroll.
     const WebKit::WebGestureEvent gesture =
         static_cast<const WebKit::WebGestureEvent&>(event);
     switch (overscroll_mode_) {
       case OVERSCROLL_EAST:
         if (gesture.data.flingStart.velocityX < 0)
@@ skipping 193 matching lines @@
   overscroll_mode_ = mode;
   if (overscroll_mode_ == OVERSCROLL_NONE)
     overscroll_delta_x_ = overscroll_delta_y_ = 0.f;
   else
     scroll_state_ = STATE_OVERSCROLLING;
   if (delegate_)
     delegate_->OnOverscrollModeChange(old_mode, overscroll_mode_);
 }
 
 }  // namespace content