Merge 142571

Source/WebKit/chromium/src/WebInputEventConversion.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 36 matching lines @@
 #include "WebInputEvent.h"
 #include "WheelEvent.h"
 #include "Widget.h"
 
 using namespace WebCore;
 
 namespace WebKit {
 
 static const double millisPerSecond = 1000.0;
 
+static float widgetScaleFactor(const Widget* widget)
+{
+    if (!widget)
+        return 1;
+
+    ScrollView* rootView = widget->root();
+    if (!rootView)
+        return 1;
+
+    return rootView->visibleContentScaleFactor();
+}
+
 // MakePlatformMouseEvent -----------------------------------------------------
 
 PlatformMouseEventBuilder::PlatformMouseEventBuilder(Widget* widget, const WebMouseEvent& e)
 {
+    float scale = widgetScaleFactor(widget);
     // FIXME: widget is always toplevel, unless it's a popup.  We may be able
     // to get rid of this once we abstract popups into a WebKit API.
-    m_position = widget->convertFromContainingWindow(IntPoint(e.x, e.y));
+    m_position = widget->convertFromContainingWindow(IntPoint(e.x / scale, e.y / scale));
     m_globalPosition = IntPoint(e.globalX, e.globalY);
 #if ENABLE(POINTER_LOCK)
-    m_movementDelta = IntPoint(e.movementX, e.movementY);
+    m_movementDelta = IntPoint(e.movementX / scale, e.movementY / scale);
 #endif
     m_button = static_cast<MouseButton>(e.button);
 
     m_modifiers = 0;
     if (e.modifiers & WebInputEvent::ShiftKey)
         m_modifiers |= PlatformEvent::ShiftKey;
     if (e.modifiers & WebInputEvent::ControlKey)
         m_modifiers |= PlatformEvent::CtrlKey;
     if (e.modifiers & WebInputEvent::AltKey)
         m_modifiers |= PlatformEvent::AltKey;
@@ skipping 20 matching lines @@
 
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
 // PlatformWheelEventBuilder --------------------------------------------------
 
 PlatformWheelEventBuilder::PlatformWheelEventBuilder(Widget* widget, const WebMouseWheelEvent& e)
 {
-    m_position = widget->convertFromContainingWindow(IntPoint(e.x, e.y));
+    float scale = widgetScaleFactor(widget);
+    m_position = widget->convertFromContainingWindow(IntPoint(e.x / scale, e.y / scale));
     m_globalPosition = IntPoint(e.globalX, e.globalY);
     m_deltaX = e.deltaX;
     m_deltaY = e.deltaY;
     m_wheelTicksX = e.wheelTicksX;
     m_wheelTicksY = e.wheelTicksY;
     m_granularity = e.scrollByPage ?
         ScrollByPageWheelEvent : ScrollByPixelWheelEvent;
     
     m_type = PlatformEvent::Wheel;
 
@@ skipping 16 matching lines @@
     m_unacceleratedScrollingDeltaX = e.deltaX;
     m_unacceleratedScrollingDeltaY = e.deltaY;
 #endif
 }
 
 // PlatformGestureEventBuilder --------------------------------------------------
 
 #if ENABLE(GESTURE_EVENTS)
 PlatformGestureEventBuilder::PlatformGestureEventBuilder(Widget* widget, const WebGestureEvent& e)
 {
+    float scale = widgetScaleFactor(widget);
     switch (e.type) {
     case WebInputEvent::GestureScrollBegin:
         m_type = PlatformEvent::GestureScrollBegin;
         break;
     case WebInputEvent::GestureScrollEnd:
         m_type = PlatformEvent::GestureScrollEnd;
         break;
     case WebInputEvent::GestureScrollUpdate:
         m_type = PlatformEvent::GestureScrollUpdate;
-        m_deltaX = e.data.scrollUpdate.deltaX;
-        m_deltaY = e.data.scrollUpdate.deltaY;
+        m_deltaX = e.data.scrollUpdate.deltaX / scale;
+        m_deltaY = e.data.scrollUpdate.deltaY / scale;
         break;
     case WebInputEvent::GestureScrollUpdateWithoutPropagation:
         m_type = PlatformEvent::GestureScrollUpdateWithoutPropagation;
-        m_deltaX = e.data.scrollUpdate.deltaX;
-        m_deltaY = e.data.scrollUpdate.deltaY;
+        m_deltaX = e.data.scrollUpdate.deltaX / scale;
+        m_deltaY = e.data.scrollUpdate.deltaY / scale;
         break;
     case WebInputEvent::GestureTap:
         m_type = PlatformEvent::GestureTap;
-        m_area = IntSize(e.data.tap.width, e.data.tap.height);
+        m_area = expandedIntSize(FloatSize(e.data.tap.width / scale, e.data.tap.height / scale));
         // FIXME: PlatformGestureEvent deltaX is overloaded - wkb.ug/93123
         m_deltaX = static_cast<int>(e.data.tap.tapCount);
         break;
     case WebInputEvent::GestureTapDown:
         m_type = PlatformEvent::GestureTapDown;
-        m_area = IntSize(e.data.tapDown.width, e.data.tapDown.height);
+        m_area = expandedIntSize(FloatSize(e.data.tapDown.width / scale, e.data.tapDown.height / scale));
         break;
     case WebInputEvent::GestureTapCancel:
         m_type = PlatformEvent::GestureTapDownCancel;
         break;
     case WebInputEvent::GestureDoubleTap:
         m_type = PlatformEvent::GestureDoubleTap;
         break;
     case WebInputEvent::GestureTwoFingerTap:
         m_type = PlatformEvent::GestureTwoFingerTap;
-        m_area = IntSize(e.data.twoFingerTap.firstFingerWidth, e.data.twoFingerTap.firstFingerHeight);
+        m_area = expandedIntSize(FloatSize(e.data.twoFingerTap.firstFingerWidth / scale, e.data.twoFingerTap.firstFingerHeight / scale));
         break;
     case WebInputEvent::GestureLongPress:
         m_type = PlatformEvent::GestureLongPress;
-        m_area = IntSize(e.data.longPress.width, e.data.longPress.height);
+        m_area = expandedIntSize(FloatSize(e.data.longPress.width / scale, e.data.longPress.height / scale));
         break;
     case WebInputEvent::GestureLongTap:
         m_type = PlatformEvent::GestureLongTap;
-        m_area = IntSize(e.data.longPress.width, e.data.longPress.height);
+        m_area = expandedIntSize(FloatSize(e.data.longPress.width / scale, e.data.longPress.height / scale));
         break;
     case WebInputEvent::GesturePinchBegin:
         m_type = PlatformEvent::GesturePinchBegin;
         break;
     case WebInputEvent::GesturePinchEnd:
         m_type = PlatformEvent::GesturePinchEnd;
         break;
     case WebInputEvent::GesturePinchUpdate:
         m_type = PlatformEvent::GesturePinchUpdate;
         // FIXME: PlatformGestureEvent deltaX is overloaded - wkb.ug/93123
         m_deltaX = e.data.pinchUpdate.scale;
         break;
     default:
         ASSERT_NOT_REACHED();
     }
-    m_position = widget->convertFromContainingWindow(IntPoint(e.x, e.y));
+    m_position = widget->convertFromContainingWindow(IntPoint(e.x / scale, e.y / scale));
     m_globalPosition = IntPoint(e.globalX, e.globalY);
     m_timestamp = e.timeStampSeconds;
 
     m_modifiers = 0;
     if (e.modifiers & WebInputEvent::ShiftKey)
         m_modifiers |= PlatformEvent::ShiftKey;
     if (e.modifiers & WebInputEvent::ControlKey)
         m_modifiers |= PlatformEvent::CtrlKey;
     if (e.modifiers & WebInputEvent::AltKey)
         m_modifiers |= PlatformEvent::AltKey;
@@ skipping 141 matching lines @@
         return WebTouchPoint::StateCancelled;
     if (type == eventNames().touchstartEvent)
         return WebTouchPoint::StatePressed;
     if (type == eventNames().touchmoveEvent)
         return WebTouchPoint::StateMoved;
     return WebTouchPoint::StateUndefined;
 }
 
 PlatformTouchPointBuilder::PlatformTouchPointBuilder(Widget* widget, const WebTouchPoint& point)
 {
+    float scale = widgetScaleFactor(widget);
     m_id = point.id;
     m_state = toPlatformTouchPointState(point.state);
-    m_pos = widget->convertFromContainingWindow(point.position);
+    m_pos = widget->convertFromContainingWindow(IntPoint(point.position.x / scale, point.position.y / scale));
     m_screenPos = point.screenPosition;
-    m_radiusY = point.radiusY;
-    m_radiusX = point.radiusX;
+    m_radiusY = point.radiusY / scale;
+    m_radiusX = point.radiusX / scale;
     m_rotationAngle = point.rotationAngle;
     m_force = point.force;
 }
 
 PlatformTouchEventBuilder::PlatformTouchEventBuilder(Widget* widget, const WebTouchEvent& event)
 {
     m_type = toPlatformTouchEventType(event.type);
 
     m_modifiers = 0;
     if (event.modifiers & WebInputEvent::ShiftKey)
@@ skipping 26 matching lines @@
     return modifiers;
 }
 
 static IntPoint convertAbsoluteLocationForRenderObject(const LayoutPoint& location, const WebCore::RenderObject& renderObject)
 {
     return roundedIntPoint(renderObject.absoluteToLocal(location, UseTransforms));
 }
 
 static void updateWebMouseEventFromWebCoreMouseEvent(const MouseRelatedEvent& event, const Widget& widget, const WebCore::RenderObject& renderObject, WebMouseEvent& webEvent)
 {
+    float scale = widgetScaleFactor(&widget);
     webEvent.timeStampSeconds = event.timeStamp() / millisPerSecond;
     webEvent.modifiers = getWebInputModifiers(event);
 
-    ScrollView* view = widget.parent();
+    ScrollView* view = widget.root();
     IntPoint windowPoint = view->contentsToWindow(IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y()));
     webEvent.globalX = event.screenX();
     webEvent.globalY = event.screenY();
-    webEvent.windowX = windowPoint.x();
-    webEvent.windowY = windowPoint.y();
+    webEvent.windowX = windowPoint.x() * scale;
+    webEvent.windowY = windowPoint.y() * scale;
     IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteLocation(), renderObject);
-    webEvent.x = localPoint.x();
-    webEvent.y = localPoint.y();
+    webEvent.x = localPoint.x() * scale;
+    webEvent.y = localPoint.y() * scale;
 }
 
 WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const WebCore::RenderObject* renderObject, const MouseEvent& event)
 {
     if (event.type() == eventNames().mousemoveEvent)
         type = WebInputEvent::MouseMove;
     else if (event.type() == eventNames().mouseoutEvent)
         type = WebInputEvent::MouseLeave;
     else if (event.type() == eventNames().mouseoverEvent)
         type = WebInputEvent::MouseEnter;
@@ skipping 26 matching lines @@
             break;
         case MiddleButton:
             modifiers |= WebInputEvent::MiddleButtonDown;
             break;
         case RightButton:
             modifiers |= WebInputEvent::RightButtonDown;
             break;
         }
     }
 #if ENABLE(POINTER_LOCK)
-    movementX = event.webkitMovementX();
-    movementY = event.webkitMovementY();
+    float scale = widgetScaleFactor(widget);
+    movementX = event.webkitMovementX() * scale;
+    movementY = event.webkitMovementY() * scale;
 #endif
     clickCount = event.detail();
 }
 
 WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const WebCore::RenderObject* renderObject, const TouchEvent& event)
 {
+    float scale = widgetScaleFactor(widget);
     if (!event.touches())
         return;
     if (event.touches()->length() != 1) {
         if (event.touches()->length() || event.type() != eventNames().touchendEvent || !event.changedTouches() || event.changedTouches()->length() != 1)
             return;
     }
 
     const Touch* touch = event.touches()->length() == 1 ? event.touches()->item(0) : event.changedTouches()->item(0);
     if (touch->identifier())
         return;
 
     if (event.type() == eventNames().touchstartEvent)
         type = MouseDown;
     else if (event.type() == eventNames().touchmoveEvent)
         type = MouseMove;
     else if (event.type() == eventNames().touchendEvent)
         type = MouseUp;
     else
         return;
 
     updateWebMouseEventFromWebCoreMouseEvent(event, *widget, *renderObject, *this);
 
     button = WebMouseEvent::ButtonLeft;
     modifiers |= WebInputEvent::LeftButtonDown;
     clickCount = (type == MouseDown || type == MouseUp);
 
     IntPoint localPoint = convertAbsoluteLocationForRenderObject(touch->absoluteLocation(), *renderObject);
-    x = localPoint.x();
-    y = localPoint.y();
+    x = localPoint.x() * scale;
+    y = localPoint.y() * scale;
 }
 
 WebMouseWheelEventBuilder::WebMouseWheelEventBuilder(const Widget* widget, const WebCore::RenderObject* renderObject, const WheelEvent& event)
 {
     if (event.type() != eventNames().mousewheelEvent)
         return;
     type = WebInputEvent::MouseWheel;
     updateWebMouseEventFromWebCoreMouseEvent(event, *widget, *renderObject, *this);
     deltaX = static_cast<float>(event.rawDeltaX());
     deltaY = static_cast<float>(event.rawDeltaY());
@@ skipping 33 matching lines @@
     unsigned numberOfCharacters = std::min(event.keyEvent()->text().length(), static_cast<unsigned>(textLengthCap));
     for (unsigned i = 0; i < numberOfCharacters; ++i) {
         text[i] = event.keyEvent()->text()[i];
         unmodifiedText[i] = event.keyEvent()->unmodifiedText()[i];
     }
     memcpy(keyIdentifier, event.keyIdentifier().ascii().data(), event.keyIdentifier().length());
 }
 
 #if ENABLE(TOUCH_EVENTS)
 
-static void addTouchPoints(const AtomicString& touchType, TouchList* touches, WebTouchPoint* touchPoints, unsigned* touchPointsLength, const WebCore::RenderObject* renderObject)
+static void addTouchPoints(const Widget* widget, const AtomicString& touchType, TouchList* touches, WebTouchPoint* touchPoints, unsigned* touchPointsLength, const WebCore::RenderObject* renderObject)
 {
+    float scale = widgetScaleFactor(widget);
     unsigned numberOfTouches = std::min(touches->length(), static_cast<unsigned>(WebTouchEvent::touchesLengthCap));
     for (unsigned i = 0; i < numberOfTouches; ++i) {
         const Touch* touch = touches->item(i);
 
         WebTouchPoint point;
         point.id = touch->identifier();
         point.screenPosition = WebPoint(touch->screenX(), touch->screenY());
         point.position = convertAbsoluteLocationForRenderObject(touch->absoluteLocation(), *renderObject);
-        point.radiusX = touch->webkitRadiusX();
-        point.radiusY = touch->webkitRadiusY();
+        point.position.x *= scale;
+        point.position.y *= scale;
+        point.radiusX = touch->webkitRadiusX() * scale;
+        point.radiusY = touch->webkitRadiusY() * scale;
         point.rotationAngle = touch->webkitRotationAngle();
         point.force = touch->webkitForce();
         point.state = toWebTouchPointState(touchType);
 
         touchPoints[i] = point;
     }
     *touchPointsLength = numberOfTouches;
 }
 
 WebTouchEventBuilder::WebTouchEventBuilder(const Widget* widget, const WebCore::RenderObject* renderObject, const TouchEvent& event)
 {
     if (event.type() == eventNames().touchstartEvent)
         type = TouchStart;
     else if (event.type() == eventNames().touchmoveEvent)
         type = TouchMove;
     else if (event.type() == eventNames().touchendEvent)
         type = TouchEnd;
     else if (event.type() == eventNames().touchcancelEvent)
         type = TouchCancel;
     else {
         ASSERT_NOT_REACHED();
         type = Undefined;
         return;
     }
 
     modifiers = getWebInputModifiers(event);
     timeStampSeconds = event.timeStamp() / millisPerSecond;
 
-    addTouchPoints(event.type(), event.touches(), touches, &touchesLength, renderObject);
-    addTouchPoints(event.type(), event.changedTouches(), changedTouches, &changedTouchesLength, renderObject);
-    addTouchPoints(event.type(), event.targetTouches(), targetTouches, &targetTouchesLength, renderObject);
+    addTouchPoints(widget, event.type(), event.touches(), touches, &touchesLength, renderObject);
+    addTouchPoints(widget, event.type(), event.changedTouches(), changedTouches, &changedTouchesLength, renderObject);
+    addTouchPoints(widget, event.type(), event.targetTouches(), targetTouches, &targetTouchesLength, renderObject);
 }
 
 #endif // ENABLE(TOUCH_EVENTS)
 
 #if ENABLE(GESTURE_EVENTS)
 WebGestureEventBuilder::WebGestureEventBuilder(const Widget* widget, const WebCore::RenderObject* renderObject, const GestureEvent& event)
 {
+    float scale = widgetScaleFactor(widget);
     if (event.type() == eventNames().gesturetapEvent)
         type = GestureTap;
     else if (event.type() == eventNames().gesturetapdownEvent)
         type = GestureTapDown;
     else if (event.type() == eventNames().gesturescrollstartEvent)
         type = GestureScrollBegin;
     else if (event.type() == eventNames().gesturescrollendEvent)
         type = GestureScrollEnd;
     else if (event.type() == eventNames().gesturescrollupdateEvent) {
         type = GestureScrollUpdate;
-        data.scrollUpdate.deltaX = event.deltaX();
-        data.scrollUpdate.deltaY = event.deltaY();
+        data.scrollUpdate.deltaX = event.deltaX() * scale;
+        data.scrollUpdate.deltaY = event.deltaY() * scale;
     }
 
     timeStampSeconds = event.timeStamp() / millisPerSecond;
     modifiers = getWebInputModifiers(event);
 
     globalX = event.screenX();
     globalY = event.screenY();
     IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteLocation(), *renderObject);
-    x = localPoint.x();
-    y = localPoint.y();
+    x = localPoint.x() * scale;
+    y = localPoint.y() * scale;
 }
 #endif // ENABLE(GESTURE_EVENTS)
 
 } // namespace WebKit