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

Unified Diff: ui/events/event.cc

Issue 2256343003: Update ui::PointerEvent to support mouse wheel and capture change events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 4 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/event.cc
diff --git a/ui/events/event.cc b/ui/events/event.cc
index eff99926a21b3d44e1d31a6f1d1e30d897f6e899..a83aff76bb064dfd97c2cc94e706c7e4236776da 100644
--- a/ui/events/event.cc
+++ b/ui/events/event.cc
@@ -104,6 +104,8 @@ std::string EventTypeName(ui::EventType type) {
CASE_TYPE(ET_POINTER_CANCELLED);
CASE_TYPE(ET_POINTER_ENTERED);
CASE_TYPE(ET_POINTER_EXITED);
+ CASE_TYPE(ET_POINTER_WHEEL_CHANGED);
+ CASE_TYPE(ET_POINTER_CAPTURE_CHANGED);
CASE_TYPE(ET_GESTURE_SCROLL_BEGIN);
CASE_TYPE(ET_GESTURE_SCROLL_END);
CASE_TYPE(ET_GESTURE_SCROLL_UPDATE);
@@ -496,6 +498,14 @@ MouseEvent::MouseEvent(const PointerEvent& pointer_event)
SetType(ET_MOUSE_RELEASED);
break;
+ case ET_POINTER_WHEEL_CHANGED:
+ SetType(ET_MOUSEWHEEL);
+ break;
+
+ case ET_POINTER_CAPTURE_CHANGED:
+ SetType(ET_MOUSE_CAPTURE_CHANGED);
+ break;
+
default:
NOTREACHED();
}
@@ -847,6 +857,8 @@ bool PointerEvent::CanConvertFrom(const Event& event) {
case ET_MOUSE_ENTERED:
case ET_MOUSE_EXITED:
case ET_MOUSE_RELEASED:
+ case ET_MOUSEWHEEL:
+ case ET_MOUSE_CAPTURE_CHANGED:
case ET_TOUCH_PRESSED:
case ET_TOUCH_MOVED:
case ET_TOUCH_RELEASED:
@@ -889,6 +901,16 @@ PointerEvent::PointerEvent(const MouseEvent& mouse_event)
SetType(ET_POINTER_UP);
break;
+ case ET_MOUSEWHEEL:
+ SetType(ET_POINTER_WHEEL_CHANGED);
+ details_ = PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
+ mouse_event.AsMouseWheelEvent()->offset());
+ break;
+
+ case ET_MOUSE_CAPTURE_CHANGED:
+ SetType(ET_POINTER_CAPTURE_CHANGED);
+ break;
+
default:
NOTREACHED();
}

Powered by Google App Engine
This is Rietveld 408576698