Changeset 115747 in webkit

Timestamp:

May 1, 2012 1:50:00 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Allow a pre-targeted node to be specified when dispatching a GestureTap event
​https://bugs.webkit.org/show_bug.cgi?id=85296

Patch by Terry Anderson <​tdanderson@chromium.org> on 2012-05-01
Reviewed by Adam Barth.

​https://bugs.webkit.org/show_bug.cgi?id=85101

The new parameter will be used and tested in this patch.

• page/EventHandler.cpp:

(WebCore::EventHandler::handleGestureTap):

The new preTargetedNode parameter can be used to pass in the Node that is
the target of the GestureTap event. If this parameter is used, adjustedPoint
is changed to be the center of the Node's bounding rectangle.

• page/EventHandler.h:

(EventHandler):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (2 diffs)
• page/EventHandler.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-01  Terry Anderson  <tdanderson@chromium.org>
+
+        Allow a pre-targeted node to be specified when dispatching a GestureTap event
+        https://bugs.webkit.org/show_bug.cgi?id=85296
+
+        Reviewed by Adam Barth.
+
+        https://bugs.webkit.org/show_bug.cgi?id=85101
+            The new parameter will be used and tested in this patch.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleGestureTap):
+            The new preTargetedNode parameter can be used to pass in the Node that is
+            the target of the GestureTap event. If this parameter is used, adjustedPoint
+            is changed to be the center of the Node's bounding rectangle.
+        * page/EventHandler.h:
+        (EventHandler):
+
 2012-05-01  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2430 +2430 @@
 }
 
-bool EventHandler::handleGestureTap(const PlatformGestureEvent& gestureEvent)
-{
-    // FIXME: Refactor this code to not hit test multiple times.
+bool EventHandler::handleGestureTap(const PlatformGestureEvent& gestureEvent, Node* preTargetedNode)
+{
     IntPoint adjustedPoint = gestureEvent.position();
 #if ENABLE(TOUCH_ADJUSTMENT)
-    if (!gestureEvent.area().isEmpty()) {
+    if (!gestureEvent.area().isEmpty() && !preTargetedNode) {
         Node* targetNode = 0;
         // For now we use the adjusted position to ensure the later redundant hit-tests hits the right node.
@@ -2443 +2442 @@
     }
 #endif
+    // FIXME: Refactor to avoid hit testing multiple times (this is only an interim step).
+    if (preTargetedNode)
+        adjustedPoint = preTargetedNode->getRect().center();
+
     bool defaultPrevented = false;
     PlatformMouseEvent fakeMouseMove(adjustedPoint, gestureEvent.globalPosition(), NoButton, PlatformEvent::MouseMoved, /* clickCount */ 1, gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey(), gestureEvent.timestamp());

trunk/Source/WebCore/page/EventHandler.h

@@ -164 +164 @@
 #if ENABLE(GESTURE_EVENTS)
     bool handleGestureEvent(const PlatformGestureEvent&);
-    bool handleGestureTap(const PlatformGestureEvent&);
+    bool handleGestureTap(const PlatformGestureEvent&, Node* preTargetedNode = 0);
     bool handleGestureScrollUpdate(const PlatformGestureEvent&);
 #endif