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 6ed389874e60ad69ec852668995aa31df13d0745..1097fcedebce3294f84882b773ae3b7ad80531ac 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_android.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
@@ -216,7 +216,6 @@ bool RenderWidgetHostViewAndroid::OnMessageReceived( |
IPC_MESSAGE_HANDLER(ViewHostMsg_StartContentIntent, OnStartContentIntent) |
IPC_MESSAGE_HANDLER(ViewHostMsg_DidChangeBodyBackgroundColor, |
OnDidChangeBodyBackgroundColor) |
- IPC_MESSAGE_HANDLER(ViewHostMsg_DidOverscroll, OnDidOverscroll) |
IPC_MESSAGE_HANDLER(ViewHostMsg_SetNeedsBeginFrame, |
OnSetNeedsBeginFrame) |
IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputStateChanged, |
@@ -518,25 +517,6 @@ void RenderWidgetHostViewAndroid::OnDidChangeBodyBackgroundColor( |
content_view_core_->OnBackgroundColorChanged(color); |
} |
-void RenderWidgetHostViewAndroid::OnDidOverscroll( |
- const DidOverscrollParams& params) { |
- if (!content_view_core_ || !layer_ || !is_showing_) |
- return; |
- |
- const float device_scale_factor = content_view_core_->GetDpiScale(); |
- if (overscroll_effect_->OnOverscrolled( |
- content_view_core_->GetLayer(), |
- base::TimeTicks::Now(), |
- 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))) { |
- SetNeedsAnimate(); |
- } |
-} |
- |
void RenderWidgetHostViewAndroid::OnSetNeedsBeginFrame(bool enabled) { |
if (enabled == needs_begin_frame_) |
return; |
@@ -1242,6 +1222,25 @@ SkColor RenderWidgetHostViewAndroid::GetCachedBackgroundColor() const { |
return cached_background_color_; |
} |
+void RenderWidgetHostViewAndroid::DidOverscroll( |
+ const DidOverscrollParams& params) { |
+ if (!content_view_core_ || !layer_ || !is_showing_) |
+ return; |
+ |
+ const float device_scale_factor = content_view_core_->GetDpiScale(); |
+ if (overscroll_effect_->OnOverscrolled( |
+ content_view_core_->GetLayer(), |
+ base::TimeTicks::Now(), |
+ 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))) { |
+ SetNeedsAnimate(); |
+ } |
+} |
+ |
void RenderWidgetHostViewAndroid::DidStopFlinging() { |
if (content_view_core_) |
content_view_core_->DidStopFlinging(); |