ChangeLog

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 NOBODY (OOPS!).

        No new tests. (OOPS!)

        * 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  Philip Rogers  <pdr@google.com>

        Skip building instance tree for disallowed target

Source/WebCore/page/EventHandler.cpp

@@bool EventHandler::handleGestureEvent(const PlatformGestureEvent& gestureEvent)

    return false;

}

2432 bool EventHandler::handleGestureTap(const PlatformGestureEvent& gestureEvent)

2432bool EventHandler::handleGestureTap(const PlatformGestureEvent& gestureEvent, PassRefPtr<Node> preTargetedNode)

24332433{

2434 // FIXME: Refactor this code to not hit test multiple times.

24352434 IntPoint adjustedPoint = gestureEvent.position();

24362435#if ENABLE(TOUCH_ADJUSTMENT)

2437 if (!gestureEvent.area().isEmpty()) {

2436 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.

        bestClickableNodeForTouchPoint(gestureEvent.position(), IntSize(gestureEvent.area().width() / 2, gestureEvent.area().height() / 2), adjustedPoint, targetNode);

@@bool EventHandler::handleGestureTap(const PlatformGestureEvent& gestureEvent)

            return false;

    }

#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());

    PlatformMouseEvent fakeMouseDown(adjustedPoint, gestureEvent.globalPosition(), LeftButton, PlatformEvent::MousePressed, /* clickCount */ 1, gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey(), gestureEvent.timestamp());

Source/WebCore/page/EventHandler.h

@@public:

#if ENABLE(GESTURE_EVENTS)

    bool handleGestureEvent(const PlatformGestureEvent&);

166 bool handleGestureTap(const PlatformGestureEvent&);

166 bool handleGestureTap(const PlatformGestureEvent&, PassRefPtr<Node> preTargetedNode = 0);

    bool handleGestureScrollUpdate(const PlatformGestureEvent&);

#endif