[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[bweinstein at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 314d4fe89655b4f65e8e49a6cc6290fd808c7a66
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 8 23:33:49 2010 +0000

    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):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73560 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 8faaabb..f6b2beb 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-08  Brian Weinstein  <bweinstein at 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 at apple.com>
 
         Remove an unused variable.
diff --git a/WebKit/mac/WebView/WebHTMLView.mm b/WebKit/mac/WebView/WebHTMLView.mm
index b36d57a..aef8e3d 100644
--- a/WebKit/mac/WebView/WebHTMLView.mm
+++ b/WebKit/mac/WebView/WebHTMLView.mm
@@ -3272,6 +3272,11 @@ WEBCORE_COMMAND(yankAndSelect)
 
 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:)];
 }

-- 
WebKit Debian packaging