Extend MotionEvent to have tool type and button state

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 36 matching lines @@
       return MotionEventAndroid::ACTION_POINTER_DOWN;
     case ACTION_POINTER_UP:
       return MotionEventAndroid::ACTION_POINTER_UP;
     default:
       NOTREACHED() << "Invalid Android MotionEvent type for gesture detection: "
                    << android_action;
   };
   return MotionEventAndroid::ACTION_CANCEL;
 }
 
+int ToAndroidToolType(MotionEventAndroid::ToolType tool_type) {
+  switch (tool_type) {
+    case MotionEventAndroid::TOOL_TYPE_UNKNOWN:
+      return TOOL_TYPE_UNKNOWN;
+    case MotionEventAndroid::TOOL_TYPE_FINGER:
+      return TOOL_TYPE_FINGER;
+    case MotionEventAndroid::TOOL_TYPE_STYLUS:
+      return TOOL_TYPE_STYLUS;
+    case MotionEventAndroid::TOOL_TYPE_MOUSE:
+      return TOOL_TYPE_MOUSE;
+    default:
+      NOTREACHED() << "Invalid MotionEvent tool type: " << tool_type;
+  };
+  return TOOL_TYPE_UNKNOWN;
+}
+
+MotionEventAndroid::ToolType FromAndroidToolType(int android_tool_type) {
+  switch (android_tool_type) {
+    case TOOL_TYPE_UNKNOWN:
+      return MotionEventAndroid::TOOL_TYPE_UNKNOWN;
+    case TOOL_TYPE_FINGER:
+      return MotionEventAndroid::TOOL_TYPE_FINGER;
+    case TOOL_TYPE_STYLUS:
+      return MotionEventAndroid::TOOL_TYPE_STYLUS;
+    case TOOL_TYPE_MOUSE:
+      return MotionEventAndroid::TOOL_TYPE_MOUSE;
+    default:
+      NOTREACHED() << "Invalid Android MotionEvent tool type: "
+                   << android_tool_type;
+  };
+  return MotionEventAndroid::TOOL_TYPE_UNKNOWN;
+}
+

[jdduke (slow), 2014/06/20 15:33:25]

I would say drop the "ToAndroidToolType" and "ToAndroidButtonState" helpers as
it doesn't look like we need them.

[Changwan Ryu, 2014/06/20 21:00:34]

Done.

+int ToAndroidButtonState(int button_state) {
+  int result = 0;
+  if ((button_state & MotionEventAndroid::BUTTON_BACK) != 0)
+    result |= BUTTON_BACK;
+  if ((button_state & MotionEventAndroid::BUTTON_FORWARD) != 0)
+    result |= BUTTON_FORWARD;
+  if ((button_state & MotionEventAndroid::BUTTON_PRIMARY) != 0)
+    result |= BUTTON_PRIMARY;
+  if ((button_state & MotionEventAndroid::BUTTON_SECONDARY) != 0)
+    result |= BUTTON_SECONDARY;
+  if ((button_state & MotionEventAndroid::BUTTON_TERTIARY) != 0)
+    result |= BUTTON_TERTIARY;
+  return result;
+}
+
+int FromAndroidButtonState(int button_state) {
+  int result = 0;
+  if ((button_state & BUTTON_BACK) != 0)
+    result |= MotionEventAndroid::BUTTON_BACK;
+  if ((button_state & BUTTON_FORWARD) != 0)
+    result |= MotionEventAndroid::BUTTON_FORWARD;
+  if ((button_state & BUTTON_PRIMARY) != 0)
+    result |= MotionEventAndroid::BUTTON_PRIMARY;
+  if ((button_state & BUTTON_SECONDARY) != 0)
+    result |= MotionEventAndroid::BUTTON_SECONDARY;
+  if ((button_state & BUTTON_TERTIARY) != 0)
+    result |= MotionEventAndroid::BUTTON_TERTIARY;
+  return result;
+}
+
 int64 ToAndroidTime(base::TimeTicks time) {
   return (time - base::TimeTicks()).InMilliseconds();
 }
 
 base::TimeTicks FromAndroidTime(int64 time_ms) {
   return base::TimeTicks() + base::TimeDelta::FromMilliseconds(time_ms);
 }
 
 }  // 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 raw_pos_x_pixels,
-                                       jfloat raw_pos_y_pixels)
+                                       jfloat raw_pos_y_pixels,
+                                       jint android_tool_type_0,
+                                       jint android_tool_type_1,
+                                       jint android_button_state)
     : 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),
+      cached_button_state_(FromAndroidButtonState(android_button_state)),
       pix_to_dip_(pix_to_dip),
       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);
   cached_raw_position_offset_ =
       ToDips(gfx::PointF(raw_pos_x_pixels, raw_pos_y_pixels)) -
       cached_positions_[0];
+  cached_tool_types_[0] = FromAndroidToolType(android_tool_type_0);
+  cached_tool_types_[1] = FromAndroidToolType(android_tool_type_1);
 }
 
 MotionEventAndroid::MotionEventAndroid(float pix_to_dip,
                                        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)),
+      cached_button_state_(
+          FromAndroidButtonState(Java_MotionEvent_getButtonState(env, event))),
       pix_to_dip_(pix_to_dip),
       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));
+      cached_tool_types_[i] =
+          FromAndroidToolType(Java_MotionEvent_getToolType(env, event, i));
     } else {
       cached_pointer_ids_[i] = 0;
       cached_touch_majors_[i] = 0.f;
+      cached_tool_types_[i] = MotionEvent::TOOL_TYPE_UNKNOWN;
     }
   }
 
   cached_raw_position_offset_ =
       ToDips(gfx::PointF(Java_MotionEvent_getRawX(env, event),
                          Java_MotionEvent_getRawY(env, event))) -
       cached_positions_[0];
 }
 
 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_),
       cached_raw_position_offset_(other.cached_raw_position_offset_),
+      cached_button_state_(other.cached_button_state_),
       pix_to_dip_(other.pix_to_dip_),
       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];
+    cached_tool_types_[i] = other.cached_tool_types_[i];
   }
 }
 
 MotionEventAndroid::~MotionEventAndroid() {
   if (should_recycle_)
     Java_MotionEvent_recycle(AttachCurrentThread(), event_.obj());
 }
 
 int MotionEventAndroid::GetId() const {
   return 0;
@@ skipping 83 matching lines @@
   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));
 }
 
+ui::MotionEvent::ToolType MotionEventAndroid::GetToolType(
+    size_t pointer_index) const {
+  DCHECK_LT(pointer_index, cached_pointer_count_);
+  if (pointer_index < MAX_POINTERS_TO_CACHE)
+    return cached_tool_types_[pointer_index];
+  return FromAndroidToolType(Java_MotionEvent_getToolType(
+      AttachCurrentThread(), event_.obj(), pointer_index));
+}
+
+int MotionEventAndroid::GetButtonState() const {
+  return cached_button_state_;
+}
+
 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>(
@@ skipping 50 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