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

Unified Diff: services/ui/ws/platform_display.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: rebase 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
« no previous file with comments | « services/ui/ws/event_dispatcher_unittest.cc ('k') | ui/events/event.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/platform_display.cc
diff --git a/services/ui/ws/platform_display.cc b/services/ui/ws/platform_display.cc
index 88d843592fc61a5708d63105595cd509515746ee..4f9c32c8ec4449e366556b9e894999bcb6b0ac18 100644
--- a/services/ui/ws/platform_display.cc
+++ b/services/ui/ws/platform_display.cc
@@ -211,8 +211,9 @@ void DefaultPlatformDisplay::DispatchEvent(ui::Event* event) {
if (event->IsScrollEvent()) {
// TODO(moshayedi): crbug.com/602859. Dispatch scroll events as
// they are once we have proper support for scroll events.
- delegate_->OnEvent(ui::MouseWheelEvent(*event->AsScrollEvent()));
- } else if (event->IsMouseEvent() && !event->IsMouseWheelEvent()) {
+ delegate_->OnEvent(
+ ui::PointerEvent(ui::MouseWheelEvent(*event->AsScrollEvent())));
+ } else if (event->IsMouseEvent()) {
delegate_->OnEvent(ui::PointerEvent(*event->AsMouseEvent()));
} else if (event->IsTouchEvent()) {
delegate_->OnEvent(ui::PointerEvent(*event->AsTouchEvent()));
« no previous file with comments | « services/ui/ws/event_dispatcher_unittest.cc ('k') | ui/events/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698