Changeset 116766 in webkit

Timestamp:

May 11, 2012 7:04:45 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Internals::touchPositionAdjustedToBestClickableNode adjust twice for scroll-offset
​https://bugs.webkit.org/show_bug.cgi?id=86205

Patch by Allan Sandfeld Jensen <​allan.jensen@nokia.com> on 2012-05-11
Reviewed by Simon Hausmann.

Source/WebCore:

Remove the redundant conversion from document to window coords.

Test: touchadjustment/scroll-offset.html

• testing/Internals.cpp:

(WebCore::Internals::touchPositionAdjustedToBestClickableNode):
(WebCore::Internals::bestZoomableAreaForTouchPoint):

LayoutTests:

Add test of touchPositionAdjustedToBestClickableNode with scroll-offset.

• touchadjustment/scroll-offset-expected.txt: Added.
• touchadjustment/scroll-offset.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/touchadjustment/scroll-offset-expected.txt (added)
• LayoutTests/touchadjustment/scroll-offset.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-11  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        Internals::touchPositionAdjustedToBestClickableNode adjust twice for scroll-offset
+        https://bugs.webkit.org/show_bug.cgi?id=86205
+
+        Reviewed by Simon Hausmann.
+
+        Add test of touchPositionAdjustedToBestClickableNode with scroll-offset.
+
+        * touchadjustment/scroll-offset-expected.txt: Added.
+        * touchadjustment/scroll-offset.html: Added.
+
 2012-05-11  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-11  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        Internals::touchPositionAdjustedToBestClickableNode adjust twice for scroll-offset
+        https://bugs.webkit.org/show_bug.cgi?id=86205
+
+        Reviewed by Simon Hausmann.
+
+        Remove the redundant conversion from document to window coords.
+
+        Test: touchadjustment/scroll-offset.html
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::touchPositionAdjustedToBestClickableNode):
+        (WebCore::Internals::bestZoomableAreaForTouchPoint):
+
 2012-05-11  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/testing/Internals.cpp

@@ -726 +726 @@
     Node* targetNode;
     IntPoint adjustedPoint;
-    document->frame()->eventHandler()->bestClickableNodeForTouchPoint(point, radius, adjustedPoint, targetNode);
-    if (targetNode)
-        adjustedPoint = targetNode->document()->view()->contentsToWindow(adjustedPoint);
-
-    return WebKitPoint::create(adjustedPoint.x(), adjustedPoint.y());
+
+    bool foundNode = document->frame()->eventHandler()->bestClickableNodeForTouchPoint(point, radius, adjustedPoint, targetNode);
+    if (foundNode)
+        return WebKitPoint::create(adjustedPoint.x(), adjustedPoint.y());
+
+    return 0;
 }
 
@@ -761 +762 @@
     Node* targetNode;
     IntRect zoomableArea;
-    document->frame()->eventHandler()->bestZoomableAreaForTouchPoint(point, radius, zoomableArea, targetNode);
-
-    return ClientRect::create(zoomableArea);
+    bool foundNode = document->frame()->eventHandler()->bestZoomableAreaForTouchPoint(point, radius, zoomableArea, targetNode);
+    if (foundNode)
+        return ClientRect::create(zoomableArea);
+
+    return 0;
 }
 #endif