[Android] Use DIP coordinates with MotionEventAndroid

ui/events/gesture_detection/scale_gesture_detector.cc

 // Copyright 2014 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 "ui/events/gesture_detection/scale_gesture_detector.h"
 
 #include <limits.h>
 #include <cmath>
 
 #include "base/float_util.h"
 #include "base/logging.h"
 #include "ui/events/gesture_detection/motion_event.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 namespace ui {
 namespace {
 
+// Using a small epsilon when comparing slop distances allows pixel perfect
+// slop determination when using fractional DPI coordinates (assuming the slop
+// region and DPI scale are reasonably proportioned).
+const float kSlopEpsilon = .05f;
+
 const int kTouchStabilizeTimeMs = 128;
 
 const float kScaleFactor = .5f;
 
 }  // namespace
 
 // Note: These constants were taken directly from the default (unscaled)
 // versions found in Android's ViewConfiguration.
 ScaleGestureDetector::Config::Config()
-    : quick_scale_enabled(true),
-      min_scaling_touch_major(48),
-      min_scaling_span(200) {}
+    : min_scaling_touch_major(48),
+      min_scaling_span(200),
+      quick_scale_enabled(true) {}
 
 ScaleGestureDetector::Config::~Config() {}
 
 bool ScaleGestureDetector::SimpleScaleGestureListener::OnScale(
     const ScaleGestureDetector&, const MotionEvent&) {
   return false;
 }
 
 bool ScaleGestureDetector::SimpleScaleGestureListener::OnScaleBegin(
     const ScaleGestureDetector&, const MotionEvent&) {
@@ skipping 23 matching lines @@
       touch_upper_(0),
       touch_lower_(0),
       touch_history_last_accepted_(0),
       touch_history_direction_(0),
       touch_min_major_(0),
       double_tap_focus_x_(0),
       double_tap_focus_y_(0),
       double_tap_mode_(DOUBLE_TAP_MODE_NONE),
       event_before_or_above_starting_gesture_event_(false) {
   DCHECK(listener_);
-  span_slop_ = config.gesture_detector_config.scaled_touch_slop * 2;
+  span_slop_ =
+      (config.gesture_detector_config.touch_slop + kSlopEpsilon) * 2;
   touch_min_major_ = config.min_scaling_touch_major;
-  min_span_ = config.min_scaling_span;
+  min_span_ = config.min_scaling_span + kSlopEpsilon;
   SetQuickScaleEnabled(config.quick_scale_enabled);
 }
 
 ScaleGestureDetector::~ScaleGestureDetector() {}
 
 bool ScaleGestureDetector::OnTouchEvent(const MotionEvent& event) {
   curr_time_ = event.GetEventTime();
 
   const int action = event.GetAction();
 
@@ skipping 104 matching lines @@
     in_progress_ = false;
     initial_span_ = span;
     double_tap_mode_ = DOUBLE_TAP_MODE_NONE;
   }
   if (config_changed) {
     prev_span_x_ = curr_span_x_ = span_x;
     prev_span_y_ = curr_span_y_ = span_y;
     initial_span_ = prev_span_ = curr_span_ = span;
   }
 
-  const int min_span = InDoubleTapMode() ? span_slop_ : min_span_;
+  const float min_span = InDoubleTapMode() ? span_slop_ : min_span_;
   if (!in_progress_ && span >= min_span &&
       (was_in_progress || std::abs(span - initial_span_) > span_slop_)) {
     prev_span_x_ = curr_span_x_ = span_x;
     prev_span_y_ = curr_span_y_ = span_y;
     prev_span_ = curr_span_ = span;
     prev_time_ = curr_time_;
     in_progress_ = listener_->OnScaleBegin(*this, event);
   }
 
   // Handle motion; focal point and span/scale factor are changing.
@@ skipping 146 matching lines @@
 
 void ScaleGestureDetector::ClearTouchHistory() {
   touch_upper_ = std::numeric_limits<float>::quiet_NaN();
   touch_lower_ = std::numeric_limits<float>::quiet_NaN();
   touch_history_last_accepted_ = std::numeric_limits<float>::quiet_NaN();
   touch_history_direction_ = 0;
   touch_history_last_accepted_time_ = base::TimeTicks();
 }
 
 }  // namespace ui