Fix clientX/Y properties of touch pointer events

third_party/WebKit/Source/core/input/PointerEventManager.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/input/PointerEventManager.h"
 
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/shadow/FlatTreeTraversal.h"
 #include "core/events/MouseEvent.h"
 #include "core/frame/FrameView.h"
@@ skipping 405 matching lines @@
 
     if (m_inCanceledStateForPointerTypeTouch)
         return;
 
     // Iterate through the touch points, sending PointerEvents to the targets as required.
     for (auto& touchInfo: touchInfos) {
         const PlatformTouchPoint &touchPoint = touchInfo.point;
         WebInputEventResult result = WebInputEventResult::NotHandled;
         // Do not send pointer events for stationary touches.
         if (touchPoint.state() != PlatformTouchPoint::TouchStationary) {
-            // TODO(crbug.com/608394): The adjustedPagePoint should be converted
-            // to client coordinates.
+            float scaleFactor = 1.0f / touchInfo.targetFrame->pageZoomFactor();
+            FloatPoint scrollPosition = touchInfo.targetFrame->view()->scrollPosition();
+            FloatPoint framePoint = touchInfo.contentPoint;
+            framePoint.moveBy(scrollPosition.scaledBy(-scaleFactor));
             PointerEvent* pointerEvent = m_pointerEventFactory.create(
                 pointerEventNameForTouchPointState(touchPoint.state()),
                 touchPoint, event.getModifiers(),
                 touchInfo.adjustedRadius,
-                touchInfo.adjustedPagePoint);
+                framePoint);
 
             // Consume the touch point if its pointer event is anything but NotHandled
             // (e.g. preventDefault is called in the listener for the pointer event).
             result = sendTouchPointerEvent(touchInfo.touchNode, pointerEvent);
             touchInfo.consumed = result != WebInputEventResult::NotHandled;
         }
     }
 }
 
 WebInputEventResult PointerEventManager::sendTouchPointerEvent(
@@ skipping 277 matching lines @@
 {
     visitor->trace(m_frame);
     visitor->trace(m_nodeUnderPointer);
     visitor->trace(m_pointerCaptureTarget);
     visitor->trace(m_pendingPointerCaptureTarget);
     visitor->trace(m_touchEventManager);
 }
 
 
 } // namespace blink