Add wheel support to sky-scrollable

sky/viewer/converters/input_event_types.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sky/viewer/converters/input_event_types.h"
 
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "mojo/services/input_events/public/interfaces/input_event_constants.mojom.h"
 #include "sky/engine/public/platform/WebInputEvent.h"
@@ skipping 147 matching lines @@
           event->gesture_data->scale / device_pixel_ratio;
       break;
     default:
       NOTIMPLEMENTED() << "Received unexpected event: " << event->action;
       break;
   }
 
   web_event->x = event->location_data->in_view_location->x / device_pixel_ratio;
   web_event->y = event->location_data->in_view_location->y / device_pixel_ratio;
 
-  // TODO(erg): Remove this null check as parallel to above.
-  if (!event->location_data->screen_location.is_null()) {
-    web_event->globalX =
-        event->location_data->screen_location->x / device_pixel_ratio;
-    web_event->globalY =
-        event->location_data->screen_location->y / device_pixel_ratio;
-  }
-
   return web_event.Pass();
 }
 
 scoped_ptr<blink::WebInputEvent> BuildWebKeyboardEvent(
     const mojo::EventPtr& event,
     float device_pixel_ratio) {
   scoped_ptr<blink::WebKeyboardEvent> web_event(new blink::WebKeyboardEvent);
 
   web_event->modifiers = EventFlagsToWebInputEventModifiers(event->flags);
   web_event->timeStampMS =
@@ skipping 11 matching lines @@
       NOTREACHED();
   }
 
   web_event->key = event->key_data->windows_key_code;
   web_event->charCode = event->key_data->text;
   web_event->unmodifiedCharCode = event->key_data->unmodified_text;
 
   return web_event.Pass();
 }
 
+scoped_ptr<blink::WebInputEvent> BuildWebWheelEvent(
+    const mojo::EventPtr& event, float device_pixel_ratio) {
+  scoped_ptr<blink::WebWheelEvent> web_event(new blink::WebWheelEvent);
+
+  web_event->modifiers = EventFlagsToWebInputEventModifiers(event->flags);
+  web_event->timeStampMS =
+      base::TimeDelta::FromInternalValue(event->time_stamp).InMillisecondsF();
+
+  web_event->type = blink::WebInputEvent::WheelEvent;
+
+  const auto& location = event->location_data->in_view_location;
+  web_event->x = location->x / device_pixel_ratio;
+  web_event->y = location->y / device_pixel_ratio;
+
+  web_event->offsetX = event->wheel_data->x_offset / device_pixel_ratio;
+  web_event->offsetY = event->wheel_data->y_offset / device_pixel_ratio;
+
+  return web_event.Pass();
+}
+
 }  // namespace
 
 scoped_ptr<blink::WebInputEvent> ConvertEvent(const mojo::EventPtr& event,
                                               float device_pixel_ratio) {
   if (event->action == mojo::EVENT_TYPE_TOUCH_RELEASED ||
       event->action == mojo::EVENT_TYPE_TOUCH_PRESSED ||
       event->action == mojo::EVENT_TYPE_TOUCH_MOVED ||
       event->action == mojo::EVENT_TYPE_TOUCH_CANCELLED ||
       event->action == mojo::EVENT_TYPE_MOUSE_DRAGGED ||
       event->action == mojo::EVENT_TYPE_MOUSE_PRESSED ||
@@ skipping 18 matching lines @@
              event->action == mojo::EVENT_TYPE_GESTURE_SWIPE ||
              event->action == mojo::EVENT_TYPE_GESTURE_SHOW_PRESS ||
              event->action == mojo::EVENT_TYPE_GESTURE_WIN8_EDGE_SWIPE ||
              event->action == mojo::EVENT_TYPE_SCROLL_FLING_START ||
              event->action == mojo::EVENT_TYPE_SCROLL_FLING_CANCEL) {
     return BuildWebGestureEvent(event, device_pixel_ratio);
   } else if ((event->action == mojo::EVENT_TYPE_KEY_PRESSED ||
               event->action == mojo::EVENT_TYPE_KEY_RELEASED) &&
              event->key_data) {
     return BuildWebKeyboardEvent(event, device_pixel_ratio);
+  } else if (event->action == mojo::EVENT_TYPE_MOUSEWHEEL &&
+             event->wheel_data) {
+    return BuildWebWheelEvent(event, device_pixel_ratio);
   }
 
   return scoped_ptr<blink::WebInputEvent>();
 }
 
 }  // namespace mojo