Changeset 73560 in webkit

Timestamp:

Dec 8, 2010 3:33:49 PM (13 years ago)

Author:

bweinstein@apple.com

Message:

REGRESSION: r73429-r73490: Some Contextual menu items non-functional, such as Open Link in New Tab
​https://bugs.webkit.org/show_bug.cgi?id=50683

Reviewed by John Sullivan.

If our context menu item already has an action, don't overwrite the action with the context menu
forwarder.

• WebView/WebHTMLView.mm:

(setMenuItemTarget):

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebHTMLView.mm (modified) (1 diff)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-12-08  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by John Sullivan.
+
+        REGRESSION: r73429-r73490: Some Contextual menu items non-functional, such as Open Link in New Tab
+        https://bugs.webkit.org/show_bug.cgi?id=50683
+        
+        If our context menu item already has an action, don't overwrite the action with the context menu
+        forwarder.
+
+        * WebView/WebHTMLView.mm:
+        (setMenuItemTarget):
+
 2010-12-08  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit/mac/WebView/WebHTMLView.mm

@@ -3273 +3273 @@
 static void setMenuItemTarget(NSMenuItem* menuItem)
 {
+    // Don't set the menu item's action to the context menu action forwarder if we already
+    // have an action.
+    if ([menuItem action])
+        return;
+
     [menuItem setTarget:[WebMenuTarget sharedMenuTarget]];
     [menuItem setAction:@selector(forwardContextMenuAction:)];