diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 19:21:51 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 19:21:51 +0000 |
| commit | 1fb4107ffa7ac548a3ae3ba53d0acdcd081e1988 (patch) | |
| tree | 20c410f34af1bc780416be321db766abf52e0128 /ui/aura/gestures | |
| parent | 8323541e53283880ef252a866dd719a97876c495 (diff) | |
| download | chromium_src-1fb4107ffa7ac548a3ae3ba53d0acdcd081e1988.zip chromium_src-1fb4107ffa7ac548a3ae3ba53d0acdcd081e1988.tar.gz chromium_src-1fb4107ffa7ac548a3ae3ba53d0acdcd081e1988.tar.bz2 | |
aura: Avoid unnecessary recursion when deciding whether a window can accept an event.
BUG=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/63503003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/gestures')
| -rw-r--r-- | ui/aura/gestures/gesture_recognizer_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc index 096505b..7fb6c60 100644 --- a/ui/aura/gestures/gesture_recognizer_unittest.cc +++ b/ui/aura/gestures/gesture_recognizer_unittest.cc @@ -2377,12 +2377,14 @@ TEST_F(GestureRecognizerTest, CaptureSendsGestureEnd) { // released or cancelled), do not receive extra synthetic cancels upon change of // capture. TEST_F(GestureRecognizerTest, CaptureDoesNotCancelFinishedTouches) { + scoped_ptr<GestureEventConsumeDelegate> delegate( + new GestureEventConsumeDelegate()); scoped_ptr<TestEventHandler> handler(new TestEventHandler); root_window()->AddPreTargetHandler(handler.get()); // Create a window and set it as the capture window. - scoped_ptr<aura::Window> window1(CreateTestWindowWithBounds( - gfx::Rect(10, 10, 300, 300), root_window())); + scoped_ptr<aura::Window> window1(CreateTestWindowWithDelegate(delegate.get(), + -1234, gfx::Rect(10, 10, 300, 300), root_window())); window1->SetCapture(); EventGenerator generator(root_window()); |