Index: content/browser/renderer_host/input/motion_event_android.h |
diff --git a/content/browser/renderer_host/input/motion_event_android.h b/content/browser/renderer_host/input/motion_event_android.h |
index d71fa61983042e3ca25c4ba5c97b0f6cf62a2eba..032c08321cd98587559828416b27957a4aed174b 100644 |
--- a/content/browser/renderer_host/input/motion_event_android.h |
+++ b/content/browser/renderer_host/input/motion_event_android.h |
@@ -39,10 +39,6 @@ |
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, |
@@ -61,8 +57,6 @@ |
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; |
@@ -80,6 +74,9 @@ |
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); |
@@ -118,8 +115,6 @@ |
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_; |