OLD | NEW |
1 | 1 |
2 // Copyright 2014 The Chromium Authors. All rights reserved. | 2 // Copyright 2014 The Chromium Authors. All rights reserved. |
3 // Use of this source code is governed by a BSD-style license that can be | 3 // Use of this source code is governed by a BSD-style license that can be |
4 // found in the LICENSE file. | 4 // found in the LICENSE file. |
5 | 5 |
6 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_ | 6 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_ |
7 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_ | 7 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_ |
8 | 8 |
9 #include <jni.h> | 9 #include <jni.h> |
10 | 10 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 int GetActionIndex() const override; | 63 int GetActionIndex() const override; |
64 size_t GetPointerCount() const override; | 64 size_t GetPointerCount() const override; |
65 int GetPointerId(size_t pointer_index) const override; | 65 int GetPointerId(size_t pointer_index) const override; |
66 float GetX(size_t pointer_index) const override; | 66 float GetX(size_t pointer_index) const override; |
67 float GetY(size_t pointer_index) const override; | 67 float GetY(size_t pointer_index) const override; |
68 float GetRawX(size_t pointer_index) const override; | 68 float GetRawX(size_t pointer_index) const override; |
69 float GetRawY(size_t pointer_index) const override; | 69 float GetRawY(size_t pointer_index) const override; |
70 float GetTouchMajor(size_t pointer_index) const override; | 70 float GetTouchMajor(size_t pointer_index) const override; |
71 float GetTouchMinor(size_t pointer_index) const override; | 71 float GetTouchMinor(size_t pointer_index) const override; |
72 float GetOrientation(size_t pointer_index) const override; | 72 float GetOrientation(size_t pointer_index) const override; |
| 73 float GetTilt(size_t pointer_index) const override; |
| 74 float GetTiltDirection(size_t pointer_index) const override; |
73 float GetPressure(size_t pointer_index) const override; | 75 float GetPressure(size_t pointer_index) const override; |
74 base::TimeTicks GetEventTime() const override; | 76 base::TimeTicks GetEventTime() const override; |
75 size_t GetHistorySize() const override; | 77 size_t GetHistorySize() const override; |
76 base::TimeTicks GetHistoricalEventTime( | 78 base::TimeTicks GetHistoricalEventTime( |
77 size_t historical_index) const override; | 79 size_t historical_index) const override; |
78 float GetHistoricalTouchMajor(size_t pointer_index, | 80 float GetHistoricalTouchMajor(size_t pointer_index, |
79 size_t historical_index) const override; | 81 size_t historical_index) const override; |
80 float GetHistoricalX(size_t pointer_index, | 82 float GetHistoricalX(size_t pointer_index, |
81 size_t historical_index) const override; | 83 size_t historical_index) const override; |
82 float GetHistoricalY(size_t pointer_index, | 84 float GetHistoricalY(size_t pointer_index, |
(...skipping 30 matching lines...) Expand all Loading... |
113 const int cached_button_state_; | 115 const int cached_button_state_; |
114 const int cached_flags_; | 116 const int cached_flags_; |
115 const gfx::Vector2dF cached_raw_position_offset_; | 117 const gfx::Vector2dF cached_raw_position_offset_; |
116 struct CachedPointer { | 118 struct CachedPointer { |
117 CachedPointer(); | 119 CachedPointer(); |
118 int id; | 120 int id; |
119 gfx::PointF position; | 121 gfx::PointF position; |
120 float touch_major; | 122 float touch_major; |
121 float touch_minor; | 123 float touch_minor; |
122 float orientation; | 124 float orientation; |
| 125 float tilt; |
| 126 float tiltDirection; |
123 ToolType tool_type; | 127 ToolType tool_type; |
124 } cached_pointers_[MAX_POINTERS_TO_CACHE]; | 128 } cached_pointers_[MAX_POINTERS_TO_CACHE]; |
125 | 129 |
126 DISALLOW_COPY_AND_ASSIGN(MotionEventAndroid); | 130 DISALLOW_COPY_AND_ASSIGN(MotionEventAndroid); |
127 }; | 131 }; |
128 | 132 |
129 } // namespace content | 133 } // namespace content |
130 | 134 |
131 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_ | 135 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_ |
OLD | NEW |