Changeset 157428 in webkit

Timestamp:

Oct 14, 2013 4:26:45 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Remove GestureEvent leftovers from WebCore
<​https://webkit.org/b/122780>

Patch by Nick Diego Yamane <​nick.yamane@openbossa.org> on 2013-10-14
Reviewed by Anders Carlsson.

• Removed some remaining references to PlatformGestureEvent, supposed to be removed by r157316
• TOUCH_ADJUSTMENT should be reworked after GestureEvent feature removal

• page/EventHandler.cpp:

(WebCore::EventHandler::bestZoomableAreaForTouchPoint):

• page/EventHandler.h:
• platform/PlatformEvent.h:
• platform/ScrollAnimatorNone.cpp:
• platform/ScrollableArea.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (2 diffs)
• page/EventHandler.h (modified) (1 diff)
• platform/PlatformEvent.h (modified) (1 diff)
• platform/ScrollAnimatorNone.cpp (modified) (1 diff)
• platform/ScrollableArea.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-14  Nick Diego Yamane  <nick.yamane@openbossa.org>
+
+        Remove GestureEvent leftovers from WebCore
+        <https://webkit.org/b/122780>
+
+        Reviewed by Anders Carlsson.
+
+        - Removed some remaining references to PlatformGestureEvent, supposed to
+          be removed by r157316
+        - TOUCH_ADJUSTMENT should be reworked after GestureEvent feature
+          removal
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::bestZoomableAreaForTouchPoint):
+        * page/EventHandler.h:
+        * platform/PlatformEvent.h:
+        * platform/ScrollAnimatorNone.cpp:
+        * platform/ScrollableArea.h:
+
 2013-10-14  Nick Diego Yamane  <nick.yamane@openbossa.org>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2567 +2567 @@
 
 #if ENABLE(TOUCH_ADJUSTMENT)
-bool EventHandler::shouldApplyTouchAdjustment(const PlatformGestureEvent& event) const
-{
-    if (!m_frame.settings().touchAdjustmentEnabled())
-        return false;
-    return !event.area().isEmpty();
-}
-
-
 bool EventHandler::bestClickableNodeForTouchPoint(const IntPoint& touchCenter, const IntSize& touchRadius, IntPoint& targetPoint, Node*& targetNode)
 {
@@ -2608 +2600 @@
     IntRect touchRect(touchCenter - touchRadius, touchRadius + touchRadius);
     return findBestZoomableArea(targetNode, targetArea, touchCenter, touchRect, result.rectBasedTestResult());
-}
-
-bool EventHandler::adjustGesturePosition(const PlatformGestureEvent& gestureEvent, IntPoint& adjustedPoint)
-{
-    if (!shouldApplyTouchAdjustment(gestureEvent))
-        return false;
-
-    Node* targetNode = 0;
-    switch (gestureEvent.type()) {
-    case PlatformEvent::GestureTap:
-    case PlatformEvent::GestureTapDown:
-        bestClickableNodeForTouchPoint(gestureEvent.position(), IntSize(gestureEvent.area().width() / 2, gestureEvent.area().height() / 2), adjustedPoint, targetNode);
-        break;
-    case PlatformEvent::GestureLongPress:
-    case PlatformEvent::GestureLongTap:
-    case PlatformEvent::GestureTwoFingerTap:
-        bestContextMenuNodeForTouchPoint(gestureEvent.position(), IntSize(gestureEvent.area().width() / 2, gestureEvent.area().height() / 2), adjustedPoint, targetNode);
-        break;
-    default:
-        // FIXME: Implement handling for other types as needed.
-        ASSERT_NOT_REACHED();
-    }
-    return targetNode;
 }
 #endif

trunk/Source/WebCore/page/EventHandler.h

@@ -177 +177 @@
 
 #if ENABLE(TOUCH_ADJUSTMENT)
-    bool shouldApplyTouchAdjustment(const PlatformGestureEvent&) const;
-
     bool bestClickableNodeForTouchPoint(const IntPoint& touchCenter, const IntSize& touchRadius, IntPoint& targetPoint, Node*& targetNode);
     bool bestContextMenuNodeForTouchPoint(const IntPoint& touchCenter, const IntSize& touchRadius, IntPoint& targetPoint, Node*& targetNode);
     bool bestZoomableAreaForTouchPoint(const IntPoint& touchCenter, const IntSize& touchRadius, IntRect& targetArea, Node*& targetNode);
-
-    bool adjustGesturePosition(const PlatformGestureEvent&, IntPoint& adjustedPoint);
 #endif
 

trunk/Source/WebCore/platform/PlatformEvent.h

@@ -48 +48 @@
         // PlatformWheelEvent
         Wheel,
-
-        // PlatformGestureEvent
-        GestureScrollBegin,
-        GestureScrollEnd,
-        GestureScrollUpdate,
-        GestureScrollUpdateWithoutPropagation,
-        GestureTap,
-        GestureTapDown,
-        GestureTapDownCancel,
-        GestureTwoFingerTap,
-        GestureLongPress,
-        GestureLongTap,
 
 #if ENABLE(TOUCH_EVENTS)

trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp

@@ -42 +42 @@
 #include <wtf/CurrentTime.h>
 #include <wtf/PassOwnPtr.h>
-
-#if ENABLE(GESTURE_EVENTS)
-#include "PlatformGestureEvent.h"
-#endif
 
 using namespace std;

trunk/Source/WebCore/platform/ScrollableArea.h

@@ -34 +34 @@
 class FloatPoint;
 class GraphicsContext;
-class PlatformGestureEvent;
 class PlatformWheelEvent;
 class ScrollAnimator;