[UseZoomForDSF] Alwatys use DIP coordinates in pepper plugin

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 579e243e2746759097669f9ea23235c6684948a8..ed57443c40f703926b6ad1a4053d79b8bd2738f3 100644
--- a/content/browser/renderer_host/input/web_input_event_util.cc
+++ b/content/browser/renderer_host/input/web_input_event_util.cc
@@ -70,112 +70,4 @@ blink::WebInputEvent::Modifiers DomCodeToWebInputEventModifiers(
   return static_cast<blink::WebInputEvent::Modifiers>(0);
 }
 
-// This coversino is temporary. WebInputEvent should be generated
-// directly fromui::Event with the viewport coordinates. See
-// crbug.com/563730.
-scoped_ptr<blink::WebInputEvent> ConvertWebInputEventToViewport(
-    const blink::WebInputEvent& event,
-    float scale) {
-  scoped_ptr<blink::WebInputEvent> scaled_event;
-  if (scale == 1.f)
-    return scaled_event;
-  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->x *= scale;
-    wheel_event->y *= scale;
-    wheel_event->deltaX *= scale;
-    wheel_event->deltaY *= scale;
-    wheel_event->wheelTicksX *= scale;
-    wheel_event->wheelTicksY *= 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::GesturePinchUpdate:
-        // Scale in pinch gesture is DSF agnostic.
-        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;
-
-      // These event does not have location data.
-      case blink::WebInputEvent::GesturePinchBegin:
-      case blink::WebInputEvent::GesturePinchEnd:
-      case blink::WebInputEvent::GestureTapCancel:
-      case blink::WebInputEvent::GestureFlingCancel:
-      case blink::WebInputEvent::GestureScrollEnd:
-        break;
-
-      // TODO(oshima): Find out if ContextMenu needs to be scaled.
-      default:
-        break;
-    }
-  }
-  return scaled_event;
-}
-
 }  // namespace content