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

[beidson at apple.com]

The following commit has been merged in the debian/experimental branch:
commit a4f4bf8df862ea6156088f89df904aff31d92fba
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 10 00:23:12 2010 +0000

    Windows build bot was complaining about this.
    
    Reviewed by the ever-picky Windows build-bot.
    
    * Shared/WebContextMenuItemData.cpp:
    (WebKit::WebContextMenuItemData::core):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71697 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5bed2da..e04cbb0 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-09  Brady Eidson  <beidson at apple.com>
+
+        Reviewed by the ever-picky Windows build-bot.
+
+        Windows build bot was complaining about this.
+
+        * Shared/WebContextMenuItemData.cpp:
+        (WebKit::WebContextMenuItemData::core):
+
 2010-11-09  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by John Sullivan.
diff --git a/WebKit2/Shared/WebContextMenuItemData.cpp b/WebKit2/Shared/WebContextMenuItemData.cpp
index a2d43c5..af87998 100644
--- a/WebKit2/Shared/WebContextMenuItemData.cpp
+++ b/WebKit2/Shared/WebContextMenuItemData.cpp
@@ -80,10 +80,8 @@ WebContextMenuItemData::WebContextMenuItemData(WebCore::ContextMenuItem& item, W
 
 ContextMenuItem WebContextMenuItemData::core() const
 {
-    if (m_type != SubmenuType) {
-        ContextMenuItem result(m_type, m_action, m_title, m_enabled, m_checked);
-        return result;
-    }
+    if (m_type != SubmenuType)
+        return ContextMenuItem(m_type, m_action, m_title, m_enabled, m_checked);
     
     Vector<ContextMenuItem> subMenuItems = coreItems(m_submenu);
     return ContextMenuItem(m_action, m_title, m_enabled, m_checked, subMenuItems);

-- 
WebKit Debian packaging