diff options
| author | tdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 19:25:25 +0000 |
|---|---|---|
| committer | tdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 19:25:25 +0000 |
| commit | cc1fad52a7d5f4317d63404022a251724e13f667 (patch) | |
| tree | a64da9f22c64fdd6c000d01983049e7fd029cab0 /ui/aura/root_window.h | |
| parent | a58c97e519a34d9d48d6154f37e7d44346ada85e (diff) | |
| download | chromium_src-cc1fad52a7d5f4317d63404022a251724e13f667.zip chromium_src-cc1fad52a7d5f4317d63404022a251724e13f667.tar.gz chromium_src-cc1fad52a7d5f4317d63404022a251724e13f667.tar.bz2 | |
On touch capture, cancel non-captured touches.
When a touch capture occurs, any touches locked to other windows are cancelled.
These touches are then locked to a GestureConsumer which ignores all
further events, until the touch is released.
BUG=123211
TEST=WindowTest.TouchCaptureCancelsOtherTouches, TouchCaptureDoesntCancelCapturedTouches
Review URL: http://codereview.chromium.org/10038030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window.h')
| -rw-r--r-- | ui/aura/root_window.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h index 140543e..dd6f533 100644 --- a/ui/aura/root_window.h +++ b/ui/aura/root_window.h @@ -294,7 +294,14 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate, float param_first, float param_second, unsigned int touch_id_bitfield) OVERRIDE; + + virtual ui::TouchEvent* CreateTouchEvent(ui::EventType type, + const gfx::Point& location, + int touch_id, + base::TimeDelta time_stamp) OVERRIDE; + virtual bool DispatchLongPressGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual bool DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE; // Overridden from ui::LayerAnimationObserver: virtual void OnLayerAnimationEnded( |