[Pinch-to-zoom] Moved scale factor into PinchViewport

Source/web/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 20 matching lines @@
 #include "config.h"
 #include "WebInputEventConversion.h"
 
 #include "core/dom/Touch.h"
 #include "core/dom/TouchList.h"
 #include "core/events/GestureEvent.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
 #include "core/events/TouchEvent.h"
 #include "core/events/WheelEvent.h"
+#include "core/frame/FrameHost.h"
+#include "core/frame/FrameView.h"
+#include "core/frame/PinchViewport.h"
+#include "core/page/Page.h"
 #include "core/rendering/RenderObject.h"
 #include "platform/KeyboardCodes.h"
 #include "platform/Widget.h"
 #include "platform/scroll/ScrollView.h"
 
 using namespace WebCore;
 
 namespace blink {
 
 static const double millisPerSecond = 1000.0;
@@ skipping 14 matching lines @@
 {
     if (!widget)
         return IntSize();
     ScrollView* rootView =  toScrollView(widget->root());
     if (!rootView)
         return IntSize();
 
     return rootView->inputEventsOffsetForEmulation();
 }
 
+static IntPoint pinchViewportOffset(const Widget* widget)

[aelias_OOO_until_Jul13, 2014/04/09 08:41:22]

Could you add a a test case for this to WebInputEventConversionTest.cpp ?

[bokan, 2014/04/09 19:57:19]

Done.

+{
+    // Event position needs to be adjusted by the pinch viewport's offset within the
+    // main frame before being passed into the widget's convertFromContainingWindow.
+    FrameView* rootView =  toFrameView(widget->root());

[aelias_OOO_until_Jul13, 2014/04/09 08:41:22]

nit: extra space after =

[bokan, 2014/04/09 15:30:59]

Done.

+    if (!rootView)
+        return IntPoint();
+
+    return flooredIntPoint(rootView->page()->frameHost().pinchViewport().visibleRect().location());
+}
+
 // MakePlatformMouseEvent -----------------------------------------------------
 
 PlatformMouseEventBuilder::PlatformMouseEventBuilder(Widget* widget, const WebMouseEvent& e)
 {
     float scale = widgetInputEventsScaleFactor(widget);
     IntSize offset = widgetInputEventsOffset(widget);
+    IntPoint pinchViewport = pinchViewportOffset(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 - offset.width()) / scale, (e.y - offset.height()) / scale));
+    m_position = widget->convertFromContainingWindow(
+        IntPoint((e.x - offset.width()) / scale + pinchViewport.x(), (e.y - offset.height()) / scale + pinchViewport.y()));
     m_globalPosition = IntPoint(e.globalX, e.globalY);
     m_movementDelta = IntPoint(e.movementX / scale, e.movementY / scale);
     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)
@@ skipping 23 matching lines @@
         ASSERT_NOT_REACHED();
     }
 }
 
 // PlatformWheelEventBuilder --------------------------------------------------
 
 PlatformWheelEventBuilder::PlatformWheelEventBuilder(Widget* widget, const WebMouseWheelEvent& e)
 {
     float scale = widgetInputEventsScaleFactor(widget);
     IntSize offset = widgetInputEventsOffset(widget);
+    IntPoint pinchViewport = pinchViewportOffset(widget);
 
-    m_position = widget->convertFromContainingWindow(IntPoint((e.x - offset.width()) / scale, (e.y - offset.height()) / scale));
+    m_position = widget->convertFromContainingWindow(
+        IntPoint((e.x - offset.width()) / scale + pinchViewport.x(), (e.y - offset.height()) / scale + pinchViewport.y()));
     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 19 matching lines @@
     m_canRubberbandRight = e.canRubberbandRight;
 #endif
 }
 
 // PlatformGestureEventBuilder --------------------------------------------------
 
 PlatformGestureEventBuilder::PlatformGestureEventBuilder(Widget* widget, const WebGestureEvent& e)
 {
     float scale = widgetInputEventsScaleFactor(widget);
     IntSize offset = widgetInputEventsOffset(widget);
+    IntPoint pinchViewport = pinchViewportOffset(widget);
 
     switch (e.type) {
     case WebInputEvent::GestureScrollBegin:
         m_type = PlatformEvent::GestureScrollBegin;
         break;
     case WebInputEvent::GestureScrollEnd:
         m_type = PlatformEvent::GestureScrollEnd;
         break;
     case WebInputEvent::GestureFlingStart:
         m_type = PlatformEvent::GestureFlingStart;
@@ skipping 57 matching lines @@
     case WebInputEvent::GesturePinchEnd:
         m_type = PlatformEvent::GesturePinchEnd;
         break;
     case WebInputEvent::GesturePinchUpdate:
         m_type = PlatformEvent::GesturePinchUpdate;
         m_data.m_pinchUpdate.m_scale = e.data.pinchUpdate.scale;
         break;
     default:
         ASSERT_NOT_REACHED();
     }
-    m_position = widget->convertFromContainingWindow(IntPoint((e.x - offset.width()) / scale, (e.y - offset.height()) / scale));
+    m_position = widget->convertFromContainingWindow(
+        IntPoint((e.x - offset.width()) / scale + pinchViewport.x(), (e.y - offset.height()) / scale + pinchViewport.y()));
     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::StatePressed;
     if (type == EventTypeNames::touchmove)
         return WebTouchPoint::StateMoved;
     return WebTouchPoint::StateUndefined;
 }
 
 PlatformTouchPointBuilder::PlatformTouchPointBuilder(Widget* widget, const WebTouchPoint& point)
 {
     float scale = widgetInputEventsScaleFactor(widget);
     IntSize offset = widgetInputEventsOffset(widget);
+    IntPoint pinchViewport = pinchViewportOffset(widget);
     m_id = point.id;
     m_state = toPlatformTouchPointState(point.state);
-    m_pos = widget->convertFromContainingWindow(IntPoint((point.position.x - offset.width()) / scale, (point.position.y - offset.height()) / scale));
+    m_pos = widget->convertFromContainingWindow(IntPoint(
+        (point.position.x - offset.width()) / scale + pinchViewport.x(),
+        (point.position.y - offset.height()) / scale + pinchViewport.y()));
     m_screenPos = IntPoint(point.screenPosition.x, point.screenPosition.y);
     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);
@@ skipping 344 matching lines @@
     modifiers = getWebInputModifiers(event);
 
     globalX = event.screenX();
     globalY = event.screenY();
     IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteLocation(), *renderObject);
     x = localPoint.x();
     y = localPoint.y();
 }
 
 } // namespace blink