diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
| commit | 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (patch) | |
| tree | 52599cd0ab782b1768e23ad176f7618f98333cb6 /Source/WebKit/chromium/src/WebPopupMenuImpl.cpp | |
| parent | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (diff) | |
| download | qtwebkit-03e12282df9aa1e1fb05a8b90f1cfc2e08764cec.tar.gz | |
Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525 (http://svn.webkit.org/repository/webkit/trunk@107223)
Diffstat (limited to 'Source/WebKit/chromium/src/WebPopupMenuImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebPopupMenuImpl.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp b/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp index 687b03360..3f328f55b 100644 --- a/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp +++ b/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp @@ -51,9 +51,8 @@ #include "platform/WebRect.h" #include <skia/ext/platform_canvas.h> -#if ENABLE(GESTURE_RECOGNIZER) +#if ENABLE(GESTURE_EVENTS) #include "PlatformGestureEvent.h" -#include "PlatformGestureRecognizer.h" #endif using namespace WebCore; @@ -73,9 +72,6 @@ WebPopupMenu* WebPopupMenu::create(WebWidgetClient* client) WebPopupMenuImpl::WebPopupMenuImpl(WebWidgetClient* client) : m_client(client) , m_widget(0) -#if ENABLE(GESTURE_RECOGNIZER) - , m_gestureRecognizer(WebCore::PlatformGestureRecognizer::create()) -#endif { // Set to impossible point so we always get the first mouse position. m_lastMousePosition = WebPoint(-1, -1); @@ -143,11 +139,6 @@ bool WebPopupMenuImpl::handleTouchEvent(const WebTouchEvent& event) PlatformTouchEventBuilder touchEventBuilder(m_widget, event); bool defaultPrevented(m_widget->handleTouchEvent(touchEventBuilder)); -#if ENABLE(GESTURE_RECOGNIZER) - OwnPtr<Vector<WebCore::PlatformGestureEvent> > gestureEvents(m_gestureRecognizer->processTouchEventForGestures(touchEventBuilder, defaultPrevented)); - for (unsigned int i = 0; i < gestureEvents->size(); i++) - m_widget->handleGestureEvent((*gestureEvents)[i]); -#endif return defaultPrevented; } #endif @@ -284,6 +275,12 @@ bool WebPopupMenuImpl::handleInputEvent(const WebInputEvent& inputEvent) case WebInputEvent::MouseEnter: case WebInputEvent::ContextMenu: return false; + + case WebInputEvent::GesturePinchBegin: + case WebInputEvent::GesturePinchEnd: + case WebInputEvent::GesturePinchUpdate: + // FIXME: Once PlatformGestureEvent is updated to support pinch, this should call handleGestureEvent, just like it currently does for gesture scroll. + return false; } return false; } |