Completed webkit radiusX, radiusY and rotationAngle handling.

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 "base/float_util.h"
 #include "jni/MotionEvent_jni.h"
 
 using base::android::AttachCurrentThread;
 using namespace JNI_MotionEvent;
 
 namespace content {
 namespace {
 
 int ToAndroidAction(MotionEventAndroid::Action action) {
   switch (action) {
@@ skipping 71 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 ToValidFloat(float x) {
+  return base::IsNaN(x) ? 0.f : x;
+}
+
 }  // 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_minor_0_pixels,
+                                       jfloat touch_minor_1_pixels,
+                                       jfloat orientation_0_rad,
+                                       jfloat orientation_1_rad,
                                        jfloat raw_pos_x_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_touch_minors_[0] = ToDips(touch_minor_0_pixels);
+  cached_touch_minors_[1] = ToDips(touch_minor_1_pixels);
+  cached_orientations_[0] = ToValidFloat(orientation_0_rad);
+  cached_orientations_[1] = ToValidFloat(orientation_1_rad);
   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)
@@ skipping 11 matching lines @@
   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_touch_minors_[i] =
+          ToDips(Java_MotionEvent_getTouchMinorF_I(env, event, i));
+      cached_orientations_[i] =
+          ToValidFloat(Java_MotionEvent_getOrientationF_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_touch_minors_[i] = 0.f;
+      cached_orientations_[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_touch_minors_[i] = other.cached_touch_minors_[i];
+    cached_orientations_[i] = other.cached_orientations_[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 {
@@ skipping 45 matching lines @@
 }
 
 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));
 }
 
+float MotionEventAndroid::GetTouchMinor(size_t pointer_index) const {
+  DCHECK_LT(pointer_index, cached_pointer_count_);
+  if (pointer_index < MAX_POINTERS_TO_CACHE)
+    return cached_touch_minors_[pointer_index];
+  return ToDips(Java_MotionEvent_getTouchMinorF_I(AttachCurrentThread(),
+    event_.obj(), pointer_index));
+}
+
+float MotionEventAndroid::GetOrientation(size_t pointer_index) const {
+  DCHECK_LT(pointer_index, cached_pointer_count_);
+  if (pointer_index < MAX_POINTERS_TO_CACHE)
+    return cached_orientations_[pointer_index];
+  return ToValidFloat(Java_MotionEvent_getOrientationF_I(
+      AttachCurrentThread(), event_.obj(), 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_;
 }
 
@@ skipping 51 matching lines @@
   return scoped_ptr<MotionEvent>(
       new MotionEventAndroid(pix_to_dip_,
                              AttachCurrentThread(),
                              Obtain(GetDownTime(),
                                     GetEventTime(),
                                     MotionEventAndroid::ACTION_CANCEL,
                                     position_pixels.x(),
                                     position_pixels.y()).obj()));
 }
 
-float MotionEventAndroid::GetTouchMinor(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(
       Java_MotionEvent_getDownTime(AttachCurrentThread(), event_.obj()));
 }
 
 float MotionEventAndroid::ToDips(float pixels) const {
   return pixels * pix_to_dip_;
 }
 
 gfx::PointF MotionEventAndroid::ToDips(const gfx::PointF& point_pixels) const {
@@ skipping 22 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