| Index: third_party/WebKit/Source/core/input/TouchEventManager.cpp
|
| diff --git a/third_party/WebKit/Source/core/input/TouchEventManager.cpp b/third_party/WebKit/Source/core/input/TouchEventManager.cpp
|
| index 5fbb1139f481d6dcf3bea6dfe89f759b3deb01d4..50c4e5ec0a99700a92973de04cebfebfe68607fc 100644
|
| --- a/third_party/WebKit/Source/core/input/TouchEventManager.cpp
|
| +++ b/third_party/WebKit/Source/core/input/TouchEventManager.cpp
|
| @@ -177,7 +177,7 @@ WebInputEventResult TouchEventManager::dispatchTouchEvents(
|
| touchInfo.touchNode.get(),
|
| point.id(),
|
| point.screenPos(),
|
| - touchInfo.adjustedPagePoint,
|
| + touchInfo.contentPoint,
|
| touchInfo.adjustedRadius,
|
| point.rotationAngle(),
|
| point.force(),
|
| @@ -379,9 +379,13 @@ void TouchEventManager::setAllPropertiesOfTouchInfos(
|
| 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.clientPoint = touchInfo.contentPoint;
|
| + touchInfo.clientPoint.moveBy(scrollPosition.scaledBy(-scaleFactor));
|
| touchInfo.adjustedRadius = touchInfo.point.radius().scaledBy(scaleFactor);
|
| touchInfo.knownTarget = knownTarget;
|
| touchInfo.consumed = false;
|
|
|