Changeset 116671 in webkit

Timestamp:

May 10, 2012 11:42:54 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Trigger context menu for long press gesture
​https://bugs.webkit.org/show_bug.cgi?id=85919

Patch by Varun Jain <​varunjain@google.com> on 2012-05-10
Reviewed by Adam Barth.

Source/WebCore:

Test: fast/events/touch/gesture/context-menu-on-long-press.html

• page/EventHandler.cpp:

(WebCore):
(WebCore::EventHandler::sendContextMenuEventForGesture):

• page/EventHandler.h:

(EventHandler):

Source/WebKit/chromium:

• src/PageWidgetDelegate.cpp:

(WebKit::PageWidgetDelegate::handleInputEvent):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::handleGestureEvent):

Tools:

• DumpRenderTree/chromium/EventSender.cpp:

(EventSender::EventSender):
(EventSender::gestureLongPress):
(EventSender::gestureEvent):

• DumpRenderTree/chromium/EventSender.h:

(EventSender):

LayoutTests:

• fast/events/touch/gesture/context-menu-on-long-press.html: Added.
• platform/chromium/fast/events/touch/gesture/context-menu-on-long-press-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/touch/gesture/context-menu-on-long-press.html (added)
• LayoutTests/platform/chromium/fast/events/touch/gesture/context-menu-on-long-press-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (1 diff)
• Source/WebCore/page/EventHandler.h (modified) (1 diff)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/PageWidgetDelegate.cpp (modified) (1 diff)
• Source/WebKit/chromium/src/WebViewImpl.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/EventSender.cpp (modified) (3 diffs)
• Tools/DumpRenderTree/chromium/EventSender.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-10  Varun Jain  <varunjain@google.com>
+
+        [chromium] Trigger context menu for long press gesture
+        https://bugs.webkit.org/show_bug.cgi?id=85919
+
+        Reviewed by Adam Barth.
+
+        * fast/events/touch/gesture/context-menu-on-long-press.html: Added.
+        * platform/chromium/fast/events/touch/gesture/context-menu-on-long-press-expected.txt: Added.
+
 2012-05-10  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-10  Varun Jain  <varunjain@google.com>
+
+        [chromium] Trigger context menu for long press gesture
+        https://bugs.webkit.org/show_bug.cgi?id=85919
+
+        Reviewed by Adam Barth.
+
+        Test: fast/events/touch/gesture/context-menu-on-long-press.html
+
+        * page/EventHandler.cpp:
+        (WebCore):
+        (WebCore::EventHandler::sendContextMenuEventForGesture):
+        * page/EventHandler.h:
+        (EventHandler):
+
 2012-05-10  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2600 +2600 @@
 }
 
+#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
+    PlatformMouseEvent mouseEvent(event.position(), event.globalPosition(), RightButton, eventType, 1, false, false, false, false, WTF::currentTime());
+    return sendContextMenuEvent(mouseEvent);
+}
+#endif // ENABLE(GESTURE_EVENTS)
 #endif // ENABLE(CONTEXT_MENUS)
 

trunk/Source/WebCore/page/EventHandler.h

@@ -176 +176 @@
     bool sendContextMenuEvent(const PlatformMouseEvent&);
     bool sendContextMenuEventForKey();
+#if ENABLE(GESTURE_EVENTS)
+    bool sendContextMenuEventForGesture(const PlatformGestureEvent&);
+#endif
 #endif
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-05-10  Varun Jain  <varunjain@google.com>
+
+        [chromium] Trigger context menu for long press gesture
+        https://bugs.webkit.org/show_bug.cgi?id=85919
+
+        Reviewed by Adam Barth.
+
+        * src/PageWidgetDelegate.cpp:
+        (WebKit::PageWidgetDelegate::handleInputEvent):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::handleGestureEvent):
+
 2012-05-10  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/WebKit/chromium/src/PageWidgetDelegate.cpp

@@ -154 +154 @@
     case WebInputEvent::GestureTapDown:
     case WebInputEvent::GestureDoubleTap:
+    case WebInputEvent::GestureLongPress:
         return handler.handleGestureEvent(*static_cast<const WebGestureEvent*>(&event));
 #endif

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -659 +659 @@
         return gestureHandled;
     }
+    case WebInputEvent::GestureLongPress: {
+        if (!mainFrameImpl() || !mainFrameImpl()->frameView())
+            return false;
+
+        m_page->contextMenuController()->clearContextMenu();
+        m_contextMenuAllowed = true;
+        PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), event);
+        bool handled = mainFrameImpl()->frame()->eventHandler()->sendContextMenuEventForGesture(platformEvent);
+        m_contextMenuAllowed = false;
+        return handled;
+    }
     case WebInputEvent::GestureScrollBegin:
     case WebInputEvent::GestureScrollEnd:
@@ -664 +675 @@
     case WebInputEvent::GestureTapDown:
     case WebInputEvent::GestureDoubleTap:
-    case WebInputEvent::GestureLongPress:
     case WebInputEvent::GesturePinchBegin:
     case WebInputEvent::GesturePinchEnd:

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-10  Varun Jain  <varunjain@google.com>
+
+        [chromium] Trigger context menu for long press gesture
+        https://bugs.webkit.org/show_bug.cgi?id=85919
+
+        Reviewed by Adam Barth.
+
+        * DumpRenderTree/chromium/EventSender.cpp:
+        (EventSender::EventSender):
+        (EventSender::gestureLongPress):
+        (EventSender::gestureEvent):
+        * DumpRenderTree/chromium/EventSender.h:
+        (EventSender):
+
 2012-05-10  Takashi Toyoshima  <toyoshim@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/EventSender.cpp

@@ -287 +287 @@
     bindMethod("gestureScrollUpdate", &EventSender::gestureScrollUpdate);
     bindMethod("gestureTap", &EventSender::gestureTap);
+    bindMethod("gestureLongPress", &EventSender::gestureLongPress);
     bindMethod("zoomPageIn", &EventSender::zoomPageIn);
     bindMethod("zoomPageOut", &EventSender::zoomPageOut);
@@ -1093 +1094 @@
 }
 
+void EventSender::gestureLongPress(const CppArgumentList& arguments, CppVariant* result)
+{
+    result->setNull();
+    gestureEvent(WebInputEvent::GestureLongPress, arguments);
+}
+
 void EventSender::gestureScrollFirstPoint(const CppArgumentList& arguments, CppVariant* result)
 {
@@ -1142 +1149 @@
         event.y = point.y;
         break;
+    case WebInputEvent::GestureLongPress:
+        event.x = point.x;
+        event.y = point.y;
+        break;
     default:
         ASSERT_NOT_REACHED();

trunk/Tools/DumpRenderTree/chromium/EventSender.h

@@ -105 +105 @@
     void gestureScrollUpdate(const CppArgumentList&, CppVariant*);
     void gestureTap(const CppArgumentList&, CppVariant*);
+    void gestureLongPress(const CppArgumentList&, CppVariant*);
     void gestureEvent(WebKit::WebInputEvent::Type, const CppArgumentList&);