Pass through tilt_x and tilt_y to blink

ui/events/android/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 "ui/events/android/motion_event_android.h"
 
 #include <android/input.h>
 
 #include <cmath>
 
@@ skipping 134 matching lines @@
   DCHECK_GE(history_size, 0);
   // While the spec states that only ACTION_MOVE events should contain
   // historical entries, it's possible that an embedder could repurpose an
   // ACTION_MOVE event into a different kind of event. In that case, the
   // historical values are meaningless, and should not be exposed.
   if (action != ui::MotionEvent::ACTION_MOVE)
     return 0;
   return history_size;
 }
 
+// Convert tilt and orientation to tilt_x and tilt_y. Tilt_x and tilt_y will lie
+// in [-90, 90].
+void ConvertTiltRadToTiltXY(float tilt_rad,

[use mustaq_at_chromium.org, 2017/05/15 19:46:53]

Nit: ConvertTiltOrientationToTiltXY instead?

[jkwang, 2017/05/16 01:13:26]

Done.

+                            float orientation_rad,
+                            float* tilt_x,
+                            float* tilt_y) {
+  float r = sin(tilt_rad);
+  float z = cos(tilt_rad);
+  *tilt_x = atan2(sin(-orientation_rad) * r, z) * 180.f / M_PI;
+  *tilt_y = atan2(cos(-orientation_rad) * r, z) * 180.f / M_PI;
+}
+
 }  // namespace
 
 MotionEventAndroid::Pointer::Pointer(jint id,
                                      jfloat pos_x_pixels,
                                      jfloat pos_y_pixels,
                                      jfloat touch_major_pixels,
                                      jfloat touch_minor_pixels,
                                      jfloat orientation_rad,
                                      jfloat tilt_rad,
                                      jint tool_type)
     : id(id),
       pos_x_pixels(pos_x_pixels),
       pos_y_pixels(pos_y_pixels),
       touch_major_pixels(touch_major_pixels),
       touch_minor_pixels(touch_minor_pixels),
       orientation_rad(orientation_rad),
       tilt_rad(tilt_rad),
       tool_type(tool_type) {
 }
 
 MotionEventAndroid::CachedPointer::CachedPointer()
     : id(0),
       touch_major(0),
       touch_minor(0),
       orientation(0),
-      tilt(0),
-      tool_type(TOOL_TYPE_UNKNOWN) {
-}
+      tilt_x(0),
+      tilt_y(0),
+      tool_type(TOOL_TYPE_UNKNOWN) {}
 
 MotionEventAndroid::MotionEventAndroid(JNIEnv* env,
                                        jobject event,
                                        jfloat pix_to_dip,
                                        jfloat ticks_x,
                                        jfloat ticks_y,
                                        jfloat tick_multiplier,
                                        jlong time_ms,
                                        jint android_action,
                                        jint pointer_count,
@@ skipping 163 matching lines @@
   // caching the pressure values is not a worthwhile optimization (they're
   // accessed at most once per event instance).
   if (!event_.obj())
     return 0.f;
   if (cached_action_ == MotionEvent::ACTION_UP)
     return 0.f;
   return Java_MotionEvent_getPressureF_I(AttachCurrentThread(), event_,
                                          pointer_index);
 }
 
-float MotionEventAndroid::GetTilt(size_t pointer_index) const {
+float MotionEventAndroid::GetTiltX(size_t pointer_index) const {
   DCHECK_LT(pointer_index, cached_pointer_count_);
   if (pointer_index < MAX_POINTERS_TO_CACHE)
-    return cached_pointers_[pointer_index].tilt;
+    return cached_pointers_[pointer_index].tilt_x;
   if (!event_.obj())
     return 0.f;
-  return ToValidFloat(Java_MotionEvent_getAxisValueF_I_I(
+  float tilt_x, tilt_y;
+  float tilt_rad = ToValidFloat(Java_MotionEvent_getAxisValueF_I_I(
       AttachCurrentThread(), event_, AXIS_TILT, pointer_index));
+  float orientation_rad = ToValidFloat(Java_MotionEvent_getOrientationF_I(
+      AttachCurrentThread(), event_, pointer_index));
+  ConvertTiltRadToTiltXY(tilt_rad, orientation_rad, &tilt_x, &tilt_y);
+  return tilt_x;
+}
+
+float MotionEventAndroid::GetTiltY(size_t pointer_index) const {
+  DCHECK_LT(pointer_index, cached_pointer_count_);
+  if (pointer_index < MAX_POINTERS_TO_CACHE)
+    return cached_pointers_[pointer_index].tilt_y;
+  if (!event_.obj())
+    return 0.f;
+  float tilt_x, tilt_y;
+  float tilt_rad = ToValidFloat(Java_MotionEvent_getAxisValueF_I_I(
+      AttachCurrentThread(), event_, AXIS_TILT, pointer_index));
+  float orientation_rad = ToValidFloat(Java_MotionEvent_getOrientationF_I(
+      AttachCurrentThread(), event_, pointer_index));
+  ConvertTiltRadToTiltXY(tilt_rad, orientation_rad, &tilt_x, &tilt_y);
+  return tilt_y;
 }
 
 base::TimeTicks MotionEventAndroid::GetEventTime() const {
   return cached_time_;
 }
 
 size_t MotionEventAndroid::GetHistorySize() const {
   return cached_history_size_;
 }
 
@@ skipping 45 matching lines @@
 
 MotionEventAndroid::CachedPointer MotionEventAndroid::FromAndroidPointer(
     const Pointer& pointer) const {
   CachedPointer result;
   result.id = pointer.id;
   result.position =
       gfx::PointF(ToDips(pointer.pos_x_pixels), ToDips(pointer.pos_y_pixels));
   result.touch_major = ToDips(pointer.touch_major_pixels);
   result.touch_minor = ToDips(pointer.touch_minor_pixels);
   result.orientation = ToValidFloat(pointer.orientation_rad);
-  result.tilt = ToValidFloat(pointer.tilt_rad);
+  float tilt_rad = ToValidFloat(pointer.tilt_rad);
+  ConvertTiltRadToTiltXY(tilt_rad, result.orientation, &result.tilt_x,
+                         &result.tilt_y);
   result.tool_type = FromAndroidToolType(pointer.tool_type);
   return result;
 }
 
 MotionEventAndroid::CachedPointer MotionEventAndroid::OffsetCachedPointer(
     const CachedPointer& pointer,
     float x,
     float y) const {
   CachedPointer result;
   result.id = pointer.id;
   result.position = gfx::PointF(pointer.position.x() + ToDips(x),
                                 pointer.position.y() + ToDips(y));
   result.touch_major = pointer.touch_major;
   result.touch_minor = pointer.touch_minor;
   result.orientation = pointer.orientation;
-  result.tilt = pointer.tilt;
+  result.tilt_x = pointer.tilt_x;
+  result.tilt_y = pointer.tilt_y;
   result.tool_type = pointer.tool_type;
   return result;
 }
 
 }  // namespace ui