summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host/input/motion_event_android.h
diff options
context:
space:
mode:
authoreero.hakkinen <eero.hakkinen@intel.com>2015-11-02 15:50:11 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-02 23:50:56 +0000
commitb39a02032b11742cc467f43026a77a0aba33d5c1 (patch)
treeff8055dfdbac6b638bc0c8c1df74de473bb809f5 /content/browser/renderer_host/input/motion_event_android.h
parentf10f3900fca497febec0cac5ef82a3337c041705 (diff)
downloadchromium_src-b39a02032b11742cc467f43026a77a0aba33d5c1.zip
chromium_src-b39a02032b11742cc467f43026a77a0aba33d5c1.tar.gz
chromium_src-b39a02032b11742cc467f43026a77a0aba33d5c1.tar.bz2
Pass MotionEvent tilt angles to Blink on Android.
This extends event handlers to pass tilt angles from Android MotionEvent to Blink touch points, so that on the Blink side, PointerEvent tiltX and tiltY can be filled with real tilt angles. This CL is a part of a patch series: 1. https://codereview.chromium.org/1253183005/ for new WebPointerProperties fields 2. https://codereview.chromium.org/1260693003/ for eventSender web pointer property support 3. https://codereview.chromium.org/1192563002/ for handling tilt in Blink event handlers 4. https://codereview.chromium.org/1417803002/ (this) This CL is based on the abandoned CL at https://codereview.chromium.org/1187273004/ BUG=514360 Review URL: https://codereview.chromium.org/1417803002 Cr-Commit-Position: refs/heads/master@{#357471}
Diffstat (limited to 'content/browser/renderer_host/input/motion_event_android.h')
-rw-r--r--content/browser/renderer_host/input/motion_event_android.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/browser/renderer_host/input/motion_event_android.h b/content/browser/renderer_host/input/motion_event_android.h
index bf4dfed..d581ce0 100644
--- a/content/browser/renderer_host/input/motion_event_android.h
+++ b/content/browser/renderer_host/input/motion_event_android.h
@@ -29,6 +29,7 @@ class CONTENT_EXPORT MotionEventAndroid : public ui::MotionEvent {
jfloat touch_major_pixels,
jfloat touch_minor_pixels,
jfloat orientation_rad,
+ jfloat tilt_rad,
jint tool_type);
jint id;
jfloat pos_x_pixels;
@@ -36,6 +37,7 @@ class CONTENT_EXPORT MotionEventAndroid : public ui::MotionEvent {
jfloat touch_major_pixels;
jfloat touch_minor_pixels;
jfloat orientation_rad;
+ jfloat tilt_rad;
jint tool_type;
};
@@ -71,6 +73,7 @@ class CONTENT_EXPORT MotionEventAndroid : public ui::MotionEvent {
float GetTouchMinor(size_t pointer_index) const override;
float GetOrientation(size_t pointer_index) const override;
float GetPressure(size_t pointer_index) const override;
+ float GetTilt(size_t pointer_index) const override;
base::TimeTicks GetEventTime() const override;
size_t GetHistorySize() const override;
base::TimeTicks GetHistoricalEventTime(
@@ -120,6 +123,7 @@ class CONTENT_EXPORT MotionEventAndroid : public ui::MotionEvent {
float touch_major;
float touch_minor;
float orientation;
+ float tilt;
ToolType tool_type;
} cached_pointers_[MAX_POINTERS_TO_CACHE];