Changeset 51142 in webkit

Timestamp:

Nov 18, 2009 3:10:54 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-18 Evan Stade <​estade@chromium.org>

Reviewed by Darin Fisher.

Menu button shows wrong content in Chromium
​https://bugs.webkit.org/show_bug.cgi?id=31448

Make context menu button (VK_APPS) show context menu for node that has
keyboard focus. This affects both the content and the positioning.

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

Location:

trunk/WebKit/chromium

Files:

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

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2009-11-18  Evan Stade  <estade@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Menu button shows wrong content in Chromium
+        https://bugs.webkit.org/show_bug.cgi?id=31448
+
+        Make context menu button (VK_APPS) show context menu for node that has
+        keyboard focus. This affects both the content and the positioning.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::sendContextMenuEvent):
+
 2009-11-17  Darin Fisher  <darin@chromium.org>
 

trunk/WebKit/chromium/src/WebViewImpl.cpp

@@ -588 +588 @@
     Position end = mainFrameImpl->selection()->selection().end();
 
-    if (!start.node() || !end.node()) {
+    Frame* focusedFrame = page()->focusController()->focusedOrMainFrame();
+    Node* focusedNode = focusedFrame->document()->focusedNode();
+
+    if (start.node() && end.node()) {
+        RenderObject* renderer = start.node()->renderer();
+        if (!renderer)
+            return false;
+
+        RefPtr<Range> selection = mainFrameImpl->selection()->toNormalizedRange();
+        IntRect firstRect = mainFrameImpl->firstRectForRange(selection.get());
+
+        int x = rightAligned ? firstRect.right() : firstRect.x();
+        location = IntPoint(x, firstRect.bottom());
+    } else if (focusedNode)
+        location = focusedNode->getRect().bottomLeft();
+    else {
         location = IntPoint(
             rightAligned ? view->contentsWidth() - kContextMenuMargin : kContextMenuMargin,
             kContextMenuMargin);
-    } else {
-        RenderObject* renderer = start.node()->renderer();
-        if (!renderer)
-            return false;
-
-        RefPtr<Range> selection = mainFrameImpl->selection()->toNormalizedRange();
-        IntRect firstRect = mainFrameImpl->firstRectForRange(selection.get());
-
-        int x = rightAligned ? firstRect.right() : firstRect.x();
-        location = IntPoint(x, firstRect.bottom());
     }
 
@@ -618 +623 @@
     page()->contextMenuController()->clearContextMenu();
 
-    Frame* focusedFrame = page()->focusController()->focusedOrMainFrame();
     focusedFrame->view()->setCursor(pointerCursor());
     WebMouseEvent mouseEvent;