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

Unified Diff: ui/events/blink/blink_event_util.cc

Issue 2782893002: WebMouseEvent coordinates are now fractional & private (Closed)
Patch Set: Fixed a compile failure 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/blink/blink_event_util.cc
diff --git a/ui/events/blink/blink_event_util.cc b/ui/events/blink/blink_event_util.cc
index a9050a408d149e5ad1eeb66fce6f476dcf6673ad..64de86614c091a192147c36171b50baec970a5db 100644
--- a/ui/events/blink/blink_event_util.cc
+++ b/ui/events/blink/blink_event_util.cc
@@ -754,10 +754,9 @@ std::unique_ptr<blink::WebInputEvent> TranslateAndScaleWebInputEvent(
blink::WebMouseWheelEvent* wheel_event = new blink::WebMouseWheelEvent;
scaled_event.reset(wheel_event);
*wheel_event = static_cast<const blink::WebMouseWheelEvent&>(event);
- wheel_event->x += delta.x();
- wheel_event->y += delta.y();
- wheel_event->x *= scale;
- wheel_event->y *= scale;
+ float x = (wheel_event->positionInWidget().x + delta.x()) * scale;
+ float y = (wheel_event->positionInWidget().y + delta.y()) * scale;
+ wheel_event->setPositionInWidget(x, y);
if (!wheel_event->scrollByPage) {
wheel_event->deltaX *= scale;
wheel_event->deltaY *= scale;
@@ -768,10 +767,9 @@ std::unique_ptr<blink::WebInputEvent> TranslateAndScaleWebInputEvent(
blink::WebMouseEvent* mouse_event = new blink::WebMouseEvent;
scaled_event.reset(mouse_event);
*mouse_event = static_cast<const blink::WebMouseEvent&>(event);
- mouse_event->x += delta.x();
- mouse_event->y += delta.y();
- mouse_event->x *= scale;
- mouse_event->y *= scale;
+ float x = (mouse_event->positionInWidget().x + delta.x()) * scale;
+ float y = (mouse_event->positionInWidget().y + delta.y()) * scale;
+ mouse_event->setPositionInWidget(x, y);
mouse_event->movementX *= scale;
mouse_event->movementY *= scale;
} else if (blink::WebInputEvent::isTouchEventType(event.type())) {

Powered by Google App Engine
This is Rietveld 408576698