Pass MotionEvent tilt angles to Blink on Android.

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 <android/input.h>
 
 #include <cmath>
 
@@ skipping 107 matching lines @@
 }
 
 }  // 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) {
 }
 
 MotionEventAndroid::MotionEventAndroid(float pix_to_dip,
                                        JNIEnv* env,
                                        jobject event,
                                        jlong time_ms,
                                        jint android_action,
                                        jint pointer_count,
                                        jint history_size,
@@ skipping 109 matching lines @@
   DCHECK_LT(pointer_index, cached_pointer_count_);
   // Note that this early return is a special case exercised only in testing, as
   // caching the pressure values is not a worthwhile optimization (they're
   // accessed at most once per event instance).
   if (!event_.obj())
     return 0.f;
   return Java_MotionEvent_getPressureF_I(
       AttachCurrentThread(), event_.obj(), pointer_index);
 }
 
+float MotionEventAndroid::GetTilt(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;
+  if (!event_.obj())
+    return 0.f;
+  return ToValidFloat(Java_MotionEvent_getAxisValueF_I_I(
+      AttachCurrentThread(), event_.obj(), AXIS_TILT, pointer_index));
+}
+
+// TODO(e_hakkinen): Remove either this or GetTiltX and GetTiltY.
+float MotionEventAndroid::GetTiltOrientation(size_t pointer_index) const {
+  DCHECK_LT(pointer_index, cached_pointer_count_);
+  if (GetToolType(pointer_index) != MotionEvent::TOOL_TYPE_STYLUS)
+    return 0.f;
+  float orientation;
+  if (pointer_index < MAX_POINTERS_TO_CACHE)
+    orientation = cached_pointers_[pointer_index].orientation;
+  else if (!event_.obj())
+    return 0.f;
+  else
+    orientation = ToValidFloat(Java_MotionEvent_getOrientationF_I(
+        AttachCurrentThread(), event_.obj(), pointer_index));
+  return orientation < 0 ? orientation + M_PI : orientation - M_PI;
+}
+
+// TODO(e_hakkinen): Remove either this and GetTiltY or GetTiltOrientation.
+float MotionEventAndroid::GetTiltX(size_t pointer_index) const {
+  DCHECK_LT(pointer_index, cached_pointer_count_);
+  if (GetToolType(pointer_index) != MotionEvent::TOOL_TYPE_STYLUS)
+    return 0.f;
+  float orientation = GetOrientation(pointer_index);
+  float tilt = GetTilt(pointer_index);
+  // A stylus points to a direction specified by orientation and tilts to
+  // the opposite direction. Coordinate system is left-handed.
+  return atan2(sin(-orientation) * sin(tilt), cos(tilt));
+}
+
+// TODO(e_hakkinen): Remove either this and GetTiltX or GetTiltOrientation.
+float MotionEventAndroid::GetTiltY(size_t pointer_index) const {
+  DCHECK_LT(pointer_index, cached_pointer_count_);
+  if (GetToolType(pointer_index) != MotionEvent::TOOL_TYPE_STYLUS)
+    return 0.f;
+  float orientation = GetOrientation(pointer_index);
+  float tilt = GetTilt(pointer_index);
+  // A stylus points to a direction specified by orientation and tilts to
+  // the opposite direction. Coordinate system is left-handed.
+  return atan2(cos(-orientation) * sin(tilt), cos(tilt));
+}
+
 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 {
@@ skipping 43 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);
   result.tool_type = FromAndroidToolType(pointer.tool_type);
   return result;
 }
 
 // static
 bool MotionEventAndroid::RegisterMotionEventAndroid(JNIEnv* env) {
   return JNI_MotionEvent::RegisterNativesImpl(env);
 }
 
 }  // namespace content