[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mitz at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 59b111398f7943ffe39ab31c726356014e37a776
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 19:05:22 2011 +0000

    Allow pop-up menus to contain multiple items that have the same title.
    
    Reviewed by Anders Carlsson.
    
    * UIProcess/mac/WebPopupMenuProxyMac.mm:
    (WebKit::WebPopupMenuProxyMac::populate): Set the item’s title after adding it rather than
    when adding it, so that it will not replace any existing item with the same title.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76815 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 6c7843f..c280bcc 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-27  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Allow pop-up menus to contain multiple items that have the same title.
+
+        * UIProcess/mac/WebPopupMenuProxyMac.mm:
+        (WebKit::WebPopupMenuProxyMac::populate): Set the item’s title after adding it rather than
+        when adding it, so that it will not replace any existing item with the same title.
+
 2011-01-27  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm b/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm
index cf26666..355c115 100644
--- a/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm
+++ b/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm
@@ -63,8 +63,9 @@ void WebPopupMenuProxyMac::populate(const Vector<WebPopupItem>& items)
         if (items[i].m_type == WebPopupItem::Seperator)
             [[m_popup.get() menu] addItem:[NSMenuItem separatorItem]];
         else {
-            [m_popup.get() addItemWithTitle:nsStringFromWebCoreString(items[i].m_text)];
+            [m_popup.get() addItemWithTitle:@""];
             NSMenuItem* menuItem = [m_popup.get() lastItem];
+            [menuItem setTitle:nsStringFromWebCoreString(items[i].m_text)];
             [menuItem setEnabled:items[i].m_isEnabled];
             [menuItem setToolTip:nsStringFromWebCoreString(items[i].m_toolTip)];
         }

-- 
WebKit Debian packaging