Convert the coordinates in WebInputEvent To Viewport in InputRouter

content/browser/renderer_host/input/web_input_event_util.cc

Index: content/browser/renderer_host/input/web_input_event_util.cc
diff --git a/content/browser/renderer_host/input/web_input_event_util.cc b/content/browser/renderer_host/input/web_input_event_util.cc
index daf30ff55163db0aadcc8227f24fd111f77ca871..a9afdace78b0fd90f367e427759d10e70db0f776 100644
--- a/content/browser/renderer_host/input/web_input_event_util.cc
+++ b/content/browser/renderer_host/input/web_input_event_util.cc
@@ -10,6 +10,7 @@
 #include <cmath>
 
 #include "base/strings/string_util.h"
+#include "content/common/content_switches_internal.h"
 #include "content/common/input/web_touch_event_traits.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/event_constants.h"
@@ -71,4 +72,103 @@ blink::WebInputEvent::Modifiers DomCodeToWebInputEventModifiers(
   return static_cast<blink::WebInputEvent::Modifiers>(0);
 }
 
+scoped_ptr<blink::WebInputEvent> ConvertWebInputEventToViewport(
+    const blink::WebInputEvent& event,
+    float scale) {
+  scoped_ptr<blink::WebInputEvent> scaled_event;
+  if (!IsUseZoomForDSFEnabled())
+    return scaled_event;

[Rick Byers, 2015/11/12 19:45:36]

this is uninitialized, did you mean 'event'?

[oshima, 2015/11/12 21:59:01]

nullptr is used as a way to indicate that conversion didn't happen.
I can't use event as it requires ownership transfer.

+  if (event.type == blink::WebMouseEvent::MouseWheel) {
+    blink::WebMouseWheelEvent* wheel_event = new blink::WebMouseWheelEvent;
+    scaled_event.reset(wheel_event);
+    *wheel_event = static_cast<const blink::WebMouseWheelEvent&>(event);
+    wheel_event->deltaX *= scale;
+    wheel_event->deltaY *= scale;
+  } else if (blink::WebInputEvent::isMouseEventType(event.type)) {
+    blink::WebMouseEvent* mouse_event = new blink::WebMouseEvent;
+    scaled_event.reset(mouse_event);
+    *mouse_event = static_cast<const blink::WebMouseEvent&>(event);
+    mouse_event->x *= scale;
+    mouse_event->y *= scale;
+    mouse_event->windowX = mouse_event->x;
+    mouse_event->windowY = mouse_event->y;
+    mouse_event->movementX *= scale;
+    mouse_event->movementY *= scale;
+  } else if (blink::WebInputEvent::isTouchEventType(event.type)) {
+    blink::WebTouchEvent* touch_event = new blink::WebTouchEvent;
+    scaled_event.reset(touch_event);
+    *touch_event = static_cast<const blink::WebTouchEvent&>(event);
+    for (unsigned i = 0; i < touch_event->touchesLength; i++) {
+      touch_event->touches[i].position.x *= scale;
+      touch_event->touches[i].position.y *= scale;
+      touch_event->touches[i].radiusX *= scale;
+      touch_event->touches[i].radiusY *= scale;
+    }
+  } else if (blink::WebInputEvent::isGestureEventType(event.type)) {
+    blink::WebGestureEvent* gesture_event = new blink::WebGestureEvent;
+    scaled_event.reset(gesture_event);
+    *gesture_event = static_cast<const blink::WebGestureEvent&>(event);
+    gesture_event->x *= scale;
+    gesture_event->y *= scale;
+    switch (gesture_event->type) {
+      case blink::WebInputEvent::GestureScrollUpdate:
+        gesture_event->data.scrollUpdate.deltaX *= scale;
+        gesture_event->data.scrollUpdate.deltaY *= scale;
+        break;
+      case blink::WebInputEvent::GestureScrollBegin:
+        gesture_event->data.scrollBegin.deltaXHint *= scale;
+        gesture_event->data.scrollBegin.deltaYHint *= scale;
+        break;
+
+      case blink::WebInputEvent::GesturePinchBegin:
+      case blink::WebInputEvent::GesturePinchUpdate:
+      case blink::WebInputEvent::GesturePinchEnd:
+        //

[Rick Byers, 2015/11/12 19:45:36]

why isn't pinch scale scaled?

[oshima, 2015/11/12 21:59:01]

pinch only has scale, which is agnostic to dsf. I tested on pixel and the pinch
zoom behavior was same. 

+        break;
+
+      case blink::WebInputEvent::GestureDoubleTap:
+      case blink::WebInputEvent::GestureTap:
+      case blink::WebInputEvent::GestureTapUnconfirmed:
+        gesture_event->data.tap.width *= scale;
+        gesture_event->data.tap.height *= scale;
+        break;
+
+      case blink::WebInputEvent::GestureTapDown:
+        gesture_event->data.tapDown.width *= scale;
+        gesture_event->data.tapDown.height *= scale;
+        break;
+
+      case blink::WebInputEvent::GestureShowPress:
+        gesture_event->data.showPress.width *= scale;
+        gesture_event->data.showPress.height *= scale;
+        break;
+
+      case blink::WebInputEvent::GestureLongPress:
+      case blink::WebInputEvent::GestureLongTap:
+        gesture_event->data.longPress.width *= scale;
+        gesture_event->data.longPress.height *= scale;
+        break;
+
+      case blink::WebInputEvent::GestureTwoFingerTap:
+        gesture_event->data.twoFingerTap.firstFingerWidth *= scale;
+        gesture_event->data.twoFingerTap.firstFingerHeight *= scale;
+        break;
+
+      case blink::WebInputEvent::GestureFlingStart:
+        gesture_event->data.flingStart.velocityX *= scale;
+        gesture_event->data.flingStart.velocityY *= scale;
+        break;
+
+      case blink::WebInputEvent::GestureTapCancel:
+      case blink::WebInputEvent::GestureFlingCancel:
+      case blink::WebInputEvent::GestureScrollEnd:
+        break;
+
+      default:
+        break;
+    }
+  }
+  return scaled_event;
+}
+
 }  // namespace content