Changeset 116650 in webkit

Timestamp:

May 10, 2012 9:17:53 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

TouchAdjustment doesn't correct for scroll-offsets.
​https://bugs.webkit.org/show_bug.cgi?id=86083

Patch by Allan Sandfeld Jensen <​allan.jensen@nokia.com> on 2012-05-10
Reviewed by Kenneth Rohde Christiansen.

Already tested by: touchadjustment/scroll-delegation

• page/EventHandler.cpp:

(WebCore::EventHandler::bestClickableNodeForTouchPoint):
(WebCore::EventHandler::bestZoomableAreaForTouchPoint):

• page/TouchAdjustment.cpp:

(WebCore::TouchAdjustment::findNodeWithLowestDistanceMetric):

• testing/Internals.cpp:

(WebCore::Internals::bestZoomableAreaForTouchPoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (2 diffs)
• page/TouchAdjustment.cpp (modified) (1 diff)
• testing/Internals.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-10  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        TouchAdjustment doesn't correct for scroll-offsets.
+        https://bugs.webkit.org/show_bug.cgi?id=86083
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Already tested by: touchadjustment/scroll-delegation
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::bestClickableNodeForTouchPoint):
+        (WebCore::EventHandler::bestZoomableAreaForTouchPoint):
+        * page/TouchAdjustment.cpp:
+        (WebCore::TouchAdjustment::findNodeWithLowestDistanceMetric):
+        * testing/Internals.cpp:
+        (WebCore::Internals::bestZoomableAreaForTouchPoint):
+
 2012-05-10  Konrad Piascik  <kpiascik@rim.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2479 +2479 @@
 {
     HitTestRequest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest::Active;
-    HitTestResult result = hitTestResultAtPoint(touchCenter, /*allowShadowContent*/ false, /*ignoreClipping*/ false, DontHitTestScrollbars, hitType, touchRadius);
+    IntPoint hitTestPoint = m_frame->view()->windowToContents(touchCenter);
+    HitTestResult result = hitTestResultAtPoint(hitTestPoint, /*allowShadowContent*/ false, /*ignoreClipping*/ false, DontHitTestScrollbars, hitType, touchRadius);
 
     IntRect touchRect = result.rectForPoint(touchCenter);
@@ -2489 +2490 @@
 {
     HitTestRequest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest::Active;
-    HitTestResult result = hitTestResultAtPoint(touchCenter, /*allowShadowContent*/ false, /*ignoreClipping*/ false, DontHitTestScrollbars, hitType, touchRadius);
+    IntPoint hitTestPoint = m_frame->view()->windowToContents(touchCenter);
+    HitTestResult result = hitTestResultAtPoint(hitTestPoint, /*allowShadowContent*/ false, /*ignoreClipping*/ false, DontHitTestScrollbars, hitType, touchRadius);
 
     IntRect touchRect = result.rectForPoint(touchCenter);

trunk/Source/WebCore/page/TouchAdjustment.cpp

@@ -266 +266 @@
         }
     }
+    if (targetNode) {
+        targetArea = targetNode->document()->view()->contentsToWindow(targetArea);
+        targetPoint = targetNode->document()->view()->contentsToWindow(targetPoint);
+    }
 
     return (targetNode);

trunk/Source/WebCore/testing/Internals.cpp

@@ -775 +775 @@
     IntRect zoomableArea;
     document->frame()->eventHandler()->bestZoomableAreaForTouchPoint(point, radius, zoomableArea, targetNode);
-    if (targetNode)
-        zoomableArea = targetNode->document()->view()->contentsToWindow(zoomableArea);
 
     return ClientRect::create(zoomableArea);