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

Unified Diff: content/browser/renderer_host/input/synthetic_gesture_target_aura.cc

Issue 1260453006: ui: events: Add a class to hold common touch and stylus properties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address build problems, add accessor and unit tests. Created 5 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: content/browser/renderer_host/input/synthetic_gesture_target_aura.cc
diff --git a/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc b/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc
index 8bcda99627d4502ce2cb292e91cdfb56be0069bf..dd8627ce049b41c1436ddcd229e51233ca80f9d4 100644
--- a/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc
+++ b/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc
@@ -59,8 +59,10 @@ void SyntheticGestureTargetAura::DispatchWebMouseWheelEventToPlatform(
const ui::LatencyInfo&) {
gfx::PointF location(web_wheel.x * device_scale_factor_,
web_wheel.y * device_scale_factor_);
- ui::MouseEvent mouse_event(ui::ET_MOUSEWHEEL, location, location,
- ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent mouse_event(
+ ui::ET_MOUSEWHEEL, location, location, ui::EventTimeForNow(), ui::EF_NONE,
+ ui::EF_NONE,
+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
ui::MouseWheelEvent wheel_event(
mouse_event, web_wheel.deltaX, web_wheel.deltaY);
@@ -130,8 +132,9 @@ void SyntheticGestureTargetAura::DispatchWebMouseEventToPlatform(
web_mouse.y * device_scale_factor_);
ui::EventType event_type = WebMouseEventTypeToEventType(web_mouse.type);
int flags = WebMouseEventButtonToFlags(web_mouse.button);
- ui::MouseEvent mouse_event(event_type, location, location,
- ui::EventTimeForNow(), flags, flags);
+ ui::MouseEvent mouse_event(
+ event_type, location, location, ui::EventTimeForNow(), flags, flags,
+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
aura::Window* window = GetWindow();
mouse_event.ConvertLocationToTarget(window, window->GetRootWindow());

Powered by Google App Engine
This is Rietveld 408576698