Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(915)

Unified Diff: services/ui/ws/event_dispatcher.cc

Issue 2753163004: Remove ID from ui::PointerEvent's constructors (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/ui/ws/drag_controller_unittest.cc ('k') | services/ui/ws/window_manager_state_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/event_dispatcher.cc
diff --git a/services/ui/ws/event_dispatcher.cc b/services/ui/ws/event_dispatcher.cc
index 21deea9ddd2211b76ab46cba0fcde7601bc7ad93..e549706f85ba2f4924d737bf8f1c6b08e52fa98b 100644
--- a/services/ui/ws/event_dispatcher.cc
+++ b/services/ui/ws/event_dispatcher.cc
@@ -465,9 +465,9 @@ void EventDispatcher::UpdateTargetForPointer(int32_t pointer_id,
if (event.IsMousePointerEvent()) {
ui::PointerEvent exit_event(
ui::ET_POINTER_EXITED, event.location(), event.root_location(),
- event.flags(), ui::PointerEvent::kMousePointerId,
- 0 /* changed_button_flags */,
- ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
+ event.flags(), 0 /* changed_button_flags */,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE,
+ ui::PointerEvent::kMousePointerId),
event.time_stamp());
DispatchToPointerTarget(pointer_targets_[pointer_id], exit_event);
}
@@ -618,8 +618,8 @@ void EventDispatcher::CancelImplicitCaptureExcept(ServerWindow* window,
// TODO(jonross): Track previous location in PointerTarget for sending
// cancels.
ui::PointerEvent event(event_type, gfx::Point(), gfx::Point(), ui::EF_NONE,
- pair.first, 0 /* changed_button_flags */,
- ui::PointerDetails(pointer_type),
+ 0 /* changed_button_flags */,
+ ui::PointerDetails(pointer_type, pair.first),
ui::EventTimeForNow());
DispatchToPointerTarget(pair.second, event);
}
« no previous file with comments | « services/ui/ws/drag_controller_unittest.cc ('k') | services/ui/ws/window_manager_state_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698