Chromium Code Reviews| Index: ui/aura/window_event_dispatcher.cc |
| diff --git a/ui/aura/window_event_dispatcher.cc b/ui/aura/window_event_dispatcher.cc |
| index 350066f7dd31e9e08c9ca72bf5f77377ab547e3e..c46dd2cac5298a7813a4af01407c322d7cc4d6d6 100644 |
| --- a/ui/aura/window_event_dispatcher.cc |
| +++ b/ui/aura/window_event_dispatcher.cc |
| @@ -22,6 +22,7 @@ |
| #include "ui/base/hit_test.h" |
| #include "ui/compositor/dip_util.h" |
| #include "ui/events/event.h" |
| +#include "ui/events/event_constants.h" |
|
tdresser
2014/08/13 19:57:58
Is this necessary?
lanwei
2014/08/14 00:38:46
No, forgot to delete it.
Done.
|
| #include "ui/events/gestures/gesture_recognizer.h" |
| #include "ui/events/gestures/gesture_types.h" |
| @@ -140,7 +141,6 @@ void WindowEventDispatcher::DispatchGestureEvent(ui::GestureEvent* event) { |
| DispatchDetails details = DispatchHeldEvents(); |
| if (details.dispatcher_destroyed) |
| return; |
| - |
| Window* target = GetGestureTarget(event); |
| if (target) { |
| event->ConvertLocationToTarget(window(), target); |
| @@ -530,6 +530,7 @@ bool WindowEventDispatcher::CanDispatchToConsumer( |
| } |
| void WindowEventDispatcher::DispatchCancelTouchEvent(ui::TouchEvent* event) { |
| + event->UpdateForRootTransform(host_->GetRootTransform()); |
|
tdresser
2014/08/13 19:57:58
Add a comment indicating why this is here.
lanwei
2014/08/14 00:38:46
Done.
|
| DispatchDetails details = OnEventFromSource(event); |
| if (details.dispatcher_destroyed) |
| return; |