Completed webkit radiusX, radiusY and rotationAngle handling.

content/browser/renderer_host/input/motion_event_android.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
@@ skipping 21 matching lines @@
                      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);
   virtual ~MotionEventAndroid();
 
   // ui::MotionEvent methods.
   virtual int GetId() const OVERRIDE;
   virtual Action GetAction() const OVERRIDE;
   virtual int GetActionIndex() const OVERRIDE;
   virtual size_t GetPointerCount() const OVERRIDE;
   virtual int GetPointerId(size_t pointer_index) const OVERRIDE;
   virtual float GetX(size_t pointer_index) const OVERRIDE;
   virtual float GetY(size_t pointer_index) const OVERRIDE;
   virtual float GetRawX(size_t pointer_index) const OVERRIDE;
   virtual float GetRawY(size_t pointer_index) const OVERRIDE;
   virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE;
+  virtual float GetTouchMinor(size_t pointer_index) const OVERRIDE;
+  virtual float GetOrientation(size_t pointer_index) const OVERRIDE;
   virtual float GetPressure(size_t pointer_index) const OVERRIDE;
   virtual base::TimeTicks GetEventTime() const OVERRIDE;
   virtual size_t GetHistorySize() const OVERRIDE;
   virtual base::TimeTicks GetHistoricalEventTime(
       size_t historical_index) const OVERRIDE;
   virtual float GetHistoricalTouchMajor(size_t pointer_index,
                                         size_t historical_index) const OVERRIDE;
   virtual float GetHistoricalX(size_t pointer_index,
                                size_t historical_index) const OVERRIDE;
   virtual float GetHistoricalY(size_t pointer_index,
                                size_t historical_index) const OVERRIDE;
   virtual ToolType GetToolType(size_t pointer_index) const OVERRIDE;
   virtual int GetButtonState() const OVERRIDE;
   virtual scoped_ptr<MotionEvent> Clone() const OVERRIDE;
   virtual scoped_ptr<MotionEvent> Cancel() const OVERRIDE;
 
   // Additional Android MotionEvent methods.
-  float GetTouchMinor() const { return GetTouchMinor(0); }
-  float GetTouchMinor(size_t pointer_index) const;
-  float GetOrientation() const;
   base::TimeTicks GetDownTime() const;
 
   static bool RegisterMotionEventAndroid(JNIEnv* env);
 
   static base::android::ScopedJavaLocalRef<jobject> Obtain(
       const MotionEventAndroid& event);
   static base::android::ScopedJavaLocalRef<jobject> Obtain(
       base::TimeTicks down_time,
       base::TimeTicks event_time,
       Action action,
       float x_pixels,
       float y_pixels);
 
  private:
   MotionEventAndroid();
   MotionEventAndroid(float pix_to_dip, JNIEnv* env, jobject event);
   MotionEventAndroid(const MotionEventAndroid&);
   MotionEventAndroid& operator=(const MotionEventAndroid&);
 
+  float ToValidFloat(float x) const;
   float ToDips(float pixels) const;
   gfx::PointF ToDips(const gfx::PointF& pixels) const;
 
   // Cache pointer coords, id's and major lengths for the most common
   // touch-related scenarios, i.e., scrolling and pinching.  This prevents
   // redundant JNI fetches for the same bits.
   enum { MAX_POINTERS_TO_CACHE = 2 };
 
   // The Java reference to the underlying MotionEvent.
   base::android::ScopedJavaGlobalRef<jobject> event_;
 
   base::TimeTicks cached_time_;
   Action cached_action_;
   size_t cached_pointer_count_;
   size_t cached_history_size_;
   int cached_action_index_;
   gfx::PointF cached_positions_[MAX_POINTERS_TO_CACHE];
   int cached_pointer_ids_[MAX_POINTERS_TO_CACHE];
   float cached_touch_majors_[MAX_POINTERS_TO_CACHE];
+  float cached_touch_minors_[MAX_POINTERS_TO_CACHE];
+  float cached_orientations_[MAX_POINTERS_TO_CACHE];
   gfx::Vector2dF cached_raw_position_offset_;
   ToolType cached_tool_types_[MAX_POINTERS_TO_CACHE];
   int cached_button_state_;
 
   // Used to convert pixel coordinates from the Java-backed MotionEvent to
   // DIP coordinates cached/returned by the MotionEventAndroid.
   const float pix_to_dip_;
 
   // Whether |event_| should be recycled on destruction. This will only be true
   // for those events generated via |Obtain(...)|.
   bool should_recycle_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_