Changeset 157319 in webkit


Ignore:
Timestamp:
Oct 11, 2013 2:14:06 PM (11 years ago)
Author:
andersca@apple.com
Message:

Remove ENABLE(GESTURE_EVENTS) from WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=122673

Reviewed by Ryosuke Niwa.

  • Shared/WebEvent.h:
  • Shared/WebEventConversion.cpp:
  • Shared/WebEventConversion.h:
  • Shared/WebGestureEvent.cpp: Removed.
  • Shared/mac/WebEventFactory.h:
  • Shared/mac/WebEventFactory.mm:
  • UIProcess/API/mac/PageClientImpl.h:
  • UIProcess/API/mac/PageClientImpl.mm:
  • UIProcess/API/mac/WKView.mm:

(-[WKView viewDidMoveToWindow]):

  • UIProcess/PageClient.h:
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::didReceiveEvent):
(WebKit::WebPageProxy::resetStateAfterProcessExited):

  • UIProcess/WebPageProxy.h:
  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/WebPage/EventDispatcher.cpp:
  • WebProcess/WebPage/EventDispatcher.h:
  • WebProcess/WebPage/EventDispatcher.messages.in:
  • WebProcess/WebPage/WebPage.cpp:
  • WebProcess/WebPage/WebPage.h:
Location:
trunk/Source/WebKit2
Files:
1 deleted
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/CMakeLists.txt

    r157254 r157319  
    190190    Shared/WebEventConversion.cpp
    191191    Shared/WebGeolocationPosition.cpp
    192     Shared/WebGestureEvent.cpp
    193192    Shared/WebGraphicsContext.cpp
    194193    Shared/WebHitTestResult.cpp

  • trunk/Source/WebKit2/ChangeLog

    r157310 r157319  
     12013-10-11  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove ENABLE(GESTURE_EVENTS) from WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=122673
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * Shared/WebEvent.h:
     9        * Shared/WebEventConversion.cpp:
     10        * Shared/WebEventConversion.h:
     11        * Shared/WebGestureEvent.cpp: Removed.
     12        * Shared/mac/WebEventFactory.h:
     13        * Shared/mac/WebEventFactory.mm:
     14        * UIProcess/API/mac/PageClientImpl.h:
     15        * UIProcess/API/mac/PageClientImpl.mm:
     16        * UIProcess/API/mac/WKView.mm:
     17        (-[WKView viewDidMoveToWindow]):
     18        * UIProcess/PageClient.h:
     19        * UIProcess/WebPageProxy.cpp:
     20        (WebKit::WebPageProxy::didReceiveEvent):
     21        (WebKit::WebPageProxy::resetStateAfterProcessExited):
     22        * UIProcess/WebPageProxy.h:
     23        * WebKit2.xcodeproj/project.pbxproj:
     24        * WebProcess/WebPage/EventDispatcher.cpp:
     25        * WebProcess/WebPage/EventDispatcher.h:
     26        * WebProcess/WebPage/EventDispatcher.messages.in:
     27        * WebProcess/WebPage/WebPage.cpp:
     28        * WebProcess/WebPage/WebPage.h:
     29
    1302013-10-11  Adam Roben  <aroben@webkit.org>
    231

  • trunk/Source/WebKit2/Shared/WebEvent.h

    r141619 r157319  
    6363        Char,
    6464
    65 #if ENABLE(GESTURE_EVENTS)
    66         // WebGestureEvent
    67         GestureScrollBegin,
    68         GestureScrollEnd,
    69         GestureSingleTap,
    70 #endif
    71 
    7265#if ENABLE(TOUCH_EVENTS)
    7366        // WebTouchEvent
    … …  
    246239};
    247240
    248 
    249 #if ENABLE(GESTURE_EVENTS)
    250 // FIXME: Move this class to its own header file.
    251 class WebGestureEvent : public WebEvent {
    252 public:
    253     WebGestureEvent() { }
    254     WebGestureEvent(Type, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, Modifiers, double timestamp);
    255     WebGestureEvent(Type, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, Modifiers, double timestamp, const WebCore::IntSize& area, const WebCore::FloatPoint& delta);
    256 
    257     const WebCore::IntPoint position() const { return m_position; }
    258     const WebCore::IntPoint globalPosition() const { return m_globalPosition; }
    259     const WebCore::IntSize area() const { return m_area; }
    260     const WebCore::FloatPoint delta() const { return m_delta; }
    261 
    262     void encode(CoreIPC::ArgumentEncoder&) const;
    263     static bool decode(CoreIPC::ArgumentDecoder&, WebGestureEvent&);
    264 
    265 private:
    266     static bool isGestureEventType(Type);
    267 
    268     WebCore::IntPoint m_position;
    269     WebCore::IntPoint m_globalPosition;
    270     WebCore::IntSize m_area;
    271     WebCore::FloatPoint m_delta;
    272 };
    273 #endif // ENABLE(GESTURE_EVENTS)
    274 
    275 
    276241#if ENABLE(TOUCH_EVENTS)
    277242// FIXME: Move this class to its own header file.

  • trunk/Source/WebKit2/Shared/WebEventConversion.cpp

    r139023 r157319  
    197197}
    198198
    199 #if ENABLE(GESTURE_EVENTS)
    200 class WebKit2PlatformGestureEvent : public WebCore::PlatformGestureEvent {
    201 public:
    202     WebKit2PlatformGestureEvent(const WebGestureEvent& webEvent)
    203     {
    204         // PlatformEvent
    205         switch (webEvent.type()) {
    206         case WebEvent::GestureScrollBegin:
    207             m_type = WebCore::PlatformEvent::GestureScrollBegin;
    208             break;
    209         case WebEvent::GestureScrollEnd:
    210             m_type = WebCore::PlatformEvent::GestureScrollEnd;
    211             break;
    212         case WebEvent::GestureSingleTap:
    213             m_type = WebCore::PlatformEvent::GestureTap;
    214             break;
    215         default:
    216             ASSERT_NOT_REACHED();
    217         }
    218 
    219         m_modifiers = 0;
    220         if (webEvent.shiftKey())
    221             m_modifiers |= ShiftKey;
    222         if (webEvent.controlKey())
    223             m_modifiers |= CtrlKey;
    224         if (webEvent.altKey())
    225             m_modifiers |= AltKey;
    226         if (webEvent.metaKey())
    227             m_modifiers |= MetaKey;
    228 
    229         m_timestamp = webEvent.timestamp();
    230 
    231         // PlatformGestureEvent
    232         m_position = webEvent.position();
    233         m_globalPosition = webEvent.globalPosition();
    234 
    235         m_area = webEvent.area();
    236         m_deltaX = webEvent.delta().x();
    237         m_deltaY = webEvent.delta().y();
    238     }
    239 };
    240 
    241 WebCore::PlatformGestureEvent platform(const WebGestureEvent& webEvent)
    242 {
    243     return WebKit2PlatformGestureEvent(webEvent);
    244 }
    245 #endif
    246 
    247199#if ENABLE(TOUCH_EVENTS)
    248200class WebKit2PlatformTouchPoint : public WebCore::PlatformTouchPoint {

  • trunk/Source/WebKit2/Shared/WebEventConversion.h

    r95901 r157319  
    3131#include <WebCore/PlatformWheelEvent.h>
    3232
    33 #if ENABLE(GESTURE_EVENTS)
    34 #include <WebCore/PlatformGestureEvent.h>
    35 #endif
    36 
    3733#if ENABLE(TOUCH_EVENTS)
    3834#include <WebCore/PlatformTouchEvent.h>
    … …  
    4642class WebKeyboardEvent;
    4743
    48 #if ENABLE(GESTURE_EVENTS)
    49 class WebGestureEvent;
    50 #endif
    51 
    5244#if ENABLE(TOUCH_EVENTS)
    5345class WebTouchEvent;
    … …  
    5951WebCore::PlatformKeyboardEvent platform(const WebKeyboardEvent&);
    6052
    61 #if ENABLE(GESTURE_EVENTS)
    62 WebCore::PlatformGestureEvent platform(const WebGestureEvent&);
    63 #endif
    64 
    6553#if ENABLE(TOUCH_EVENTS)
    6654WebCore::PlatformTouchEvent platform(const WebTouchEvent&);

  • trunk/Source/WebKit2/Shared/mac/WebEventFactory.h

    r119349 r157319  
    4040    static WebWheelEvent createWebWheelEvent(NSEvent *event, NSView *windowView);
    4141    static WebKeyboardEvent createWebKeyboardEvent(NSEvent *event, NSView *windowView);
    42 
    43 #if ENABLE(GESTURE_EVENTS)
    44     static WebGestureEvent createWebGestureEvent(NSEvent *event, NSView *windowView);
    45 #endif
    4642#endif // USE(APPKIT)
    4743};

  • trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm

    r156860 r157319  
    240240    return static_cast<WebWheelEvent::Phase>(phase);
    241241}
    242 
    243 #if ENABLE(GESTURE_EVENTS)
    244 static WebEvent::Type gestureEventTypeForEvent(NSEvent *event)
    245 {
    246     switch ([event type]) {
    247     case NSEventTypeBeginGesture:
    248         return WebEvent::GestureScrollBegin;
    249     case NSEventTypeEndGesture:
    250         return WebEvent::GestureScrollEnd;
    251     default:
    252         ASSERT_NOT_REACHED();
    253         return WebEvent::GestureScrollEnd;
    254     }
    255 }
    256 #endif
    257242
    258243static inline String textFromEvent(NSEvent* event)
    … …  
    463448}
    464449
    465 #if ENABLE(GESTURE_EVENTS)
    466 WebGestureEvent WebEventFactory::createWebGestureEvent(NSEvent *event, NSView *windowView)
    467 {
    468     WebEvent::Type type             = gestureEventTypeForEvent(event);
    469     NSPoint position                = pointForEvent(event, windowView);
    470     NSPoint globalPosition          = globalPointForEvent(event);
    471     WebEvent::Modifiers modifiers   = modifiersForEvent(event);
    472     double timestamp                = eventTimeStampSince1970(event);
    473 
    474     return WebGestureEvent(type, IntPoint(position), IntPoint(globalPosition), modifiers, timestamp);
    475 }
    476 #endif
    477 
    478450} // namespace WebKit
    479451

  • trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h

    r156688 r157319  
    9191    virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&);
    9292
    93 #if ENABLE(GESTURE_EVENTS)
    94     virtual void doneWithGestureEvent(const WebGestureEvent&, bool wasEventHandled);
    95 #endif
    9693    virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled);
    9794

  • trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm

    r156860 r157319  
    371371}
    372372
    373 #if ENABLE(GESTURE_EVENTS)
    374 void PageClientImpl::doneWithGestureEvent(const WebGestureEvent&, bool wasEventHandled)
    375 {
    376     notImplemented();
    377 }
    378 #endif
    379 
    380373void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled)
    381374{

  • trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

    r157058 r157319  
    195195
    196196    id _flagsChangedEventMonitor;
    197 #if ENABLE(GESTURE_EVENTS)
    198     id _endGestureMonitor;
    199 #endif
    200    
     197
    201198#if ENABLE(FULLSCREEN_API)
    202199    RetainPtr<WKFullScreenWindowController> _fullScreenWindowController;
    … …  
    12151212}
    12161213
    1217 #if ENABLE(GESTURE_EVENTS)
    1218 
    1219 static const short kIOHIDEventTypeScroll = 6;
    1220 
    1221 - (void)shortCircuitedEndGestureWithEvent:(NSEvent *)event
    1222 {
    1223     if ([event subtype] != kIOHIDEventTypeScroll)
    1224         return;
    1225 
    1226     WebGestureEvent webEvent = WebEventFactory::createWebGestureEvent(event, self);
    1227     _data->_page->handleGestureEvent(webEvent);
    1228 
    1229     if (_data->_endGestureMonitor) {
    1230         [NSEvent removeMonitor:_data->_endGestureMonitor];
    1231         _data->_endGestureMonitor = nil;
    1232     }
    1233 }
    1234 
    1235 - (void)beginGestureWithEvent:(NSEvent *)event
    1236 {
    1237     if ([event subtype] != kIOHIDEventTypeScroll)
    1238         return;
    1239 
    1240     WebGestureEvent webEvent = WebEventFactory::createWebGestureEvent(event, self);
    1241     _data->_page->handleGestureEvent(webEvent);
    1242 
    1243     if (!_data->_endGestureMonitor) {
    1244         _data->_endGestureMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskEndGesture handler:^(NSEvent *blockEvent) {
    1245             [self shortCircuitedEndGestureWithEvent:blockEvent];
    1246             return blockEvent;
    1247         }];
    1248     }
    1249 }
    1250 #endif
    1251 
    12521214- (void)doCommandBySelector:(SEL)selector
    12531215{
    … …  
    20181980        _data->_flagsChangedEventMonitor = nil;
    20191981
    2020 #if ENABLE(GESTURE_EVENTS)
    2021         if (_data->_endGestureMonitor) {
    2022             [NSEvent removeMonitor:_data->_endGestureMonitor];
    2023             _data->_endGestureMonitor = nil;
    2024         }
    2025 #endif
    20261982        WKHideWordDefinitionWindow();
    20271983    }

  • trunk/Source/WebKit2/UIProcess/PageClient.h

    r156847 r157319  
    5959class NativeWebTouchEvent;
    6060#endif
    61 #if ENABLE(GESTURE_EVENTS)
    62 class WebGestureEvent;
    63 #endif
    6461class WebContextMenuProxy;
    6562class WebEditCommandProxy;
    … …  
    171168   
    172169    virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) = 0;
    173 #if ENABLE(GESTURE_EVENTS)
    174     virtual void doneWithGestureEvent(const WebGestureEvent&, bool wasEventHandled) = 0;
    175 #endif
    176170#if ENABLE(TOUCH_EVENTS)
    177171    virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) = 0;

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r157064 r157319  
    14011401#endif // ENABLE(NETSCAPE_PLUGIN_API)
    14021402
    1403 #if ENABLE(GESTURE_EVENTS)
    1404 void WebPageProxy::handleGestureEvent(const WebGestureEvent& event)
    1405 {
    1406     if (!isValid())
    1407         return;
    1408 
    1409     m_gestureEventQueue.append(event);
    1410 
    1411     m_process->responsivenessTimer()->start();
    1412     m_process->send(Messages::EventDispatcher::GestureEvent(m_pageID, event), 0);
    1413 }
    1414 #endif
    1415 
    14161403#if ENABLE(TOUCH_EVENTS)
    14171404void WebPageProxy::handleTouchEvent(const NativeWebTouchEvent& event)
    … …  
    34623449    case WebEvent::RawKeyDown:
    34633450    case WebEvent::Char:
    3464 #if ENABLE(GESTURE_EVENTS)
    3465     case WebEvent::GestureScrollBegin:
    3466     case WebEvent::GestureScrollEnd:
    3467     case WebEvent::GestureSingleTap:
    3468 #endif
    34693451#if ENABLE(TOUCH_EVENTS)
    34703452    case WebEvent::TouchStart:
    … …  
    34893471    case WebEvent::MouseDown:
    34903472        break;
    3491 #if ENABLE(GESTURE_EVENTS)
    3492     case WebEvent::GestureScrollBegin:
    3493     case WebEvent::GestureScrollEnd:
    3494     case WebEvent::GestureSingleTap: {
    3495         WebGestureEvent event = m_gestureEventQueue.first();
    3496         MESSAGE_CHECK(type == event.type());
    3497 
    3498         m_gestureEventQueue.removeFirst();
    3499         m_pageClient->doneWithGestureEvent(event, handled);
    3500         break;
    3501     }
    3502 #endif
    35033473    case WebEvent::MouseUp:
    35043474        m_currentlyProcessedMouseDownEvent = nullptr;
    … …  
    38333803
    38343804    // Can't expect DidReceiveEvent notifications from a crashed web process.
    3835 #if ENABLE(GESTURE_EVENTS)
    3836     m_gestureEventQueue.clear();
    3837 #endif
    38383805    m_keyEventQueue.clear();
    38393806    m_wheelEventQueue.clear();

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r157064 r157319  
    151151struct WebPopupItem;
    152152
    153 #if ENABLE(GESTURE_EVENTS)
    154 class WebGestureEvent;
    155 #endif
    156 
    157153#if ENABLE(VIBRATION)
    158154class WebVibrationProxy;
    … …  
    419415    void handleWheelEvent(const NativeWebWheelEvent&);
    420416    void handleKeyboardEvent(const NativeWebKeyboardEvent&);
    421 #if ENABLE(GESTURE_EVENTS)
    422     void handleGestureEvent(const WebGestureEvent&);
    423 #endif
    424417#if ENABLE(TOUCH_EVENTS)
    425418    void handleTouchEvent(const NativeWebTouchEvent&);
    … …  
    11681161    uint64_t m_syncNavigationActionPolicyDownloadID;
    11691162
    1170 #if ENABLE(GESTURE_EVENTS)
    1171     Deque<WebGestureEvent> m_gestureEventQueue;
    1172 #endif
    11731163    Deque<NativeWebKeyboardEvent> m_keyEventQueue;
    11741164    Deque<NativeWebWheelEvent> m_wheelEventQueue;

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r157251 r157319  
    892892                BC90A1D3122DD55E00CC8C50 /* WebURLResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */; };
    893893                BC90A1D7122DD66A00CC8C50 /* WebURLResponseMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC90A1D5122DD66A00CC8C50 /* WebURLResponseMac.mm */; };
    894                 BC9585C812F095B800755821 /* WebGestureEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC9585C712F095B800755821 /* WebGestureEvent.cpp */; };
    895894                BC963D6B113DD19200574BE2 /* WebPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6A113DD19200574BE2 /* WebPage.cpp */; };
    896895                BC963D6E113DD1A500574BE2 /* WebPageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6D113DD1A500574BE2 /* WebPageMac.mm */; };
    … …  
    23132312                BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebURLResponse.cpp; sourceTree = "<group>"; };
    23142313                BC90A1D5122DD66A00CC8C50 /* WebURLResponseMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebURLResponseMac.mm; sourceTree = "<group>"; };
    2315                 BC9585C712F095B800755821 /* WebGestureEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebGestureEvent.cpp; sourceTree = "<group>"; };
    23162314                BC963D6A113DD19200574BE2 /* WebPage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPage.cpp; sourceTree = "<group>"; };
    23172315                BC963D6D113DD1A500574BE2 /* WebPageMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPageMac.mm; sourceTree = "<group>"; };
    … …  
    31623160                                BC0E607112D6BC200012A72A /* WebGeolocationPosition.h */,
    31633161                                0F174AA2142A4CB60039250F /* WebGeometry.h */,
    3164                                 BC9585C712F095B800755821 /* WebGestureEvent.cpp */,
    31653162                                BCA56A1B12F9028E00C566C7 /* WebGraphicsContext.cpp */,
    31663163                                BCA56A1A12F9028E00C566C7 /* WebGraphicsContext.h */,
    … …  
    64296426                                BC0E607412D6BC200012A72A /* WebGeolocationPosition.cpp in Sources */,
    64306427                                BC1BE1F312D54DBD0004A228 /* WebGeolocationProvider.cpp in Sources */,
    6431                                 BC9585C812F095B800755821 /* WebGestureEvent.cpp in Sources */,
    64326428                                BCA56A1D12F9028E00C566C7 /* WebGraphicsContext.cpp in Sources */,
    64336429                                BCF69F861176CD6F00471A52 /* WebHistoryClient.cpp in Sources */,

  • trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp

    r156924 r157319  
    110110}
    111111
    112 #if ENABLE(GESTURE_EVENTS)
    113 void EventDispatcher::gestureEvent(uint64_t pageID, const WebGestureEvent& gestureEvent)
    114 {
    115     RunLoop::main()->dispatch(bind(&EventDispatcher::dispatchGestureEvent, this, pageID, gestureEvent));
    116 }
    117 #endif
    118 
    119112void EventDispatcher::dispatchWheelEvent(uint64_t pageID, const WebWheelEvent& wheelEvent)
    120113{
    … …  
    128121}
    129122
    130 #if ENABLE(GESTURE_EVENTS)
    131 void EventDispatcher::dispatchGestureEvent(uint64_t pageID, const WebGestureEvent& gestureEvent)
    132 {
    133     ASSERT(isMainThread());
    134 
    135     WebPage* webPage = WebProcess::shared().webPage(pageID);
    136     if (!webPage)
    137         return;
    138 
    139     webPage->gestureEvent(gestureEvent);
    140 }
    141 #endif
    142 
    143123#if ENABLE(THREADED_SCROLLING)
    144124void EventDispatcher::sendDidReceiveEvent(uint64_t pageID, const WebEvent& event, bool didHandleEvent)

  • trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h

    r156924 r157319  
    4343class WebWheelEvent;
    4444
    45 #if ENABLE(GESTURE_EVENTS)
    46 class WebGestureEvent;
    47 #endif
    48 
    4945class EventDispatcher : public CoreIPC::Connection::WorkQueueMessageReceiver {
    5046public:
    … …  
    6763    // Message handlers
    6864    void wheelEvent(uint64_t pageID, const WebWheelEvent&, bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom);
    69 #if ENABLE(GESTURE_EVENTS)
    70     void gestureEvent(uint64_t pageID, const WebGestureEvent&);
    71 #endif
    7265
    7366    // This is called on the main thread.
    7467    void dispatchWheelEvent(uint64_t pageID, const WebWheelEvent&);
    75 #if ENABLE(GESTURE_EVENTS)
    76     void dispatchGestureEvent(uint64_t pageID, const WebGestureEvent&);
    77 #endif
    7868
    7969#if ENABLE(THREADED_SCROLLING)

  • trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.messages.in

    r156924 r157319  
    2323messages -> EventDispatcher {
    2424    WheelEvent(uint64_t pageID, WebKit::WebWheelEvent event, bool canRubberBandsAtLeft, bool canRubberBandsAtRight, bool canRubberBandsAtTop, bool canRubberBandsAtBottom)
    25 
    26 #if ENABLE(GESTURE_EVENTS)
    27     GestureEvent(uint64_t pageID, WebKit::WebGestureEvent event)
    28 #endif
    29 
    3025}

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r157058 r157319  
    17101710}
    17111711
    1712 #if ENABLE(GESTURE_EVENTS)
    1713 static bool handleGestureEvent(const WebGestureEvent& gestureEvent, Page* page)
    1714 {
    1715     Frame& frame = page->mainFrame();
    1716     if (!frame.view())
    1717         return false;
    1718 
    1719     PlatformGestureEvent platformGestureEvent = platform(gestureEvent);
    1720     return frame.eventHandler().handleGestureEvent(platformGestureEvent);
    1721 }
    1722 
    1723 void WebPage::gestureEvent(const WebGestureEvent& gestureEvent)
    1724 {
    1725     bool handled = false;
    1726 
    1727     if (canHandleUserEvents()) {
    1728         CurrentEvent currentEvent(gestureEvent);
    1729 
    1730         handled = handleGestureEvent(gestureEvent, m_page.get());
    1731     }
    1732     send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(gestureEvent.type()), handled));
    1733 }
    1734 #endif
    1735    
    17361712WKTypeRef WebPage::pageOverlayCopyAccessibilityAttributeValue(WKStringRef attribute, WKTypeRef parameter)
    17371713{

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r156924 r157319  
    148148struct WebPreferencesStore;
    149149
    150 #if ENABLE(GESTURE_EVENTS)
    151 class WebGestureEvent;
    152 #endif
    153 
    154150#if ENABLE(TOUCH_EVENTS)
    155151class WebTouchEvent;
    … …  
    568564
    569565    void wheelEvent(const WebWheelEvent&);
    570 #if ENABLE(GESTURE_EVENTS)
    571     void gestureEvent(const WebGestureEvent&);
    572 #endif
    573566
    574567    void numWheelEventHandlersChanged(unsigned);
Note: See TracChangeset for help on using the changeset viewer.