Remove TouchAdjustment.

sky/engine/core/page/EventHandler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 41 matching lines @@
 #include "sky/engine/core/frame/LocalFrame.h"
 #include "sky/engine/core/frame/Settings.h"
 #include "sky/engine/core/loader/FrameLoaderClient.h"
 #include "sky/engine/core/page/AutoscrollController.h"
 #include "sky/engine/core/page/Chrome.h"
 #include "sky/engine/core/page/ChromeClient.h"
 #include "sky/engine/core/page/EditorClient.h"
 #include "sky/engine/core/page/EventWithHitTestResults.h"
 #include "sky/engine/core/page/FocusController.h"
 #include "sky/engine/core/page/Page.h"
-#include "sky/engine/core/page/TouchAdjustment.h"
 #include "sky/engine/core/rendering/HitTestRequest.h"
 #include "sky/engine/core/rendering/HitTestResult.h"
 #include "sky/engine/core/rendering/RenderLayer.h"
 #include "sky/engine/core/rendering/RenderView.h"
 #include "sky/engine/core/rendering/style/RenderStyle.h"
 #include "sky/engine/platform/PlatformGestureEvent.h"
 #include "sky/engine/platform/PlatformKeyboardEvent.h"
 #include "sky/engine/platform/PlatformTouchEvent.h"
 #include "sky/engine/platform/PlatformWheelEvent.h"
 #include "sky/engine/platform/TraceEvent.h"
@@ skipping 1788 matching lines @@
 {
     m_scrollGestureHandlingNode = nullptr;
     m_previousGestureScrolledNode = nullptr;
 }
 
 bool EventHandler::isScrollbarHandlingGestures() const
 {
     return m_scrollbarHandlingScrollGesture.get();
 }
 
-bool EventHandler::shouldApplyTouchAdjustment(const PlatformGestureEvent& event) const
-{
-    if (m_frame->settings() && !m_frame->settings()->touchAdjustmentEnabled())
-        return false;
-    return !event.area().isEmpty();
-}
-
-bool EventHandler::bestClickableNodeForHitTestResult(const HitTestResult& result, IntPoint& targetPoint, Node*& targetNode)
-{
-    // FIXME: Unify this with the other best* functions which are very similar.
-
-    TRACE_EVENT0("input", "EventHandler::bestClickableNodeForHitTestResult");
-    ASSERT(result.isRectBasedTest());
-
-    // If the touch is over a scrollbar, don't adjust the touch point since touch adjustment only takes into account
-    // DOM nodes so a touch over a scrollbar will be adjusted towards nearby nodes. This leads to things like textarea
-    // scrollbars being untouchable.
-    if (result.scrollbar())
-        return false;
-
-    IntPoint touchCenter = m_frame->view()->contentsToWindow(result.roundedPointInMainFrame());
-    IntRect touchRect = m_frame->view()->contentsToWindow(result.hitTestLocation().boundingBox());
-
-    Vector<RefPtr<Node>, 11> nodes;
-    copyToVector(result.rectBasedTestResult(), nodes);
-
-    // FIXME: the explicit Vector conversion copies into a temporary and is wasteful.
-    return findBestClickableCandidate(targetNode, targetPoint, touchCenter, touchRect, Vector<RefPtr<Node> > (nodes));
-}
-
 GestureEventWithHitTestResults EventHandler::targetGestureEvent(const PlatformGestureEvent& gestureEvent, bool readOnly)
 {
     // Scrolling events get hit tested per frame (like wheel events do).
     ASSERT(!gestureEvent.isScrollEvent());
 
     HitTestRequest::HitTestRequestType hitType = getHitTypeForGestureType(gestureEvent.type());
     double activeInterval = 0;
     bool shouldKeepActiveForMinInterval = false;
     if (readOnly) {
         hitType |= HitTestRequest::ReadOnly;
     } else if (gestureEvent.type() == PlatformEvent::GestureTap) {
         // If the Tap is received very shortly after ShowPress, we want to
         // delay clearing of the active state so that it's visible to the user
         // for at least a couple of frames.
         activeInterval = WTF::currentTime() - m_lastShowPressTimestamp;
         shouldKeepActiveForMinInterval = m_lastShowPressTimestamp && activeInterval < minimumActiveInterval;
         if (shouldKeepActiveForMinInterval)
             hitType |= HitTestRequest::ReadOnly;
     }
 
     // Perform the rect-based hit-test. Note that we don't yet apply hover/active state here
     // because we need to resolve touch adjustment first so that we apply hover/active it to
     // the final adjusted node.
     IntPoint hitTestPoint = gestureEvent.position();
     IntSize touchRadius = gestureEvent.area();
     touchRadius.scale(1.f / 2);
     // FIXME: We should not do a rect-based hit-test if touch adjustment is disabled.
     HitTestResult hitTestResult = hitTestResultAtPoint(hitTestPoint, hitType | HitTestRequest::ReadOnly, touchRadius);
 
-    // Adjust the location of the gesture to the most likely nearby node, as appropriate for the
-    // type of event.
-    PlatformGestureEvent adjustedEvent = gestureEvent;
-    applyTouchAdjustment(&adjustedEvent, &hitTestResult);
-
-    // Do a new hit-test at the (adjusted) gesture co-ordinates. This is necessary because
-    // rect-based hit testing and touch adjustment sometimes return a different node than
-    // what a point-based hit test would return for the same point.
-    // FIXME: Fix touch adjustment to avoid the need for a redundant hit test. http://crbug.com/398914
-    if (shouldApplyTouchAdjustment(gestureEvent)) {
-        LocalFrame* hitFrame = hitTestResult.innerNodeFrame();
-        if (!hitFrame)
-            hitFrame = m_frame;
-        hitTestResult = hitTestResultInFrame(hitFrame, adjustedEvent.position(), hitType | HitTestRequest::ReadOnly);
-    }
-
     // Now apply hover/active state to the final target.
     // FIXME: This is supposed to send mouseenter/mouseleave events, but doesn't because we
     // aren't passing a PlatformMouseEvent.
     HitTestRequest request(hitType | HitTestRequest::AllowChildFrameContent);
     if (!request.readOnly())
         m_frame->document()->updateHoverActiveState(request, hitTestResult.innerElement());
 
     if (shouldKeepActiveForMinInterval) {
         m_lastDeferredTapElement = hitTestResult.innerElement();
         m_activeIntervalTimer.startOneShot(minimumActiveInterval - activeInterval, FROM_HERE);
     }
 
-    return GestureEventWithHitTestResults(adjustedEvent, hitTestResult);
+    return GestureEventWithHitTestResults(gestureEvent, hitTestResult);
 }
 
 HitTestRequest::HitTestRequestType EventHandler::getHitTypeForGestureType(PlatformEvent::Type type)
 {
     HitTestRequest::HitTestRequestType hitType = HitTestRequest::TouchEvent | HitTestRequest::AllowFrameScrollbars;
     switch (type) {
     case PlatformEvent::GestureShowPress:
     case PlatformEvent::GestureTapUnconfirmed:
         return hitType | HitTestRequest::Active;
     case PlatformEvent::GestureTapDownCancel:
         // A TapDownCancel received when no element is active shouldn't really be changing hover state.
         if (!m_frame->document()->activeHoverElement())
             hitType |= HitTestRequest::ReadOnly;
         return hitType | HitTestRequest::Release;
     case PlatformEvent::GestureTap:
         return hitType | HitTestRequest::Release;
     case PlatformEvent::GestureTapDown:
     case PlatformEvent::GestureLongPress:
     case PlatformEvent::GestureLongTap:
     case PlatformEvent::GestureTwoFingerTap:
         // FIXME: Shouldn't LongTap and TwoFingerTap clear the Active state?
         return hitType | HitTestRequest::Active | HitTestRequest::ReadOnly;
     default:
         ASSERT_NOT_REACHED();
         return hitType | HitTestRequest::Active | HitTestRequest::ReadOnly;
     }
 }
 
-void EventHandler::applyTouchAdjustment(PlatformGestureEvent* gestureEvent, HitTestResult* hitTestResult)
-{
-    if (!shouldApplyTouchAdjustment(*gestureEvent))
-        return;
-
-    Node* adjustedNode = 0;
-    IntPoint adjustedPoint = gestureEvent->position();
-    IntSize radius = gestureEvent->area();
-    radius.scale(1.f / 2);
-    bool adjusted = false;
-    switch (gestureEvent->type()) {
-    case PlatformEvent::GestureTap:
-    case PlatformEvent::GestureTapUnconfirmed:
-    case PlatformEvent::GestureTapDown:
-    case PlatformEvent::GestureShowPress:
-    case PlatformEvent::GestureLongPress:
-    case PlatformEvent::GestureLongTap:
-    case PlatformEvent::GestureTwoFingerTap:
-        adjusted = bestClickableNodeForHitTestResult(*hitTestResult, adjustedPoint, adjustedNode);
-        break;
-    default:
-        ASSERT_NOT_REACHED();
-    }
-
-    // Update the hit-test result to be a point-based result instead of a rect-based result.
-    // FIXME: We should do this even when no candidate matches the node filter. crbug.com/398914
-    if (adjusted) {
-        hitTestResult->resolveRectBasedTest(adjustedNode, adjustedPoint);
-        gestureEvent->applyTouchAdjustment(adjustedPoint);
-    }
-}
-
 void EventHandler::scheduleHoverStateUpdate()
 {
     if (!m_hoverTimer.isActive())
         m_hoverTimer.startOneShot(0, FROM_HERE);
 }
 
 void EventHandler::scheduleCursorUpdate()
 {
     if (!m_cursorUpdateTimer.isActive())
         m_cursorUpdateTimer.startOneShot(cursorUpdateInterval, FROM_HERE);
@@ skipping 661 matching lines @@
 unsigned EventHandler::accessKeyModifiers()
 {
 #if OS(MACOSX)
     return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
 #else
     return PlatformEvent::AltKey;
 #endif
 }
 
 } // namespace blink