[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 1463fafa1a5f42a81c6e9877f531b905cb278ee8
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 9 01:03:06 2010 +0000

    WebMenuTarget implemented in both WebKit and WebKit2
    https://bugs.webkit.org/show_bug.cgi?id=50665
    <rdar://problem/8742640>
    
    Reviewed by Brady Eidson.
    
    Rename WebMenuTarget to WKMenuTarget to prevent this warning and stay consistent with
    other WebKit2 namings.
    
    * UIProcess/mac/WebContextMenuProxyMac.mm:
    (+[WKMenuTarget sharedMenuTarget]):
    (WebKit::nsMenuItemVector):
    (WebKit::WebContextMenuProxyMac::showContextMenu):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73567 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5249a59..185d9f0 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-08  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Brady Eidson.
+
+        WebMenuTarget implemented in both WebKit and WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=50665
+        <rdar://problem/8742640>
+        
+        Rename WebMenuTarget to WKMenuTarget to prevent this warning and stay consistent with
+        other WebKit2 namings.
+
+        * UIProcess/mac/WebContextMenuProxyMac.mm:
+        (+[WKMenuTarget sharedMenuTarget]):
+        (WebKit::nsMenuItemVector):
+        (WebKit::WebContextMenuProxyMac::showContextMenu):
+
 2010-12-08  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm b/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
index b932ea1..d76b997 100644
--- a/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
+++ b/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
@@ -60,20 +60,20 @@ using namespace WebCore;
 
 @end
 
- at interface WebMenuTarget : NSObject {
+ at interface WKMenuTarget : NSObject {
     WebKit::WebContextMenuProxyMac* _menuProxy;
 }
-+ (WebMenuTarget*)sharedMenuTarget;
++ (WKMenuTarget*)sharedMenuTarget;
 - (WebKit::WebContextMenuProxyMac*)menuProxy;
 - (void)setMenuProxy:(WebKit::WebContextMenuProxyMac*)menuProxy;
 - (void)forwardContextMenuAction:(id)sender;
 @end
 
- at implementation WebMenuTarget
+ at implementation WKMenuTarget
 
-+ (WebMenuTarget*)sharedMenuTarget
++ (WKMenuTarget*)sharedMenuTarget
 {
-    static WebMenuTarget* target = [[WebMenuTarget alloc] init];
+    static WKMenuTarget* target = [[WKMenuTarget alloc] init];
     return target;
 }
 
@@ -175,7 +175,7 @@ static Vector<RetainPtr<NSMenuItem> > nsMenuItemVector(const Vector<WebContextMe
         }
     }
 
-    WebMenuTarget* target = [WebMenuTarget sharedMenuTarget];
+    WKMenuTarget* target = [WKMenuTarget sharedMenuTarget];
     for (unsigned i = 0; i < size; ++i)
         [result[i].get() setTarget:target];
     
@@ -199,7 +199,7 @@ void WebContextMenuProxyMac::populate(const Vector<WebContextMenuItemData>& item
 void WebContextMenuProxyMac::showContextMenu(const IntPoint& menuLocation, const Vector<WebContextMenuItemData>& items)
 {
     populate(items);
-    [[WebMenuTarget sharedMenuTarget] setMenuProxy:this];
+    [[WKMenuTarget sharedMenuTarget] setMenuProxy:this];
     
     NSRect menuRect = NSMakeRect(menuLocation.x(), menuLocation.y(), 0, 0);
     

-- 
WebKit Debian packaging