Changeset 52124 in webkit

Timestamp:

Dec 14, 2009 2:45:35 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-14 Evan Stade <​estade@chromium.org>

Reviewed by Darin Fisher.

​https://bugs.webkit.org/show_bug.cgi?id=32347
Chromium: Context menu launched by menu key has funky behavior

Make the context menu's position depend on the selection only when an
editable field has focus. Also, don't send multiple context menu events
for a single keypress.

• src/WebViewImpl.cpp: (WebKit::WebViewImpl::keyEvent): (WebKit::WebViewImpl::sendContextMenuEvent):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (2 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2009-12-14  Evan Stade  <estade@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32347
+        Chromium: Context menu launched by menu key has funky behavior
+
+        Make the context menu's position depend on the selection only when an
+        editable field has focus. Also, don't send multiple context menu events
+        for a single keypress.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::keyEvent):
+        (WebKit::WebViewImpl::sendContextMenuEvent):
+
 2009-12-13  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit/chromium/src/WebViewImpl.cpp

@@ -454 +454 @@
 
 #if PLATFORM(WIN_OS) || PLATFORM(LINUX)
-    if ((!event.modifiers && (event.windowsKeyCode == VKEY_APPS))
-        || ((event.modifiers == WebInputEvent::ShiftKey) && (event.windowsKeyCode == VKEY_F10))) {
+    const WebInputEvent::Type contextMenuTriggeringEventType =
+#if PLATFORM(WIN_OS)
+        WebInputEvent::KeyUp;
+#elif PLATFORM(LINUX)
+        WebInputEvent::RawKeyDown;
+#endif
+
+    if (((!event.modifiers && (event.windowsKeyCode == VKEY_APPS))
+        || ((event.modifiers == WebInputEvent::ShiftKey) && (event.windowsKeyCode == VKEY_F10)))
+        && event.type == contextMenuTriggeringEventType) {
         sendContextMenuEvent(event);
         return true;
@@ -593 +601 @@
     IntPoint location;
 
-    // The context menu event was generated from the keyboard, so show the
-    // context menu by the current selection.
-    Position start = mainFrameImpl->selection()->selection().start();
-    Position end = mainFrameImpl->selection()->selection().end();
 
     Frame* focusedFrame = page()->focusController()->focusedOrMainFrame();
     Node* focusedNode = focusedFrame->document()->focusedNode();
-
-    if (start.node() && end.node()) {
+    Position start = mainFrameImpl->selection()->selection().start();
+
+    if (focusedFrame->editor() && focusedFrame->editor()->canEdit() && start.node()) {
         RenderObject* renderer = start.node()->renderer();
         if (!renderer)