| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| index 51e5af05edc6f20a75cd93a695a66af99fd57e81..d924e9bb038d4d015e5a1e4ef267a9cef1d4cee6 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -1299,9 +1299,8 @@ SkColor RenderWidgetHostViewAndroid::GetCachedBackgroundColor() const {
|
| return cached_background_color_;
|
| }
|
|
|
| -void RenderWidgetHostViewAndroid::OnOverscrolled(
|
| - gfx::Vector2dF accumulated_overscroll,
|
| - gfx::Vector2dF current_fling_velocity) {
|
| +void RenderWidgetHostViewAndroid::DidOverscroll(
|
| + const DidOverscrollParams& params) {
|
| if (!content_view_core_ || !layer_ || !is_showing_)
|
| return;
|
|
|
| @@ -1309,8 +1308,12 @@ void RenderWidgetHostViewAndroid::OnOverscrolled(
|
| if (overscroll_effect_->OnOverscrolled(
|
| content_view_core_->GetLayer(),
|
| base::TimeTicks::Now(),
|
| - gfx::ScaleVector2d(accumulated_overscroll, device_scale_factor),
|
| - gfx::ScaleVector2d(current_fling_velocity, device_scale_factor))) {
|
| + gfx::ScaleVector2d(params.accumulated_overscroll,
|
| + device_scale_factor),
|
| + gfx::ScaleVector2d(params.latest_overscroll_delta,
|
| + device_scale_factor),
|
| + gfx::ScaleVector2d(params.current_fling_velocity,
|
| + device_scale_factor))) {
|
| content_view_core_->SetNeedsAnimate();
|
| }
|
| }
|
|
|