diff options
| author | tdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 18:51:51 +0000 |
|---|---|---|
| committer | tdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 18:51:51 +0000 |
| commit | a960d5c317c4f8b4fbdb0e9f832a24c62313b2ec (patch) | |
| tree | cbdd79aae34c8886b7b889ca30820bfe2b300187 /content | |
| parent | 143791f3767cb0c7007d2e517400c9ed2d9eb7c4 (diff) | |
| download | chromium_src-a960d5c317c4f8b4fbdb0e9f832a24c62313b2ec.zip chromium_src-a960d5c317c4f8b4fbdb0e9f832a24c62313b2ec.tar.gz chromium_src-a960d5c317c4f8b4fbdb0e9f832a24c62313b2ec.tar.bz2 | |
Store the id of a contributing motion event in GestureEventData
The unified GR needs to be able to construct ui::GestureEvents from
GestureEventData objects. Currently no information on
contributing touch ids is available in GestureEventData.
This information is used for figuring out which window to target
a gesture to - the gesture is targeted to the window which the
contributing touch is locked to.
BUG=332418
Review URL: https://codereview.chromium.org/212663010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
4 files changed, 10 insertions, 0 deletions
diff --git a/content/browser/renderer_host/input/motion_event_android.cc b/content/browser/renderer_host/input/motion_event_android.cc index 2c3c8c3..eea14e9 100644 --- a/content/browser/renderer_host/input/motion_event_android.cc +++ b/content/browser/renderer_host/input/motion_event_android.cc @@ -145,6 +145,10 @@ MotionEventAndroid::~MotionEventAndroid() { Java_MotionEvent_recycle(AttachCurrentThread(), event_.obj()); } +int MotionEventAndroid::GetId() const { + return 0; +} + MotionEventAndroid::Action MotionEventAndroid::GetAction() const { return cached_action_; } diff --git a/content/browser/renderer_host/input/motion_event_android.h b/content/browser/renderer_host/input/motion_event_android.h index 8f81a8a..bcc9048 100644 --- a/content/browser/renderer_host/input/motion_event_android.h +++ b/content/browser/renderer_host/input/motion_event_android.h @@ -38,6 +38,7 @@ class MotionEventAndroid : public ui::MotionEvent { virtual ~MotionEventAndroid(); // ui::MotionEvent methods. + virtual int GetId() const OVERRIDE; virtual Action GetAction() const OVERRIDE; virtual int GetActionIndex() const OVERRIDE; virtual size_t GetPointerCount() const OVERRIDE; diff --git a/content/browser/renderer_host/input/motion_event_web.cc b/content/browser/renderer_host/input/motion_event_web.cc index 2cbaa40..07b6514 100644 --- a/content/browser/renderer_host/input/motion_event_web.cc +++ b/content/browser/renderer_host/input/motion_event_web.cc @@ -69,6 +69,10 @@ MotionEventWeb::MotionEventWeb(const WebTouchEvent& event) MotionEventWeb::~MotionEventWeb() {} +int MotionEventWeb::GetId() const { + return 0; +} + MotionEventWeb::Action MotionEventWeb::GetAction() const { return cached_action_; } diff --git a/content/browser/renderer_host/input/motion_event_web.h b/content/browser/renderer_host/input/motion_event_web.h index 939c4e6..2c73a3a 100644 --- a/content/browser/renderer_host/input/motion_event_web.h +++ b/content/browser/renderer_host/input/motion_event_web.h @@ -17,6 +17,7 @@ class MotionEventWeb : public ui::MotionEvent { virtual ~MotionEventWeb(); // ui::MotionEvent + virtual int GetId() const OVERRIDE; virtual Action GetAction() const OVERRIDE; virtual int GetActionIndex() const OVERRIDE; virtual size_t GetPointerCount() const OVERRIDE; |