Add scroll units in GestureEvents.

components/test_runner/event_sender.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 "components/test_runner/event_sender.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 390 matching lines @@
 bool IsSystemKeyEvent(const WebKeyboardEvent& event) {
 #if defined(OS_MACOSX)
   return event.modifiers & WebInputEvent::MetaKey &&
       event.windowsKeyCode != ui::VKEY_B &&
       event.windowsKeyCode != ui::VKEY_I;
 #else
   return !!(event.modifiers & WebInputEvent::AltKey);
 #endif
 }
 
+bool GetScrollUnits(gin::Arguments* args, WebGestureEvent::ScrollUnits* units) {
+  std::string units_string;
+  if (!args->PeekNext().IsEmpty()) {
+    if (args->PeekNext()->IsString())
+      args->GetNext(&units_string);
+    if (units_string == "Page") {
+      *units = WebGestureEvent::Page;
+      return true;
+    } else if (units_string == "Pixels") {
+      *units = WebGestureEvent::Pixels;
+      return true;
+    } else if (units_string == "PrecisePixels") {
+      *units = WebGestureEvent::PrecisePixels;
+      return true;
+    } else {
+      args->ThrowError();
+      return false;
+    }
+  } else {
+    *units = WebGestureEvent::PrecisePixels;
+    return true;
+  }
+}
+
 const char* kSourceDeviceStringTouchpad = "touchpad";
 const char* kSourceDeviceStringTouchscreen = "touchscreen";
 
 const char* kPointerTypeStringUnknown = "";
 const char* kPointerTypeStringMouse = "mouse";
 const char* kPointerTypeStringPen = "pen";
 const char* kPointerTypeStringTouch = "touch";
 
 }  // namespace
 
@@ skipping 1714 matching lines @@
   switch (type) {
     case WebInputEvent::GestureScrollUpdate:
     {
       bool preventPropagation = false;
       if (!args->PeekNext().IsEmpty()) {
         if (!args->GetNext(&preventPropagation)) {
           args->ThrowError();
           return;
         }
       }
+      if (!GetScrollUnits(args, &event.data.scrollUpdate.deltaUnits))
+        return;
 
       event.data.scrollUpdate.deltaX = static_cast<float>(x);
       event.data.scrollUpdate.deltaY = static_cast<float>(y);
       event.data.scrollUpdate.preventPropagation = preventPropagation;
       event.x = current_gesture_location_.x;
       event.y = current_gesture_location_.y;
       current_gesture_location_.x =
           current_gesture_location_.x + event.data.scrollUpdate.deltaX;
       current_gesture_location_.y =
           current_gesture_location_.y + event.data.scrollUpdate.deltaY;
@@ skipping 460 matching lines @@
   last_event_timestamp_ = event.timeStampSeconds;
 
   if (WebPagePopup* popup = view_->pagePopup()) {
     if (!WebInputEvent::isKeyboardEventType(event.type))
       return popup->handleInputEvent(event);
   }
   return view_->handleInputEvent(event);
 }
 
 }  // namespace test_runner