Changeset 157316 in webkit

Timestamp:

Oct 11, 2013 12:16:35 PM (11 years ago)

Author:

andersca@apple.com

Message:

Remove gesture event support from WebCore
​https://bugs.webkit.org/show_bug.cgi?id=122650

Reviewed by Ryosuke Niwa.

Source/WebCore:

• CMakeLists.txt:
• GNUmakefile.list.am:
• WebCore.exp.in:
• WebCore.xcodeproj/project.pbxproj:
• dom/GestureEvent.cpp: Removed.
• dom/GestureEvent.h: Removed.
• dom/Node.cpp:
• dom/Node.h:
• page/EventHandler.cpp:

(WebCore::EventHandler::EventHandler):
(WebCore::EventHandler::clear):
(WebCore::EventHandler::sendContextMenuEventForKey):

• page/EventHandler.h:
• platform/PlatformGestureEvent.h: Removed.
• platform/Scrollbar.cpp:
• platform/Scrollbar.h:
• platform/mac/PlatformEventFactoryMac.h:
• platform/mac/PlatformEventFactoryMac.mm:

Source/WTF:

• wtf/FeatureDefines.h:
• wtf/nix/FeatureDefinesNix.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/FeatureDefines.h (modified) (2 diffs)
• WTF/wtf/nix/FeatureDefinesNix.h (modified) (1 diff)
• WebCore/CMakeLists.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.list.am (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (10 diffs)
• WebCore/dom/GestureEvent.cpp (deleted)
• WebCore/dom/GestureEvent.h (deleted)
• WebCore/dom/Node.cpp (modified) (2 diffs)
• WebCore/dom/Node.h (modified) (2 diffs)
• WebCore/page/EventHandler.cpp (modified) (6 diffs)
• WebCore/page/EventHandler.h (modified) (5 diffs)
• WebCore/platform/PlatformGestureEvent.h (deleted)
• WebCore/platform/Scrollbar.cpp (modified) (2 diffs)
• WebCore/platform/Scrollbar.h (modified) (2 diffs)
• WebCore/platform/mac/PlatformEventFactoryMac.h (modified) (2 diffs)
• WebCore/platform/mac/PlatformEventFactoryMac.mm (modified) (2 diffs)
• WebCore/platform/mac/ScrollAnimatorMac.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-10-11  Anders Carlsson  <andersca@apple.com>
+
+        Remove gesture event support from WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=122650
+
+        Reviewed by Ryosuke Niwa.
+
+        * wtf/FeatureDefines.h:
+        * wtf/nix/FeatureDefinesNix.h:
+
 2013-10-09  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WTF/wtf/FeatureDefines.h

@@ -175 +175 @@
 #endif
 
-#if !defined(ENABLE_GESTURE_EVENTS)
-#define ENABLE_GESTURE_EVENTS 1
-#endif
-
 #if !defined(ENABLE_RUBBER_BANDING)
 #define ENABLE_RUBBER_BANDING 1
@@ -486 +482 @@
 #endif
 
-#if !defined(ENABLE_GESTURE_EVENTS)
-#define ENABLE_GESTURE_EVENTS 0
-#endif
-
 #if !defined(ENABLE_GLIB_SUPPORT)
 #define ENABLE_GLIB_SUPPORT 0

trunk/Source/WTF/wtf/nix/FeatureDefinesNix.h

@@ -135 +135 @@
 #endif
 
-#if !defined(ENABLE_GESTURE_EVENTS)
-#define ENABLE_GESTURE_EVENTS 1
-#endif
-
 #if !defined(ENABLE_ICONDATABASE)
 #define ENABLE_ICONDATABASE 1

trunk/Source/WebCore/CMakeLists.txt

@@ -1138 +1138 @@
     dom/FocusEvent.cpp
     dom/GenericEventQueue.cpp
-    dom/GestureEvent.cpp
     dom/IconURL.cpp
     dom/IdTargetObserver.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-11  Anders Carlsson  <andersca@apple.com>
+
+        Remove gesture event support from WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=122650
+
+        Reviewed by Ryosuke Niwa.
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * WebCore.exp.in:
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/GestureEvent.cpp: Removed.
+        * dom/GestureEvent.h: Removed.
+        * dom/Node.cpp:
+        * dom/Node.h:
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::EventHandler):
+        (WebCore::EventHandler::clear):
+        (WebCore::EventHandler::sendContextMenuEventForKey):
+        * page/EventHandler.h:
+        * platform/PlatformGestureEvent.h: Removed.
+        * platform/Scrollbar.cpp:
+        * platform/Scrollbar.h:
+        * platform/mac/PlatformEventFactoryMac.h:
+        * platform/mac/PlatformEventFactoryMac.mm:
+
 2013-10-11  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -2844 +2844 @@
         Source/WebCore/dom/FocusEvent.h \
         Source/WebCore/dom/FragmentScriptingPermission.h \
-        Source/WebCore/dom/GestureEvent.cpp \
-        Source/WebCore/dom/GestureEvent.h \
         Source/WebCore/dom/IgnoreDestructiveWriteCountIncrementer.h \
         Source/WebCore/dom/ExceptionCodePlaceholder.h \

trunk/Source/WebCore/WebCore.exp.in

@@ -2491 +2491 @@
 #endif
 
-#if ENABLE(GESTURE_EVENTS)
-__ZN7WebCore12EventHandler18handleGestureEventERKNS_20PlatformGestureEventE
-#endif
-
 #if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
 __ZN7WebCore8Settings38setHiddenPageDOMTimerThrottlingEnabledEb

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -126 +126 @@
                 071A9EC3168FBC55002629F9 /* TextTrackCueGeneric.h in Headers */ = {isa = PBXBuildFile; fileRef = 071A9EC1168FB56C002629F9 /* TextTrackCueGeneric.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 0720B0A014D3323500642955 /* GenericEventQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0720B09E14D3323500642955 /* GenericEventQueue.cpp */; };
-                0720B0A014D3323500642956 /* GestureEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0720B09F14D3323500642956 /* GestureEvent.cpp */; };
                 0720B0A114D3323500642955 /* GenericEventQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 0720B09F14D3323500642955 /* GenericEventQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                0720B0A114D3323500642957 /* GestureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0720B09F14D3323500642957 /* GestureEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 07277E4C17D018CC0015534D /* JSMediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07277E4017D018CC0015534D /* JSMediaStream.cpp */; };
                 07277E4D17D018CC0015534D /* JSMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 07277E4117D018CC0015534D /* JSMediaStream.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -4941 +4939 @@
                 BC94D1530C275C8B006BC617 /* History.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC94D1500C275C8B006BC617 /* History.cpp */; };
                 BC94D1540C275C8B006BC617 /* History.h in Headers */ = {isa = PBXBuildFile; fileRef = BC94D1510C275C8B006BC617 /* History.h */; };
-                BC9585E112F0989500755821 /* PlatformGestureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = BC9585DF12F0989500755821 /* PlatformGestureEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 BC96DB430F3A880E00573CB3 /* RenderBoxModelObject.h in Headers */ = {isa = PBXBuildFile; fileRef = BC96DB420F3A880E00573CB3 /* RenderBoxModelObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 BC96DB460F3A882200573CB3 /* RenderBoxModelObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC96DB450F3A882200573CB3 /* RenderBoxModelObject.cpp */; };
@@ -6493 +6490 @@
                 0720B09E14D3323500642955 /* GenericEventQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GenericEventQueue.cpp; sourceTree = "<group>"; };
                 0720B09F14D3323500642955 /* GenericEventQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenericEventQueue.h; sourceTree = "<group>"; };
-                0720B09F14D3323500642956 /* GestureEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GestureEvent.cpp; sourceTree = "<group>"; };
-                0720B09F14D3323500642957 /* GestureEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GestureEvent.h; sourceTree = "<group>"; };
                 07221B4A17CEC32700848E51 /* MediaConstraintsImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaConstraintsImpl.cpp; sourceTree = "<group>"; };
                 07221B4B17CEC32700848E51 /* MediaConstraintsImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaConstraintsImpl.h; sourceTree = "<group>"; };
@@ -11812 +11807 @@
                 BC94D1510C275C8B006BC617 /* History.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = History.h; sourceTree = "<group>"; };
                 BC94D1520C275C8B006BC617 /* History.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = History.idl; sourceTree = "<group>"; };
-                BC9585DF12F0989500755821 /* PlatformGestureEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformGestureEvent.h; sourceTree = "<group>"; };
                 BC96DB420F3A880E00573CB3 /* RenderBoxModelObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderBoxModelObject.h; sourceTree = "<group>"; };
                 BC96DB450F3A882200573CB3 /* RenderBoxModelObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderBoxModelObject.cpp; sourceTree = "<group>"; };
@@ -19772 +19766 @@
                                 BC5C76291497FE1400BC4775 /* PlatformEvent.h */,
                                 A723F77A1484CA4C008C6DBE /* PlatformExportMacros.h */,
-                                BC9585DF12F0989500755821 /* PlatformGestureEvent.h */,
                                 935C476609AC4D4300A6AAB4 /* PlatformKeyboardEvent.h */,
                                 932871BF0B20DEB70049035A /* PlatformMenuDescription.h */,
@@ -20855 +20848 @@
                                 0720B09E14D3323500642955 /* GenericEventQueue.cpp */,
                                 0720B09F14D3323500642955 /* GenericEventQueue.h */,
-                                0720B09F14D3323500642956 /* GestureEvent.cpp */,
-                                0720B09F14D3323500642957 /* GestureEvent.h */,
                                 2442BBF81194C9D300D49469 /* HashChangeEvent.h */,
                                 8482B7441198C32E00BFB005 /* HashChangeEvent.idl */,
@@ -22443 +22434 @@
                                 9746AF2A14F4DDE6003E7A70 /* Geoposition.h in Headers */,
                                 078E092A17D14D1C00420AA1 /* RTCStatsReport.h in Headers */,
-                                0720B0A114D3323500642957 /* GestureEvent.h in Headers */,
                                 086BBD0F136039C2008B15D8 /* Glyph.h in Headers */,
                                 B2C3DA6C0D006CD600EF6F26 /* GlyphBuffer.h in Headers */,
@@ -23536 +23526 @@
                                 BCAA487014A052530088FAC4 /* PlatformEventFactoryMac.h in Headers */,
                                 A723F77B1484CA4C008C6DBE /* PlatformExportMacros.h in Headers */,
-                                BC9585E112F0989500755821 /* PlatformGestureEvent.h in Headers */,
                                 935C476809AC4D4300A6AAB4 /* PlatformKeyboardEvent.h in Headers */,
                                 0562F9611573F88F0031CA16 /* PlatformLayer.h in Headers */,
@@ -24671 +24660 @@
                                 93F199FD08245E59001E9ABC /* Resources */,
                                 CD0DBF001422765700280263 /* Copy Audio Resources */,
-                                1C81BA330E97357C00266E07 /* Copy Inspector Resources */,
-                                1C5F9D760E09A1B400E91D0A /* Streamline Inspector Source */,
                                 93F19A0C08245E59001E9ABC /* Sources */,
                                 93F19B1208245E59001E9ABC /* Frameworks */,
@@ -25656 +25643 @@
                                 9746AF2314F4DDE6003E7A70 /* Geolocation.cpp in Sources */,
                                 9746AF2614F4DDE6003E7A70 /* GeolocationController.cpp in Sources */,
-                                0720B0A014D3323500642956 /* GestureEvent.cpp in Sources */,
                                 B2C3DA6D0D006CD600EF6F26 /* GlyphPageTreeNode.cpp in Sources */,
                                 B2AFFC830D00A5C10030074D /* GlyphPageTreeNodeMac.cpp in Sources */,

trunk/Source/WebCore/dom/Node.cpp

@@ -114 +114 @@
 #include <wtf/text/StringBuilder.h>
 
-#if ENABLE(GESTURE_EVENTS)
-#include "GestureEvent.h"
-#endif
-
 #if ENABLE(INDIE_UI)
 #include "UIRequestEvent.h"
@@ -2101 +2097 @@
 }
 
-#if ENABLE(GESTURE_EVENTS)
-bool Node::dispatchGestureEvent(const PlatformGestureEvent& event)
-{
-    RefPtr<GestureEvent> gestureEvent = GestureEvent::create(document().defaultView(), event);
-    if (!gestureEvent.get())
-        return false;
-
-    if (isDisabledFormControl(this))
-        return true;
-
-    EventDispatcher::dispatchEvent(this, gestureEvent);
-
-    ASSERT(!gestureEvent->defaultPrevented());
-    return gestureEvent->defaultHandled() || gestureEvent->defaultPrevented();
-}
-#endif
-
 #if ENABLE(TOUCH_EVENTS)
 bool Node::dispatchTouchEvent(PassRefPtr<TouchEvent> event)

trunk/Source/WebCore/dom/Node.h

@@ -80 +80 @@
 class TagNodeList;
 
-#if ENABLE(GESTURE_EVENTS)
-class PlatformGestureEvent;
-#endif
-
 #if ENABLE(INDIE_UI)
 class UIRequestEvent;
@@ -538 +534 @@
     bool dispatchDOMActivateEvent(int detail, PassRefPtr<Event> underlyingEvent);
 
-#if ENABLE(GESTURE_EVENTS)
-    bool dispatchGestureEvent(const PlatformGestureEvent&);
-#endif
 #if ENABLE(TOUCH_EVENTS)
     bool dispatchTouchEvent(PassRefPtr<TouchEvent>);

trunk/Source/WebCore/page/EventHandler.cpp

@@ -93 +93 @@
 #include <wtf/TemporaryChange.h>
 
-#if ENABLE(GESTURE_EVENTS)
-#include "PlatformGestureEvent.h"
-#endif
-
 #if ENABLE(TOUCH_ADJUSTMENT)
 #include "TouchAdjustment.h"
@@ -287 +283 @@
 }
 
-#if (ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)) || ENABLE(GESTURE_EVENTS)
+#if (ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS))
 static inline bool shouldGesturesTriggerActive()
 {
@@ -348 +344 @@
     , m_originatingTouchPointTargetKey(0)
     , m_touchPressed(false)
-#endif
-#if ENABLE(GESTURE_EVENTS)
-    , m_scrollGestureHandlingNode(nullptr)
-    , m_lastHitTestResultOverWidget(false)
 #endif
     , m_maxMouseMovedDuration(0)
@@ -417 +409 @@
     m_originatingTouchPointDocument.clear();
     m_originatingTouchPointTargetKey = 0;
-#endif
-#if ENABLE(GESTURE_EVENTS)
-    m_scrollGestureHandlingNode = nullptr;
-    m_lastHitTestResultOverWidget = false;
-    m_previousGestureScrolledElement = nullptr;
-    m_scrollbarHandlingScrollGesture = 0;
 #endif
     m_maxMouseMovedDuration = 0;
@@ -2580 +2566 @@
 }
 
-#if ENABLE(GESTURE_EVENTS)
-bool EventHandler::handleGestureTapDown()
-{
-    FrameView* view = m_frame.view();
-    if (!view)
-        return false;
-    if (ScrollAnimator* scrollAnimator = view->existingScrollAnimator())
-        scrollAnimator->cancelAnimations();
-    const FrameView::ScrollableAreaSet* areas = view->scrollableAreas();
-    if (!areas)
-        return false;
-    for (FrameView::ScrollableAreaSet::const_iterator it = areas->begin(); it != areas->end(); ++it) {
-        ScrollableArea* sa = *it;
-        ScrollAnimator* animator = sa->scrollAnimator();
-        if (animator)
-            animator->cancelAnimations();
-    }
-    return false;
-}
-
-bool EventHandler::handleGestureEvent(const PlatformGestureEvent& gestureEvent)
-{
-    Node* eventTarget = 0;
-    Scrollbar* scrollbar = 0;
-    if (gestureEvent.type() == PlatformEvent::GestureScrollEnd
-        || gestureEvent.type() == PlatformEvent::GestureScrollUpdate
-        || gestureEvent.type() == PlatformEvent::GestureScrollUpdateWithoutPropagation) {
-        scrollbar = m_scrollbarHandlingScrollGesture.get();
-        eventTarget = m_scrollGestureHandlingNode.get();
-    }
-
-    IntPoint adjustedPoint = gestureEvent.position();
-    HitTestRequest::HitTestRequestType hitType = HitTestRequest::TouchEvent;
-    if (gestureEvent.type() == PlatformEvent::GestureTapDown) {
-#if ENABLE(TOUCH_ADJUSTMENT)
-        adjustGesturePosition(gestureEvent, adjustedPoint);
-#endif
-        hitType |= HitTestRequest::Active;
-    } else if (gestureEvent.type() == PlatformEvent::GestureTapDownCancel)
-        hitType |= HitTestRequest::Release;
-    else if (gestureEvent.type() == PlatformEvent::GestureTap) {
-        // The mouseup event synthesized for this gesture will clear the active state of the
-        // targeted node, so performing a ReadOnly hit test here is fine.
-        hitType |= HitTestRequest::ReadOnly;
-    }
-    else
-        hitType |= HitTestRequest::Active | HitTestRequest::ReadOnly;
-
-    if (!shouldGesturesTriggerActive())
-        hitType |= HitTestRequest::ReadOnly;
-
-    if ((!scrollbar && !eventTarget) || !(hitType & HitTestRequest::ReadOnly)) {
-        IntPoint hitTestPoint = m_frame.view()->windowToContents(adjustedPoint);
-        HitTestResult result = hitTestResultAtPoint(hitTestPoint, hitType | HitTestRequest::AllowFrameScrollbars);
-        eventTarget = result.targetNode();
-        if (!scrollbar)
-            scrollbar = result.scrollbar();
-    }
-
-    if (scrollbar) {
-        bool eventSwallowed = scrollbar->gestureEvent(gestureEvent);
-        if (gestureEvent.type() == PlatformEvent::GestureScrollBegin && eventSwallowed)
-            m_scrollbarHandlingScrollGesture = scrollbar;
-        else if (gestureEvent.type() == PlatformEvent::GestureScrollEnd || !eventSwallowed)
-            m_scrollbarHandlingScrollGesture = 0;
-
-        if (eventSwallowed)
-            return true;
-    }
-
-    if (eventTarget) {
-        bool eventSwallowed = eventTarget->dispatchGestureEvent(gestureEvent);
-        if (gestureEvent.type() == PlatformEvent::GestureScrollBegin || gestureEvent.type() == PlatformEvent::GestureScrollEnd) {
-            if (eventSwallowed)
-                m_scrollGestureHandlingNode = eventTarget;
-        }
-
-        if (eventSwallowed)
-            return true;
-    }
-
-    // FIXME: A more general scroll system (https://bugs.webkit.org/show_bug.cgi?id=80596) will
-    // eliminate the need for this.
-    TemporaryChange<PlatformEvent::Type> baseEventType(m_baseEventType, gestureEvent.type());
-
-    switch (gestureEvent.type()) {
-    case PlatformEvent::GestureScrollBegin:
-        return handleGestureScrollBegin(gestureEvent);
-    case PlatformEvent::GestureScrollUpdate:
-    case PlatformEvent::GestureScrollUpdateWithoutPropagation:
-        return handleGestureScrollUpdate(gestureEvent);
-    case PlatformEvent::GestureScrollEnd:
-        clearGestureScrollNodes(); 
-        return true;
-    case PlatformEvent::GestureTap:
-        return handleGestureTap(gestureEvent);
-    case PlatformEvent::GestureTapDown:
-        return handleGestureTapDown();
-    case PlatformEvent::GestureLongPress:
-        return handleGestureLongPress(gestureEvent);
-    case PlatformEvent::GestureLongTap:
-        return handleGestureLongTap(gestureEvent);
-    case PlatformEvent::GestureTwoFingerTap:
-        return handleGestureTwoFingerTap(gestureEvent);
-    case PlatformEvent::GestureTapDownCancel:
-        break;
-    default:
-        ASSERT_NOT_REACHED();
-    }
-
-    return false;
-}
-
-bool EventHandler::handleGestureTap(const PlatformGestureEvent& gestureEvent)
-{
-    // FIXME: Refactor this code to not hit test multiple times. We use the adjusted position to ensure that the correct node is targeted by the later redundant hit tests.
-    IntPoint adjustedPoint = gestureEvent.position();
-#if ENABLE(TOUCH_ADJUSTMENT)
-    adjustGesturePosition(gestureEvent, adjustedPoint);
-#endif
-
-    PlatformMouseEvent fakeMouseMove(adjustedPoint, gestureEvent.globalPosition(),
-        NoButton, PlatformEvent::MouseMoved, /* clickCount */ 0,
-        gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey(), gestureEvent.timestamp());
-    mouseMoved(fakeMouseMove);
-
-    int tapCount = 1;
-    // FIXME: deletaX is overloaded to mean different things for different gestures.
-    // http://wkb.ug/93123
-    if (gestureEvent.deltaX() > 0)
-        tapCount = static_cast<int>(gestureEvent.deltaX());
-
-    bool defaultPrevented = false;
-    PlatformMouseEvent fakeMouseDown(adjustedPoint, gestureEvent.globalPosition(),
-        LeftButton, PlatformEvent::MousePressed, tapCount,
-        gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey(), gestureEvent.timestamp());
-    defaultPrevented |= handleMousePressEvent(fakeMouseDown);
-
-    PlatformMouseEvent fakeMouseUp(adjustedPoint, gestureEvent.globalPosition(),
-        LeftButton, PlatformEvent::MouseReleased, tapCount,
-        gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey(), gestureEvent.timestamp());
-    defaultPrevented |= handleMouseReleaseEvent(fakeMouseUp);
-
-    return defaultPrevented;
-}
-
-bool EventHandler::handleGestureLongPress(const PlatformGestureEvent& gestureEvent)
-{
-#if ENABLE(DRAG_SUPPORT)
-    if (m_frame.settings().touchDragDropEnabled()) {
-        IntPoint adjustedPoint = gestureEvent.position();
-#if ENABLE(TOUCH_ADJUSTMENT)
-        adjustGesturePosition(gestureEvent, adjustedPoint);
-#endif
-        PlatformMouseEvent mouseDownEvent(adjustedPoint, gestureEvent.globalPosition(), LeftButton, PlatformEvent::MousePressed, 0, false, false, false, false, WTF::currentTime());
-        handleMousePressEvent(mouseDownEvent);
-        PlatformMouseEvent mouseDragEvent(adjustedPoint, gestureEvent.globalPosition(), LeftButton, PlatformEvent::MouseMoved, 0, false, false, false, false, WTF::currentTime());
-        HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowShadowContent);
-        MouseEventWithHitTestResults mev = prepareMouseEvent(request, mouseDragEvent);
-        m_didStartDrag = false;
-        RefPtr<Frame> subframe = subframeForHitTestResult(mev);
-        if (subframe && !m_mouseDownMayStartDrag) {
-            if (subframe->eventHandler().handleGestureLongPress(gestureEvent))
-                return true;
-        }
-        handleDrag(mev, DontCheckDragHysteresis);
-        if (m_didStartDrag)
-            return true;
-    }
-#endif
-    return handleGestureForTextSelectionOrContextMenu(gestureEvent);
-}
-
-bool EventHandler::handleGestureLongTap(const PlatformGestureEvent& gestureEvent)
-{
-#if ENABLE(CONTEXT_MENUS)
-    if (!m_didLongPressInvokeContextMenu)
-        return sendContextMenuEventForGesture(gestureEvent);
-#endif // ENABLE(CONTEXT_MENUS)
-    return false;
-}
-
-bool EventHandler::handleGestureForTextSelectionOrContextMenu(const PlatformGestureEvent& gestureEvent)
-{
-#if ENABLE(CONTEXT_MENUS)
-    m_didLongPressInvokeContextMenu = (gestureEvent.type() == PlatformEvent::GestureLongPress);
-    return sendContextMenuEventForGesture(gestureEvent);
-#else
-    return false;
-#endif
-}
-
-bool EventHandler::handleGestureTwoFingerTap(const PlatformGestureEvent& gestureEvent)
-{
-    return handleGestureForTextSelectionOrContextMenu(gestureEvent);
-}
-
-bool EventHandler::passGestureEventToWidget(const PlatformGestureEvent& gestureEvent, Widget* widget)
-{
-    if (!widget)
-        return false;
-
-    if (!widget->isFrameView())
-        return false;
-
-    return toFrameView(widget)->frame().eventHandler().handleGestureEvent(gestureEvent);
-}
-
-bool EventHandler::passGestureEventToWidgetIfPossible(const PlatformGestureEvent& gestureEvent, RenderObject* renderer)
-{
-    if (m_lastHitTestResultOverWidget && renderer && renderer->isWidget()) {
-        Widget* widget = toRenderWidget(renderer)->widget();
-        return widget && passGestureEventToWidget(gestureEvent, widget);
-    }
-    return false;
-}
-
-bool EventHandler::handleGestureScrollBegin(const PlatformGestureEvent& gestureEvent)
-{
-    Document* document = m_frame.document();
-    RenderObject* documentRenderer = document->renderView();
-    if (!documentRenderer)
-        return false;
-
-    FrameView* view = m_frame.view();
-    if (!view)
-        return false;
-
-    LayoutPoint viewPoint = view->windowToContents(gestureEvent.position());
-    HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowShadowContent);
-    HitTestResult result(viewPoint);
-    document->renderView()->hitTest(request, result);
-
-    m_lastHitTestResultOverWidget = result.isOverWidget(); 
-    m_scrollGestureHandlingNode = result.innerNode();
-    m_previousGestureScrolledElement = nullptr;
-
-    Node* node = m_scrollGestureHandlingNode.get();
-    if (node)
-        passGestureEventToWidgetIfPossible(gestureEvent, node->renderer());
-    
-    return node && node->renderer();
-}
-
-bool EventHandler::handleGestureScrollUpdate(const PlatformGestureEvent& gestureEvent)
-{
-    FloatSize delta(gestureEvent.deltaX(), gestureEvent.deltaY());
-    if (delta.isZero())
-        return false;
-
-    const float scaleFactor = m_frame.pageZoomFactor() * m_frame.frameScaleFactor();
-    delta.scale(1 / scaleFactor, 1 / scaleFactor);
-
-    Node* node = m_scrollGestureHandlingNode.get();
-    if (!node)
-        return sendScrollEventToView(gestureEvent, delta);
-
-    // Ignore this event if the targeted node does not have a valid renderer.
-    RenderObject* renderer = node->renderer();
-    if (!renderer)
-        return false;
-
-    RefPtr<FrameView> protector(m_frame.view());
-
-    // Try to send the event to the correct view.
-    if (passGestureEventToWidgetIfPossible(gestureEvent, renderer))
-        return true;
-
-    Element* stopElement = 0;
-    bool scrollShouldNotPropagate = gestureEvent.type() == PlatformEvent::GestureScrollUpdateWithoutPropagation;
-    if (scrollShouldNotPropagate)
-        stopElement = m_previousGestureScrolledElement.get();
-
-    // First try to scroll the closest scrollable RenderBox ancestor of |node|.
-    ScrollGranularity granularity = ScrollByPixel; 
-    bool horizontalScroll = scrollNode(delta.width(), granularity, ScrollLeft, ScrollRight, node, &stopElement);
-    bool verticalScroll = scrollNode(delta.height(), granularity, ScrollUp, ScrollDown, node, &stopElement);
-
-    if (scrollShouldNotPropagate)
-        m_previousGestureScrolledElement = stopElement;
-
-    if (horizontalScroll || verticalScroll) {
-        setFrameWasScrolledByUser();
-        return true;
-    }
-
-    // Otherwise try to scroll the view.
-    return sendScrollEventToView(gestureEvent, delta);
-}
-
-bool EventHandler::sendScrollEventToView(const PlatformGestureEvent& gestureEvent, const FloatSize& scaledDelta)
-{
-    FrameView* view = m_frame.view();
-    if (!view)
-        return false;
-
-    const float tickDivisor = static_cast<float>(WheelEvent::TickMultiplier);
-    IntPoint point(gestureEvent.position().x(), gestureEvent.position().y());
-    IntPoint globalPoint(gestureEvent.globalPosition().x(), gestureEvent.globalPosition().y());
-    PlatformWheelEvent syntheticWheelEvent(point, globalPoint,
-        scaledDelta.width(), scaledDelta.height(), 
-        scaledDelta.width() / tickDivisor, scaledDelta.height() / tickDivisor,
-        ScrollByPixelWheelEvent,
-        gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey());
-#if PLATFORM(MAC)
-    syntheticWheelEvent.setHasPreciseScrollingDeltas(true);
-#endif
-
-    bool scrolledFrame = view->wheelEvent(syntheticWheelEvent);
-    if (scrolledFrame)
-        setFrameWasScrolledByUser();
-
-    return scrolledFrame;
-}
-
-void EventHandler::clearGestureScrollNodes()
-{
-    m_scrollGestureHandlingNode = nullptr;
-    m_previousGestureScrolledElement = nullptr;
-}
-
-bool EventHandler::isScrollbarHandlingGestures() const
-{
-    return m_scrollbarHandlingScrollGesture.get();
-}
-#endif // ENABLE(GESTURE_EVENTS)
-
 #if ENABLE(TOUCH_ADJUSTMENT)
 bool EventHandler::shouldApplyTouchAdjustment(const PlatformGestureEvent& event) const
@@ -3079 +2738 @@
     return !dispatchMouseEvent(eventNames().contextmenuEvent, targetNode, true, 0, mouseEvent, false);
 }
-
-#if ENABLE(GESTURE_EVENTS)
-bool EventHandler::sendContextMenuEventForGesture(const PlatformGestureEvent& event)
-{
-#if OS(WINDOWS)
-    PlatformEvent::Type eventType = PlatformEvent::MouseReleased;
-#else
-    PlatformEvent::Type eventType = PlatformEvent::MousePressed;
-#endif
-
-    IntPoint adjustedPoint = event.position();
-#if ENABLE(TOUCH_ADJUSTMENT)
-    adjustGesturePosition(event, adjustedPoint);
-#endif
-    PlatformMouseEvent mouseEvent(adjustedPoint, event.globalPosition(), RightButton, eventType, 1, false, false, false, false, WTF::currentTime());
-    // To simulate right-click behavior, we send a right mouse down and then
-    // context menu event.
-    handleMousePressEvent(mouseEvent);
-    return sendContextMenuEvent(mouseEvent);
-    // We do not need to send a corresponding mouse release because in case of
-    // right-click, the context menu takes capture and consumes all events.
-}
-#endif // ENABLE(GESTURE_EVENTS)
 #endif // ENABLE(CONTEXT_MENUS)
 

trunk/Source/WebCore/page/EventHandler.h

@@ -86 +86 @@
 struct DragState;
 
-#if ENABLE(GESTURE_EVENTS)
-class PlatformGestureEvent;
-#endif
-
 #if ENABLE(DRAG_SUPPORT)
 extern const int LinkDragHysteresis;
@@ -180 +176 @@
     bool handlePasteGlobalSelection(const PlatformMouseEvent&);
 
-#if ENABLE(GESTURE_EVENTS)
-    bool handleGestureEvent(const PlatformGestureEvent&);
-    bool handleGestureTap(const PlatformGestureEvent&);
-    bool handleGestureLongPress(const PlatformGestureEvent&);
-    bool handleGestureLongTap(const PlatformGestureEvent&);
-    bool handleGestureTwoFingerTap(const PlatformGestureEvent&);
-    bool handleGestureScrollUpdate(const PlatformGestureEvent&);
-    bool handleGestureScrollBegin(const PlatformGestureEvent&);
-    void clearGestureScrollNodes();
-    bool isScrollbarHandlingGestures() const;
-#endif
-
 #if ENABLE(TOUCH_ADJUSTMENT)
     bool shouldApplyTouchAdjustment(const PlatformGestureEvent&) const;
@@ -205 +189 @@
     bool sendContextMenuEvent(const PlatformMouseEvent&);
     bool sendContextMenuEventForKey();
-#if ENABLE(GESTURE_EVENTS)
-    bool sendContextMenuEventForGesture(const PlatformGestureEvent&);
-#endif
 #endif
 
@@ -395 +376 @@
 #endif
 
-#if ENABLE(GESTURE_EVENTS)
-    bool handleGestureTapDown();
-    bool handleGestureForTextSelectionOrContextMenu(const PlatformGestureEvent&);
-    bool passGestureEventToWidget(const PlatformGestureEvent&, Widget*);
-    bool passGestureEventToWidgetIfPossible(const PlatformGestureEvent&, RenderObject*);
-    bool sendScrollEventToView(const PlatformGestureEvent&, const FloatSize&);
-#endif
-
     void setLastKnownMousePosition(const PlatformMouseEvent&);
 
@@ -497 +470 @@
 #endif
 
-#if ENABLE(GESTURE_EVENTS)
-    RefPtr<Node> m_scrollGestureHandlingNode;
-    bool m_lastHitTestResultOverWidget;
-    RefPtr<Element> m_previousGestureScrolledElement;
-    RefPtr<Scrollbar> m_scrollbarHandlingScrollGesture;
-#endif
-
     double m_maxMouseMovedDuration;
     PlatformEvent::Type m_baseEventType;

trunk/Source/WebCore/platform/Scrollbar.cpp

@@ -35 +35 @@
 #include <algorithm>
 
-#if ENABLE(GESTURE_EVENTS)
-#include "PlatformGestureEvent.h"
-#endif
-
 using namespace std;
 
@@ -341 +337 @@
 }
 
-#if ENABLE(GESTURE_EVENTS)
-bool Scrollbar::gestureEvent(const PlatformGestureEvent& evt)
-{
-    bool handled = false;
-    switch (evt.type()) {
-    case PlatformEvent::GestureTapDown:
-        setPressedPart(theme()->hitTest(this, evt.position()));
-        m_pressedPos = (orientation() == HorizontalScrollbar ? convertFromContainingWindow(evt.position()).x() : convertFromContainingWindow(evt.position()).y());
-        return true;
-    case PlatformEvent::GestureTapDownCancel:
-    case PlatformEvent::GestureScrollBegin:
-        if (m_pressedPart == ThumbPart) {
-            m_scrollPos = m_pressedPos;
-            return true;
-        }
-        break;
-    case PlatformEvent::GestureScrollUpdate:
-    case PlatformEvent::GestureScrollUpdateWithoutPropagation:
-        if (m_pressedPart == ThumbPart) {
-            m_scrollPos += HorizontalScrollbar ? evt.deltaX() : evt.deltaY();
-            moveThumb(m_scrollPos, false);
-            return true;
-        }
-        break;
-    case PlatformEvent::GestureScrollEnd:
-        m_scrollPos = 0;
-        break;
-    case PlatformEvent::GestureTap:
-        if (m_pressedPart != ThumbPart && m_pressedPart != NoPart)
-            handled = m_scrollableArea && m_scrollableArea->scroll(pressedPartScrollDirection(), pressedPartScrollGranularity());
-        break;
-    default:
-        break;
-    }
-    setPressedPart(NoPart);
-    m_pressedPos = 0;
-    return handled;
-}
-#endif
-
 bool Scrollbar::mouseMoved(const PlatformMouseEvent& evt)
 {

trunk/Source/WebCore/platform/Scrollbar.h

@@ -42 +42 @@
 class ScrollbarTheme;
 
-#if ENABLE(GESTURE_EVENTS)
-class PlatformGestureEvent;
-#endif
-
 class Scrollbar : public Widget,
                   public ScrollbarThemeClient {
@@ -127 +123 @@
     bool isWindowActive() const;
 
-#if ENABLE(GESTURE_EVENTS)
-    bool gestureEvent(const PlatformGestureEvent&);
-#endif
-
     // These methods are used for platform scrollbars to give :hover feedback.  They will not get called
     // when the mouse went down in a scrollbar, since it is assumed the scrollbar will start

trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.h

@@ -31 +31 @@
 #include "PlatformWheelEvent.h"
 
-#if ENABLE(GESTURE_EVENTS)
-#include "PlatformGestureEvent.h"
-#endif
-
 namespace WebCore {
 
@@ -42 +38 @@
     static PlatformWheelEvent createPlatformWheelEvent(NSEvent *, NSView *windowView);
     static PlatformKeyboardEvent createPlatformKeyboardEvent(NSEvent *);
-#if ENABLE(GESTURE_EVENTS)
-    static PlatformGestureEvent createPlatformGestureEvent(NSEvent *, NSView *windowView);
-#endif
 };
 

trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm

@@ -195 +195 @@
     return static_cast<PlatformWheelEventPhase>(phase);
 }
-
-#if ENABLE(GESTURE_EVENTS)
-static PlatformEvent::Type gestureEventTypeForEvent(NSEvent *event)
-{
-    switch ([event type]) {
-    case NSEventTypeBeginGesture:
-        return PlatformEvent::GestureScrollBegin;
-    case NSEventTypeEndGesture:
-        return PlatformEvent::GestureScrollEnd;
-    default:
-        ASSERT_NOT_REACHED();
-        return PlatformEvent::GestureScrollEnd;
-    }
-}
-#endif
 
 static inline String textFromEvent(NSEvent* event)
@@ -525 +510 @@
 }
 
-#if ENABLE(GESTURE_EVENTS)
-class PlatformGestureEventBuilder : public PlatformGestureEvent {
-public:
-    PlatformGestureEventBuilder(NSEvent *event, NSView *windowView)
-    {
-        // PlatformEvent
-        m_type                              = gestureEventTypeForEvent(event);
-        m_modifiers                         = modifiersForEvent(event);
-        m_timestamp                         = eventTimeStampSince1970(event);
-
-        // PlatformGestureEvent
-        m_position                          = pointForEvent(event, windowView);
-        m_globalPosition                    = globalPointForEvent(event);
-        m_deltaX                            = 0;
-        m_deltaY                            = 0;
-    }
-};
-
-PlatformGestureEvent PlatformEventFactory::createPlatformGestureEvent(NSEvent *event, NSView *windowView)
-{
-    return PlatformGestureEventBuilder(event, windowView);
-}
-#endif
-
 } // namespace WebCore

trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm

@@ -34 +34 @@
 #include "GraphicsLayer.h"
 #include "NSScrollerImpDetails.h"
-#include "PlatformGestureEvent.h"
 #include "PlatformWheelEvent.h"
 #include "ScrollView.h"