Added experimental Touch.tilt, Touch.tiltDirection support for 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 "base/android/jni_android.h"
 #include "base/float_util.h"
+#include "jni/MotionEventUtil_jni.h"
 #include "jni/MotionEvent_jni.h"
 #include "ui/events/event_constants.h"
 
 using base::android::AttachCurrentThread;
 using namespace JNI_MotionEvent;
+using namespace JNI_MotionEventUtil;
 
 namespace content {
 namespace {
 
 MotionEventAndroid::Action FromAndroidAction(int android_action) {
   switch (android_action) {
     case ACTION_DOWN:
       return MotionEventAndroid::ACTION_DOWN;
     case ACTION_UP:
       return MotionEventAndroid::ACTION_UP;
@@ skipping 207 matching lines @@
 }
 
 float MotionEventAndroid::GetOrientation(size_t pointer_index) const {
   DCHECK_LT(pointer_index, cached_pointer_count_);
   if (pointer_index < MAX_POINTERS_TO_CACHE)
     return cached_pointers_[pointer_index].orientation;
   return ToValidFloat(Java_MotionEvent_getOrientationF_I(
       AttachCurrentThread(), event_.obj(), pointer_index));
 }
 
+float MotionEventAndroid::GetTilt(size_t pointer_index) const {
+  if (!event_.obj())
+    return std::numeric_limits<float>::quiet_NaN();
+
+  return Java_MotionEventUtil_getAxisValueOrNaN(
+      AttachCurrentThread(), event_.obj(), AXIS_TILT, pointer_index);
+}
+
+float MotionEventAndroid::GetTiltDirection(size_t pointer_index) const {
+  if (!event_.obj())
+    return std::numeric_limits<float>::quiet_NaN();
+
+  return Java_MotionEventUtil_getAxisValueOrNaN(
+      AttachCurrentThread(), event_.obj(), AXIS_ORIENTATION, pointer_index);
+}
+
 float MotionEventAndroid::GetPressure(size_t pointer_index) const {
   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);
 }
@@ skipping 60 matching lines @@
       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.tool_type = FromAndroidToolType(pointer.tool_type);
   return result;
 }
 
 // static
 bool MotionEventAndroid::RegisterMotionEventAndroid(JNIEnv* env) {
-  return JNI_MotionEvent::RegisterNativesImpl(env);
+  return JNI_MotionEvent::RegisterNativesImpl(env)
+      && JNI_MotionEventUtil::RegisterNativesImpl(env);
 }
 
 }  // namespace content