Chromium Code Reviews| Index: content/browser/renderer_host/overscroll_controller.cc |
| diff --git a/content/browser/renderer_host/overscroll_controller.cc b/content/browser/renderer_host/overscroll_controller.cc |
| index e65cfcf348e4c3c9d4da8c920344bc72bb1a98f1..069c4f18669b0f604fcacf0a4fb7140ef13b8c5f 100644 |
| --- a/content/browser/renderer_host/overscroll_controller.cc |
| +++ b/content/browser/renderer_host/overscroll_controller.cc |
| @@ -4,19 +4,16 @@ |
| #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), |
| @@ -145,11 +142,10 @@ bool OverscrollController::DispatchEventCompletesAction ( |
| 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 overscrol
sadrul
2013/10/21 23:28:35
There shouldn't be such cases. This can probably b
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; |