Pass MotionEvent tilt angles to Blink on Android.

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>
 
@@ skipping 11 matching lines @@
 // while all *output* coordinates are in DIPs (as with WebTouchEvent).
 class CONTENT_EXPORT MotionEventAndroid : public ui::MotionEvent {
  public:
   struct 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);
     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;
   };
 
   // Forcing the caller to provide all cached values upon construction
   // eliminates the need to perform a JNI call to retrieve values individually.
   MotionEventAndroid(float pix_to_dip,
                      JNIEnv* env,
                      jobject event,
                      jlong time_ms,
                      jint android_action,
@@ skipping 15 matching lines @@
   size_t GetPointerCount() const override;
   int GetPointerId(size_t pointer_index) const override;
   float GetX(size_t pointer_index) const override;
   float GetY(size_t pointer_index) const override;
   float GetRawX(size_t pointer_index) const override;
   float GetRawY(size_t pointer_index) const override;
   float GetTouchMajor(size_t pointer_index) const override;
   float GetTouchMinor(size_t pointer_index) const override;
   float GetOrientation(size_t pointer_index) const override;
   float GetPressure(size_t pointer_index) const override;
+  // TODO(e_hakkinen): Remove either GetTiltOrientation or GetTiltX and
+  //                   GetTiltY.
+  float GetTilt(size_t pointer_index) const override;
+  float GetTiltOrientation(size_t pointer_index) const override;
+  float GetTiltX(size_t pointer_index) const override;
+  float GetTiltY(size_t pointer_index) const override;
   base::TimeTicks GetEventTime() const override;
   size_t GetHistorySize() const override;
   base::TimeTicks GetHistoricalEventTime(
       size_t historical_index) const override;
   float GetHistoricalTouchMajor(size_t pointer_index,
                                 size_t historical_index) const override;
   float GetHistoricalX(size_t pointer_index,
                        size_t historical_index) const override;
   float GetHistoricalY(size_t pointer_index,
                        size_t historical_index) const override;
@@ skipping 29 matching lines @@
   const int cached_button_state_;
   const int cached_flags_;
   const gfx::Vector2dF cached_raw_position_offset_;
   struct CachedPointer {
     CachedPointer();
     int id;
     gfx::PointF position;
     float touch_major;
     float touch_minor;
     float orientation;
+    float tilt;
     ToolType tool_type;
   } cached_pointers_[MAX_POINTERS_TO_CACHE];
 
   // A unique identifier for the Android motion event.
   const uint32 unique_event_id_;
 
   DISALLOW_COPY_AND_ASSIGN(MotionEventAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_