Support minimum gesture bounds in GestureProvider

content/browser/renderer_host/input/motion_event_android.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 "content/browser/renderer_host/input/motion_event_android.h"
 
 #include "base/android/jni_android.h"
 #include "jni/MotionEvent_jni.h"
 
 using base::android::AttachCurrentThread;
@@ skipping 44 matching lines @@
 }
 
 int64 ToAndroidTime(base::TimeTicks time) {
   return (time - base::TimeTicks()).InMilliseconds();
 }
 
 base::TimeTicks FromAndroidTime(int64 time_ms) {
   return base::TimeTicks() + base::TimeDelta::FromMilliseconds(time_ms);
 }
 
+float GetMinTouchMajorDipsForTool(int android_tool_type) {
+  switch (android_tool_type) {
+    case TOOL_TYPE_MOUSE:
+    case TOOL_TYPE_STYLUS:
+      return 0.f;
+    default:
+      // This value is somewhat arbitrarily chosen, but was used with success in
+      // the old gesture detection pipeline.
+      return 24.f;
+  };
+}
+
 }  // namespace
 
 MotionEventAndroid::MotionEventAndroid(float pix_to_dip,
                                        JNIEnv* env,
                                        jobject event,
                                        jlong time_ms,
                                        jint android_action,
                                        jint pointer_count,
                                        jint history_size,
                                        jint action_index,
                                        jfloat pos_x_0_pixels,
                                        jfloat pos_y_0_pixels,
                                        jfloat pos_x_1_pixels,
                                        jfloat pos_y_1_pixels,
                                        jint pointer_id_0,
                                        jint pointer_id_1,
                                        jfloat touch_major_0_pixels,
-                                       jfloat touch_major_1_pixels)
+                                       jfloat touch_major_1_pixels,
+                                       jint tool_type)
     : cached_time_(FromAndroidTime(time_ms)),
       cached_action_(FromAndroidAction(android_action)),
       cached_pointer_count_(pointer_count),
       cached_history_size_(history_size),
       cached_action_index_(action_index),
       pix_to_dip_(pix_to_dip),
+      min_touch_major_dips_(GetMinTouchMajorDipsForTool(tool_type)),
       should_recycle_(false) {
   DCHECK_GT(pointer_count, 0);
   DCHECK_GE(history_size, 0);
 
   event_.Reset(env, event);
   DCHECK(event_.obj());
 
   cached_positions_[0] = ToDips(gfx::PointF(pos_x_0_pixels, pos_y_0_pixels));
   cached_positions_[1] = ToDips(gfx::PointF(pos_x_1_pixels, pos_y_1_pixels));
   cached_pointer_ids_[0] = pointer_id_0;
   cached_pointer_ids_[1] = pointer_id_1;
   cached_touch_majors_[0] = ToDips(touch_major_0_pixels);
   cached_touch_majors_[1] = ToDips(touch_major_1_pixels);
 }
 
 MotionEventAndroid::MotionEventAndroid(float pix_to_dip,
+                                       float min_touch_major_dips_,
                                        JNIEnv* env,
                                        jobject event)
     : cached_time_(FromAndroidTime(Java_MotionEvent_getEventTime(env, event))),
       cached_action_(
           FromAndroidAction(Java_MotionEvent_getActionMasked(env, event))),
       cached_pointer_count_(Java_MotionEvent_getPointerCount(env, event)),
       cached_history_size_(Java_MotionEvent_getHistorySize(env, event)),
       cached_action_index_(Java_MotionEvent_getActionIndex(env, event)),
       pix_to_dip_(pix_to_dip),
+      min_touch_major_dips_(min_touch_major_dips_),
       should_recycle_(true) {
   event_.Reset(env, event);
   DCHECK(event_.obj());
 
   for (size_t i = 0; i < MAX_POINTERS_TO_CACHE; ++i) {
     if (i < cached_pointer_count_) {
       cached_positions_[i] =
           ToDips(gfx::PointF(Java_MotionEvent_getXF_I(env, event, i),
                              Java_MotionEvent_getYF_I(env, event, i)));
       cached_pointer_ids_[i] = Java_MotionEvent_getPointerId(env, event, i);
       cached_touch_majors_[i] =
           ToDips(Java_MotionEvent_getTouchMajorF_I(env, event, i));
     } else {
       cached_pointer_ids_[i] = 0;
       cached_touch_majors_[i] = 0.f;
     }
   }
 }
 
 MotionEventAndroid::MotionEventAndroid(const MotionEventAndroid& other)
     : event_(Obtain(other)),
       cached_time_(other.cached_time_),
       cached_action_(other.cached_action_),
       cached_pointer_count_(other.cached_pointer_count_),
       cached_history_size_(other.cached_history_size_),
       cached_action_index_(other.cached_action_index_),
       pix_to_dip_(other.pix_to_dip_),
+      min_touch_major_dips_(other.min_touch_major_dips_),
       should_recycle_(true) {
   DCHECK(event_.obj());
   for (size_t i = 0; i < MAX_POINTERS_TO_CACHE; ++i) {
     cached_positions_[i] = other.cached_positions_[i];
     cached_pointer_ids_[i] = other.cached_pointer_ids_[i];
     cached_touch_majors_[i] = other.cached_touch_majors_[i];
   }
 }
 
 MotionEventAndroid::~MotionEventAndroid() {
@@ skipping 33 matching lines @@
 
 float MotionEventAndroid::GetY(size_t pointer_index) const {
   DCHECK_LT(pointer_index, cached_pointer_count_);
   if (pointer_index < MAX_POINTERS_TO_CACHE)
     return cached_positions_[pointer_index].y();
   return ToDips(Java_MotionEvent_getYF_I(
       AttachCurrentThread(), event_.obj(), pointer_index));
 }
 
 float MotionEventAndroid::GetTouchMajor(size_t pointer_index) const {
-  DCHECK_LT(pointer_index, cached_pointer_count_);
-  if (pointer_index < MAX_POINTERS_TO_CACHE)
-    return cached_touch_majors_[pointer_index];
-  return ToDips(Java_MotionEvent_getTouchMajorF_I(
-      AttachCurrentThread(), event_.obj(), pointer_index));
+  return std::max(min_touch_major_dips_, GetRawTouchMajor(pointer_index));
 }
 
 float MotionEventAndroid::GetPressure(size_t pointer_index) const {
   DCHECK_LT(pointer_index, cached_pointer_count_);
   return Java_MotionEvent_getPressureF_I(
       AttachCurrentThread(), event_.obj(), pointer_index);
 }
 
 base::TimeTicks MotionEventAndroid::GetEventTime() const {
   return cached_time_;
 }
 
 size_t MotionEventAndroid::GetHistorySize() const {
   return cached_history_size_;
 }
 
 base::TimeTicks MotionEventAndroid::GetHistoricalEventTime(
     size_t historical_index) const {
   return FromAndroidTime(Java_MotionEvent_getHistoricalEventTime(
       AttachCurrentThread(), event_.obj(), historical_index));
 }
 
 float MotionEventAndroid::GetHistoricalTouchMajor(
     size_t pointer_index,
     size_t historical_index) const {
-  return ToDips(Java_MotionEvent_getHistoricalTouchMajorF_I_I(
-      AttachCurrentThread(), event_.obj(), pointer_index, historical_index));
+  return std::max(min_touch_major_dips_,
+                  ToDips(Java_MotionEvent_getHistoricalTouchMajorF_I_I(
+                      AttachCurrentThread(),
+                      event_.obj(),
+                      pointer_index,
+                      historical_index)));
 }
 
 float MotionEventAndroid::GetHistoricalX(size_t pointer_index,
                                          size_t historical_index) const {
   return ToDips(Java_MotionEvent_getHistoricalXF_I_I(
       AttachCurrentThread(), event_.obj(), pointer_index, historical_index));
 }
 
 float MotionEventAndroid::GetHistoricalY(size_t pointer_index,
                                          size_t historical_index) const {
   return ToDips(Java_MotionEvent_getHistoricalYF_I_I(
       AttachCurrentThread(), event_.obj(), pointer_index, historical_index));
 }
 
 scoped_ptr<ui::MotionEvent> MotionEventAndroid::Clone() const {
   return scoped_ptr<MotionEvent>(new MotionEventAndroid(*this));
 }
 
 scoped_ptr<ui::MotionEvent> MotionEventAndroid::Cancel() const {
   // The input coordinates to |MotionEventAndroid| are always in device pixels,
   // but the cached coordinates are in DIPs.
   const gfx::PointF position_pixels =
       gfx::ScalePoint(cached_positions_[0], 1.f / pix_to_dip_);
   return scoped_ptr<MotionEvent>(
       new MotionEventAndroid(pix_to_dip_,
+                             min_touch_major_dips_,
                              AttachCurrentThread(),
                              Obtain(GetDownTime(),
                                     GetEventTime(),
                                     MotionEventAndroid::ACTION_CANCEL,
                                     position_pixels.x(),
                                     position_pixels.y()).obj()));
 }
 
-float MotionEventAndroid::GetTouchMinor(size_t pointer_index) const {
+float MotionEventAndroid::GetRawTouchMajor(size_t pointer_index) const {
+  DCHECK_LT(pointer_index, cached_pointer_count_);
+  if (pointer_index < MAX_POINTERS_TO_CACHE)
+    return cached_touch_majors_[pointer_index];
+  return ToDips(Java_MotionEvent_getTouchMajorF_I(
+      AttachCurrentThread(), event_.obj(), pointer_index));
+}
+
+float MotionEventAndroid::GetRawTouchMinor(size_t pointer_index) const {
   return ToDips(Java_MotionEvent_getTouchMinorF_I(
       AttachCurrentThread(), event_.obj(), pointer_index));
 }
 
 float MotionEventAndroid::GetOrientation() const {
   return Java_MotionEvent_getOrientationF(AttachCurrentThread(), event_.obj());
 }
 
 base::TimeTicks MotionEventAndroid::GetDownTime() const {
   return FromAndroidTime(
@@ skipping 30 matching lines @@
   return Java_MotionEvent_obtainAVME_J_J_I_F_F_I(AttachCurrentThread(),
                                                  ToAndroidTime(down_time),
                                                  ToAndroidTime(event_time),
                                                  ToAndroidAction(action),
                                                  x_pixels,
                                                  y_pixels,
                                                  0);
 }
 
 }  // namespace content