Merge 143032

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 412 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.root();
     IntPoint windowPoint = view->contentsToWindow(IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y()));
     webEvent.globalX = event.screenX();
     webEvent.globalY = event.screenY();
-    webEvent.windowX = windowPoint.x() * scale;
-    webEvent.windowY = windowPoint.y() * scale;
+    webEvent.windowX = windowPoint.x();
+    webEvent.windowY = windowPoint.y();
     IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteLocation(), renderObject);
-    webEvent.x = localPoint.x() * scale;
-    webEvent.y = localPoint.y() * scale;
+    webEvent.x = localPoint.x();
+    webEvent.y = localPoint.y();
 }
 
 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)
-    float scale = widgetScaleFactor(widget);
-    movementX = event.webkitMovementX() * scale;
-    movementY = event.webkitMovementY() * scale;
+    movementX = event.webkitMovementX();
+    movementY = event.webkitMovementY();
 #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() * scale;
-    y = localPoint.y() * scale;
+    x = localPoint.x();
+    y = localPoint.y();
 }
 
 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 35 matching lines @@
         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 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.position.x *= scale;
-        point.position.y *= scale;
-        point.radiusX = touch->webkitRadiusX() * scale;
-        point.radiusY = touch->webkitRadiusY() * scale;
+        point.radiusX = touch->webkitRadiusX();
+        point.radiusY = touch->webkitRadiusY();
         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)
@@ skipping 18 matching lines @@
     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() * scale;
-        data.scrollUpdate.deltaY = event.deltaY() * scale;
+        data.scrollUpdate.deltaX = event.deltaX();
+        data.scrollUpdate.deltaY = event.deltaY();
     }
 
     timeStampSeconds = event.timeStamp() / millisPerSecond;
     modifiers = getWebInputModifiers(event);
 
     globalX = event.screenX();
     globalY = event.screenY();
     IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteLocation(), *renderObject);
-    x = localPoint.x() * scale;
-    y = localPoint.y() * scale;
+    x = localPoint.x();
+    y = localPoint.y();
 }
 #endif // ENABLE(GESTURE_EVENTS)
 
 } // namespace WebKit