[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 00e2dc900d775656266c31af06022521d6105298
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 23:41:04 2010 +0000

    When we are creating a ContextMenuItem, only call setSubMenu if we have
    a subMenu to set.
    
    Reviewed by Ada Chan.
    
    * platform/ContextMenuItem.cpp:
    (WebCore::ContextMenuItem::ContextMenuItem):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73813 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ec0aa9f..315f2bf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-10  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Ada Chan.
+
+        When we are creating a ContextMenuItem, only call setSubMenu if we have
+        a subMenu to set.
+
+        * platform/ContextMenuItem.cpp:
+        (WebCore::ContextMenuItem::ContextMenuItem):
+
 2010-12-10  Kenneth Russell  <kbr at google.com>
 
         Unreviewed, another build fix. #include <wtf/UnusedParam.h> needed
diff --git a/WebCore/platform/ContextMenuItem.cpp b/WebCore/platform/ContextMenuItem.cpp
index bd321d9..0c2a6ea 100644
--- a/WebCore/platform/ContextMenuItem.cpp
+++ b/WebCore/platform/ContextMenuItem.cpp
@@ -39,7 +39,8 @@ ContextMenuItem::ContextMenuItem(ContextMenuItemType type, ContextMenuAction act
     , m_enabled(true)
     , m_checked(false)
 {
-    setSubMenu(subMenu);
+    if (subMenu)
+        setSubMenu(subMenu);
 }
 
 ContextMenuItem::ContextMenuItem(ContextMenuItemType type, ContextMenuAction action, const String& title, bool enabled, bool checked)

-- 
WebKit Debian packaging