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

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

Issue 2655303004: Add id properties to PointerEvent (Closed)
Patch Set: pointer id Created 3 years, 10 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
Index: services/ui/ws/window_manager_state.cc
diff --git a/services/ui/ws/window_manager_state.cc b/services/ui/ws/window_manager_state.cc
index ef09226adeb96d26bddb006b0ef7641aeaf6f0a9..c73f4d1ed59c8080f5b34f8fca098035cc8247cc 100644
--- a/services/ui/ws/window_manager_state.cc
+++ b/services/ui/ws/window_manager_state.cc
@@ -44,8 +44,8 @@ bool EventsCanBeCoalesced(const ui::Event& one, const ui::Event& two) {
if (one.type() != ui::ET_POINTER_MOVED)
return false;
- return one.AsPointerEvent()->pointer_id() ==
- two.AsPointerEvent()->pointer_id();
+ return one.AsPointerEvent()->pointer_details().id ==
+ two.AsPointerEvent()->pointer_details().id;
}
std::unique_ptr<ui::Event> CoalesceEvents(std::unique_ptr<ui::Event> first,
@@ -170,7 +170,8 @@ void WindowManagerState::SetDragDropSourceWindow(
int32_t drag_pointer = PointerEvent::kMousePointerId;
if (event_awaiting_input_ack_ &&
event_awaiting_input_ack_->IsPointerEvent()) {
- drag_pointer = event_awaiting_input_ack_->AsPointerEvent()->pointer_id();
+ drag_pointer =
+ event_awaiting_input_ack_->AsPointerEvent()->pointer_details().id;
} else {
NOTIMPLEMENTED() << "Set drag drop set up during something other than a "
<< "pointer event; rejecting drag.";

Powered by Google App Engine
This is Rietveld 408576698