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

Unified Diff: sky/viewer/converters/input_event_types.cc

Issue 875953004: Add a basic sky-scrollable element that scrolls (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 | « sky/framework/sky-scrollable.sky ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/viewer/converters/input_event_types.cc
diff --git a/sky/viewer/converters/input_event_types.cc b/sky/viewer/converters/input_event_types.cc
index ae3d1bcd9e785425e26f43a91646724ad2d6634d..987cd122a223056dc2fa9593acbaf443665f0dd2 100644
--- a/sky/viewer/converters/input_event_types.cc
+++ b/sky/viewer/converters/input_event_types.cc
@@ -101,13 +101,17 @@ scoped_ptr<blink::WebInputEvent> BuildWebGestureEvent(
break;
case mojo::EVENT_TYPE_GESTURE_SCROLL_UPDATE:
web_event->type = blink::WebInputEvent::GestureScrollUpdate;
- web_event->data.scrollUpdate.deltaX = event->gesture_data->scroll_x;
- web_event->data.scrollUpdate.deltaY = event->gesture_data->scroll_y;
+ web_event->data.scrollUpdate.deltaX =
+ event->gesture_data->scroll_x / device_pixel_ratio;
+ web_event->data.scrollUpdate.deltaY =
+ event->gesture_data->scroll_y / device_pixel_ratio;
break;
case mojo::EVENT_TYPE_SCROLL_FLING_START:
web_event->type = blink::WebInputEvent::GestureFlingStart;
- web_event->data.flingStart.velocityX = event->gesture_data->velocity_x;
- web_event->data.flingStart.velocityY = event->gesture_data->velocity_y;
+ web_event->data.flingStart.velocityX =
+ event->gesture_data->velocity_x / device_pixel_ratio;
+ web_event->data.flingStart.velocityY =
+ event->gesture_data->velocity_y / device_pixel_ratio;
break;
case mojo::EVENT_TYPE_SCROLL_FLING_CANCEL:
web_event->type = blink::WebInputEvent::GestureFlingCancel;
@@ -150,7 +154,8 @@ scoped_ptr<blink::WebInputEvent> BuildWebGestureEvent(
break;
case mojo::EVENT_TYPE_GESTURE_PINCH_UPDATE:
web_event->type = blink::WebInputEvent::GesturePinchUpdate;
- web_event->data.pinchUpdate.scale = event->gesture_data->scale;
+ web_event->data.pinchUpdate.scale =
+ event->gesture_data->scale / device_pixel_ratio;
break;
default:
NOTIMPLEMENTED() << "Received unexpected event: " << event->action;
« no previous file with comments | « sky/framework/sky-scrollable.sky ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698