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

Unified Diff: ui/events/platform/x11/x11_event_source_libevent.cc

Issue 2786693002: Add PointerDetails to ui::MouseEvent's constructors (Closed)
Patch Set: mouse event constructor 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
Index: ui/events/platform/x11/x11_event_source_libevent.cc
diff --git a/ui/events/platform/x11/x11_event_source_libevent.cc b/ui/events/platform/x11/x11_event_source_libevent.cc
index 7edd46c84661c99ee44eef5d3667cdec56b8b6c6..9bdd6097ebdac4e1395968f42f1ba0940b2cf3ac 100644
--- a/ui/events/platform/x11/x11_event_source_libevent.cc
+++ b/ui/events/platform/x11/x11_event_source_libevent.cc
@@ -37,7 +37,9 @@ std::unique_ptr<ui::Event> TranslateXI2EventToEvent(const XEvent& xev) {
return base::MakeUnique<MouseEvent>(
event_type, EventLocationFromXEvent(xev),
EventSystemLocationFromXEvent(xev), EventTimeFromXEvent(xev),
- EventFlagsFromXEvent(xev), GetChangedMouseButtonFlagsFromXEvent(xev));
+ EventFlagsFromXEvent(xev), GetChangedMouseButtonFlagsFromXEvent(xev),
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE,
+ ui::PointerEvent::kMousePointerId));
case ET_MOUSEWHEEL:
return base::MakeUnique<MouseWheelEvent>(
GetMouseWheelOffsetFromXEvent(xev), EventLocationFromXEvent(xev),
@@ -91,10 +93,12 @@ std::unique_ptr<ui::Event> TranslateXEventToEvent(const XEvent& xev) {
// not real mouse move event.
if (xev.type == EnterNotify)
flags |= EF_IS_SYNTHESIZED;
- return base::MakeUnique<MouseEvent>(ET_MOUSE_MOVED,
- EventLocationFromXEvent(xev),
- EventSystemLocationFromXEvent(xev),
- EventTimeFromXEvent(xev), flags, 0);
+ return base::MakeUnique<MouseEvent>(
+ ET_MOUSE_MOVED, EventLocationFromXEvent(xev),
+ EventSystemLocationFromXEvent(xev), EventTimeFromXEvent(xev), flags,
+ 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE,
+ ui::PointerEvent::kMousePointerId));
case KeyPress:
case KeyRelease:
@@ -114,7 +118,9 @@ std::unique_ptr<ui::Event> TranslateXEventToEvent(const XEvent& xev) {
return base::MakeUnique<MouseEvent>(
EventTypeFromXEvent(xev), EventLocationFromXEvent(xev),
EventSystemLocationFromXEvent(xev), EventTimeFromXEvent(xev),
- flags, GetChangedMouseButtonFlagsFromXEvent(xev));
+ flags, GetChangedMouseButtonFlagsFromXEvent(xev),
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE,
+ ui::PointerEvent::kMousePointerId));
case ET_UNKNOWN:
// No event is created for X11-release events for mouse-wheel
// buttons.

Powered by Google App Engine
This is Rietveld 408576698