summaryrefslogtreecommitdiffstats
path: root/ui/metro_viewer
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-27 20:49:17 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-27 20:49:17 +0000
commitd5bdab63fd2d7c3195de86d7c9f69b9d91b23beb (patch)
tree5b93ea49dbc6f1de7069ee89757ce4a541d9a6b9 /ui/metro_viewer
parentde894b004fd9c1aa21ed9cbcf13c7fe463714739 (diff)
downloadchromium_src-d5bdab63fd2d7c3195de86d7c9f69b9d91b23beb.zip
chromium_src-d5bdab63fd2d7c3195de86d7c9f69b9d91b23beb.tar.gz
chromium_src-d5bdab63fd2d7c3195de86d7c9f69b9d91b23beb.tar.bz2
Support multi touch on Windows 8 AURA and ASH.
The touch events coming in from desktop chrome AURA and ASH have hardcoded touch ids which breaks the gesture recognizer as it is unable to figure out that multiple touch points are involved. Fix on desktop Chrome AURA is to use the OS generated touch id mapped to the gesture recognizer range. For ASH Windows 8 we pass in the mapped touch ids from the metro driver in the touch IPC messages. Fixes bug https://code.google.com/p/chromium/issues/detail?id=179977 BUG=179977 R=cpu,sky Review URL: https://codereview.chromium.org/13003004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/metro_viewer')
-rw-r--r--ui/metro_viewer/metro_viewer_messages.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/ui/metro_viewer/metro_viewer_messages.h b/ui/metro_viewer/metro_viewer_messages.h
index fd2c5a6..53ee112 100644
--- a/ui/metro_viewer/metro_viewer_messages.h
+++ b/ui/metro_viewer/metro_viewer_messages.h
@@ -54,18 +54,21 @@ IPC_MESSAGE_CONTROL4(MetroViewerHostMsg_Character,
IPC_MESSAGE_CONTROL1(MetroViewerHostMsg_VisibilityChanged,
bool /* visible */);
-IPC_MESSAGE_CONTROL3(MetroViewerHostMsg_TouchDown,
+IPC_MESSAGE_CONTROL4(MetroViewerHostMsg_TouchDown,
int32, /* x-coordinate */
int32, /* y-coordinate */
- uint64) /* timestamp */
-IPC_MESSAGE_CONTROL3(MetroViewerHostMsg_TouchUp,
+ uint64, /* timestamp */
+ uint32) /* pointer_id */
+IPC_MESSAGE_CONTROL4(MetroViewerHostMsg_TouchUp,
int32, /* x-coordinate */
int32, /* y-coordinate */
- uint64) /* timestamp */
-IPC_MESSAGE_CONTROL3(MetroViewerHostMsg_TouchMoved,
+ uint64, /* timestamp */
+ uint32) /* pointer_id */
+IPC_MESSAGE_CONTROL4(MetroViewerHostMsg_TouchMoved,
int32, /* x-coordinate */
int32, /* y-coordinate */
- uint64) /* timestamp */
+ uint64, /* timestamp */
+ uint32) /* pointer_id */
// Informs the browser of the result of a file save as operation.
IPC_MESSAGE_CONTROL3(MetroViewerHostMsg_FileSaveAsDone,