diff options
| author | tdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 23:10:18 +0000 |
|---|---|---|
| committer | tdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 23:10:18 +0000 |
| commit | 62cf1d7bea18a0e37faaf3cea0159aa9af6f7df3 (patch) | |
| tree | 4e098d0993ddad6771279980333d2711bc63fee5 /ash/drag_drop | |
| parent | 85c5dd305a8941e043a9fa4f48c5fb3eef98c759 (diff) | |
| download | chromium_src-62cf1d7bea18a0e37faaf3cea0159aa9af6f7df3.zip chromium_src-62cf1d7bea18a0e37faaf3cea0159aa9af6f7df3.tar.gz chromium_src-62cf1d7bea18a0e37faaf3cea0159aa9af6f7df3.tar.bz2 | |
Replace touch_ids_bitfield_ with first_touch_id_.
touch_ids_bitfield was overcomplicated, and we never used anything
except for the lowest touch id.
BUG=366707
TEST=GestureRecognizerTest
Review URL: https://codereview.chromium.org/344763003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283070 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 4 | ||||
| -rw-r--r-- | ash/drag_drop/drag_drop_controller_unittest.cc | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 4a2603f..b1a4289 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -65,13 +65,11 @@ gfx::Rect AdjustDragImageBoundsForScaleAndOffset( void DispatchGestureEndToWindow(aura::Window* window) { if (window && window->delegate()) { ui::GestureEvent gesture_end( - ui::ET_GESTURE_END, 0, 0, 0, ui::EventTimeForNow(), - ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0), - 0); + ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0)); window->delegate()->OnGestureEvent(&gesture_end); } } diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index ce4810e..c45ba68 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -273,14 +273,10 @@ void AddViewToWidgetAndResize(views::Widget* widget, views::View* view) { } void DispatchGesture(ui::EventType gesture_type, gfx::Point location) { + ui::GestureEventDetails event_details(gesture_type, 0, 0); + event_details.set_oldest_touch_id(1); ui::GestureEvent gesture_event( - gesture_type, - location.x(), - location.y(), - 0, - ui::EventTimeForNow(), - ui::GestureEventDetails(gesture_type, 0, 0), - 1); + location.x(), location.y(), 0, ui::EventTimeForNow(), event_details); ui::EventSource* event_source = Shell::GetPrimaryRootWindow()->GetHost()->GetEventSource(); ui::EventSourceTestApi event_source_test(event_source); |