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

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit f444dbdac8d7cd4ab97e927f746c49ad8aa65535
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 15:48:23 2010 +0000

    2010-08-25  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: support checked and disabled context menu items.
            https://bugs.webkit.org/show_bug.cgi?id=44612
    
            * platform/ContextMenu.cpp:
            (WebCore::ContextMenu::checkOrEnableIfNeeded):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ea75ad7..eb5910e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -54,6 +54,16 @@
 
         Reviewed by Yury Semikhatsky.
 
+        Web Inspector: support checked and disabled context menu items.
+        https://bugs.webkit.org/show_bug.cgi?id=44612
+
+        * platform/ContextMenu.cpp:
+        (WebCore::ContextMenu::checkOrEnableIfNeeded):
+
+2010-08-25  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
         Web Inspector: support disabled and checked context menu items.
         https://bugs.webkit.org/show_bug.cgi?id=44601
 
diff --git a/WebCore/platform/ContextMenu.cpp b/WebCore/platform/ContextMenu.cpp
index 84a2ffc..37d4c2b 100644
--- a/WebCore/platform/ContextMenu.cpp
+++ b/WebCore/platform/ContextMenu.cpp
@@ -584,6 +584,10 @@ void ContextMenu::checkOrEnableIfNeeded(ContextMenuItem& item) const
     if (!frame)
         return;
 
+    // Custom items already have proper checked and enabled values.
+    if (ContextMenuItemBaseCustomTag <= item.action() && item.action() <= ContextMenuItemLastCustomTag)
+        return;
+
     bool shouldEnable = true;
     bool shouldCheck = false; 
 

-- 
WebKit Debian packaging