commit 780fa75ec01046112ababf600aa8ed455c3f93b5
author mitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Oct 20 20:56:45 2009 +0000
committer mitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Oct 20 20:56:45 2009 +0000
tree 099f7cd75289052ee957a1a757942bc9ecac49b6
parent 99350211b90b21510975f25f0a44395ff8b26811

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

WebKit/mac/ChangeLog

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@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@chromium.org>
 
         Reviewed by David Levin.

WebKit/mac/WebCoreSupport/WebContextMenuClient.mm

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 @@
 
 NSMutableArray* WebContextMenuClient::getCustomMenuFromDefaultItems(ContextMenu* defaultMenu)
 {
-    return defaultMenu->platformDescription();
     id delegate = [m_webView UIDelegate];
     SEL selector = @selector(webView:contextMenuItemsForElement:defaultMenuItems:);
     if (![delegate respondsToSelector:selector])