diff options
| author | tdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 00:34:54 +0000 |
|---|---|---|
| committer | tdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 00:34:54 +0000 |
| commit | 6de5838db6e5afe923092cf1de1ca80caf47b5fd (patch) | |
| tree | 6f04936526399df7d7738d1692c25946bb9ae65d /ash/drag_drop | |
| parent | badf1c4f73b557bb74e6c0516ec87c712b9350d8 (diff) | |
| download | chromium_src-6de5838db6e5afe923092cf1de1ca80caf47b5fd.zip chromium_src-6de5838db6e5afe923092cf1de1ca80caf47b5fd.tar.gz chromium_src-6de5838db6e5afe923092cf1de1ca80caf47b5fd.tar.bz2 | |
Reland Unified Gesture Recognizer for Aura
Original patch here: https://codereview.chromium.org/251543003/.
Reverted here: https://codereview.chromium.org/278183002/,
due to memory management issues in tests.
Relanding with a better strategy for cleaning up deleted
GestureProviderAura objects.
This adds the unified GR for Aura behind the --use-unified-gesture-detector flag.
BUG=332418
TEST=GestureRecognizer/GestureRecognizerTest.*
MotionEventUITest.*
TBR=jochen
Review URL: https://codereview.chromium.org/282593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller_unittest.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index 7e84ed4..34bd1d3 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -24,6 +24,7 @@ #include "ui/events/event.h" #include "ui/events/event_utils.h" #include "ui/events/gestures/gesture_types.h" +#include "ui/events/test/events_test_utils.h" #include "ui/gfx/animation/linear_animation.h" #include "ui/gfx/image/image_skia_rep.h" #include "ui/views/view.h" @@ -281,8 +282,12 @@ void DispatchGesture(ui::EventType gesture_type, gfx::Point location) { ui::EventTimeForNow(), ui::GestureEventDetails(gesture_type, 0, 0), 1); - Shell::GetPrimaryRootWindow()->GetHost()->dispatcher()->DispatchGestureEvent( - &gesture_event); + ui::EventSource* event_source = + Shell::GetPrimaryRootWindow()->GetHost()->GetEventSource(); + ui::EventSourceTestApi event_source_test(event_source); + ui::EventDispatchDetails details = + event_source_test.SendEventToProcessor(&gesture_event); + CHECK(!details.dispatcher_destroyed); } } // namespace |