Fix clientX/Y properties of touch pointer events

third_party/WebKit/Source/core/input/TouchEventManager.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/TouchEventManager.h"
 
 #include "core/dom/Document.h"
 #include "core/events/TouchEvent.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameHost.h"
@@ skipping 159 matching lines @@
         PlatformTouchPoint::TouchState pointState = point.state();
 
         if (touchInfo.consumed)
             continue;
 
         Touch* touch = Touch::create(
             touchInfo.targetFrame.get(),
             touchInfo.touchNode.get(),
             point.id(),
             point.screenPos(),
-            touchInfo.adjustedPagePoint,
+            touchInfo.contentPoint,
             touchInfo.adjustedRadius,
             point.rotationAngle(),
             point.force(),
             touchInfo.region);
 
         // Ensure this target's touch list exists, even if it ends up empty, so
         // it can always be passed to TouchEvent::Create below.
         TargetTouchesHeapMap::iterator targetTouchesIterator = touchesByTarget.find(touchInfo.touchNode.get());
         if (targetTouchesIterator == touchesByTarget.end()) {
             touchesByTarget.set(touchInfo.touchNode.get(), TouchList::create());
@@ skipping 181 matching lines @@
             touchNode = m_touchSequenceDocument;
             targetFrame = m_touchSequenceDocument->frame();
         }
         ASSERT(targetFrame);
 
         // pagePoint should always be in the target element's document coordinates.
         FloatPoint pagePoint = targetFrame->view()->rootFrameToContents(
             touchInfo.point.pos());
         float scaleFactor = 1.0f / targetFrame->pageZoomFactor();
 
+        FloatPoint scrollPosition = targetFrame->view()->scrollPosition();
+
         touchInfo.touchNode = touchNode;
         touchInfo.targetFrame = targetFrame;
-        touchInfo.adjustedPagePoint = pagePoint.scaledBy(scaleFactor);
+        touchInfo.contentPoint = pagePoint.scaledBy(scaleFactor);
+        touchInfo.framePoint = touchInfo.contentPoint;
+        touchInfo.framePoint.moveBy(scrollPosition.scaledBy(-scaleFactor));

[bokan, 2016/05/09 18:13:08]

Use Frame::contentsToFrame rather than manually moving the point

[Navid Zolghadr, 2016/05/09 18:59:04]

Done.

         touchInfo.adjustedRadius = touchInfo.point.radius().scaledBy(scaleFactor);
         touchInfo.knownTarget = knownTarget;
         touchInfo.consumed = false;
         touchInfo.region = regionID;
     }
 }
 
 bool TouchEventManager::generateTouchInfosAfterHittest(
     const PlatformTouchEvent& event,
     HeapVector<TouchInfo>& touchInfos)
@@ skipping 109 matching lines @@
 }
 
 DEFINE_TRACE(TouchEventManager)
 {
     visitor->trace(m_frame);
     visitor->trace(m_touchSequenceDocument);
     visitor->trace(m_targetForTouchID);
 }
 
 } // namespace blink