Merge 251963 "[Android] Use DIP coordinates for GestureFlingStar..."

webkit/child/fling_animator_impl_android.cc

Index: webkit/child/fling_animator_impl_android.cc
===================================================================
--- webkit/child/fling_animator_impl_android.cc	(revision 252975)
+++ webkit/child/fling_animator_impl_android.cc	(working copy)
@@ -53,10 +53,14 @@
 
   JNIEnv* env = base::android::AttachCurrentThread();
 
+  // The OverScroller deceleration constants work in pixel space.  DIP scaling
+  // will be performed in |apply()| on the generated fling updates.
+  float dpi_scale = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay()
+      .device_scale_factor();
   JNI_OverScroller::Java_OverScroller_flingV_I_I_I_I_I_I_I_I(
       env, java_scroller_.obj(), 0, 0,
-      static_cast<int>(velocity.x()),
-      static_cast<int>(velocity.y()),
+      static_cast<int>(velocity.x() * dpi_scale),
+      static_cast<int>(velocity.y() * dpi_scale),
       INT_MIN, INT_MAX, INT_MIN, INT_MAX);
 }
 
@@ -108,7 +112,7 @@
   float dpi_scale = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay()
       .device_scale_factor();
   blink::WebFloatSize scroll_amount(diff.x() / dpi_scale,
-                                     diff.y() / dpi_scale);
+                                    diff.y() / dpi_scale);
 
   float delta_time = time - last_time_;
   last_time_ = time;
@@ -128,7 +132,7 @@
   }
   last_velocity_ = current_velocity;
   blink::WebFloatSize fling_velocity(current_velocity.x() / dpi_scale,
-                                      current_velocity.y() / dpi_scale);
+                                     current_velocity.y() / dpi_scale);
   target->notifyCurrentFlingVelocity(fling_velocity);
 
   // scrollBy() could delete this curve if the animation is over, so don't touch