[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[mitz at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 780fa75ec01046112ababf600aa8ed455c3f93b5
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 20 20:56:45 2009 +0000

    Rubber-stamped by Mark Rowe.
    
    <rdar://problem/7319749> REGRESSION(r49806): Contextual Menu items missing
    https://bugs.webkit.org/show_bug.cgi?id=30568
    
    Revert accidental change from r49806.
    
    * WebCoreSupport/WebContextMenuClient.mm:
    (WebContextMenuClient::getCustomMenuFromDefaultItems):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49884 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index ef82431..1017fde 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-20  Dan Bernstein  <mitz at apple.com>
+
+        Rubber-stamped by Mark Rowe.
+
+        <rdar://problem/7319749> REGRESSION(r49806): Contextual Menu items missing
+        https://bugs.webkit.org/show_bug.cgi?id=30568
+
+        Revert accidental change from r49806.
+
+        * WebCoreSupport/WebContextMenuClient.mm:
+        (WebContextMenuClient::getCustomMenuFromDefaultItems):
+
 2009-10-20  Fumitoshi Ukai  <ukai at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm b/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm
index afe3cc2..639f3c1 100644
--- a/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm
@@ -270,7 +270,6 @@ static void fixMenusReceivedFromOldClients(NSMutableArray *newMenuItems, NSMutab
 
 NSMutableArray* WebContextMenuClient::getCustomMenuFromDefaultItems(ContextMenu* defaultMenu)
 {
-    return defaultMenu->platformDescription();
     id delegate = [m_webView UIDelegate];
     SEL selector = @selector(webView:contextMenuItemsForElement:defaultMenuItems:);
     if (![delegate respondsToSelector:selector])

-- 
WebKit Debian packaging