[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 2cc755cec9976f02eb506b015dc6c86c468d04e5
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 22 12:52:35 2010 +0000

    2010-07-21  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Chromium Dev Tools: Separators are missing in the context menu.
    
            https://bugs.webkit.org/show_bug.cgi?id=42761
    
            * bindings/js/JSInspectorFrontendHostCustom.cpp:
            (WebCore::JSInspectorFrontendHost::showContextMenu):
            * bindings/v8/custom/V8InspectorFrontendHostCustom.cpp:
            (WebCore::V8InspectorFrontendHost::showContextMenuCallback):
            * platform/ContextMenuItem.h:
            (WebCore::):
    2010-07-21  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Chromium Dev Tools: Separators are missing in the context menu.
    
            https://bugs.webkit.org/show_bug.cgi?id=42761
    
            * src/ContextMenuClientImpl.cpp:
            (WebKit::ContextMenuClientImpl::populateCustomMenuItems):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63884 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6f9fe39..044d744 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-21  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Chromium Dev Tools: Separators are missing in the context menu.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42761
+
+        * bindings/js/JSInspectorFrontendHostCustom.cpp:
+        (WebCore::JSInspectorFrontendHost::showContextMenu):
+        * bindings/v8/custom/V8InspectorFrontendHostCustom.cpp:
+        (WebCore::V8InspectorFrontendHost::showContextMenuCallback):
+        * platform/ContextMenuItem.h:
+        (WebCore::):
+
 2010-07-22  Zoltan Herczeg  <zherczeg at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp b/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
index c119adf..b724f50 100644
--- a/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
+++ b/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
@@ -92,7 +92,9 @@ JSValue JSInspectorFrontendHost::showContextMenu(ExecState* exec)
         JSValue label = item->get(exec, Identifier(exec, "label"));
         JSValue id = item->get(exec, Identifier(exec, "id"));
         if (label.isUndefined() || id.isUndefined())
-            items.append(new ContextMenuItem(SeparatorType, ContextMenuItemTagNoAction, String()));
+            items.append(new ContextMenuItem(SeparatorType,
+                                             ContextMenuItemCustomTagNoAction,
+                                             String()));
         else {
             ContextMenuAction typedId = static_cast<ContextMenuAction>(ContextMenuItemBaseCustomTag + id.toInt32(exec));
             items.append(new ContextMenuItem(ActionType, typedId, ustringToString(label.toString(exec))));
diff --git a/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp b/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp
index 7f4ccf7..7733a70 100644
--- a/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp
@@ -80,7 +80,7 @@ v8::Handle<v8::Value> V8InspectorFrontendHost::showContextMenuCallback(const v8:
         v8::Local<v8::Value> id = item->Get(v8::String::New("id"));
         if (label->IsUndefined() || id->IsUndefined()) {
           items.append(new ContextMenuItem(SeparatorType,
-                                           ContextMenuItemTagNoAction,
+                                           ContextMenuItemCustomTagNoAction,
                                            String()));
         } else {
           ContextMenuAction typedId = static_cast<ContextMenuAction>(
diff --git a/WebCore/platform/ContextMenu.cpp b/WebCore/platform/ContextMenu.cpp
index 00bb253..84a2ffc 100644
--- a/WebCore/platform/ContextMenu.cpp
+++ b/WebCore/platform/ContextMenu.cpp
@@ -815,6 +815,8 @@ void ContextMenu::checkOrEnableIfNeeded(ContextMenuItem& item) const
         case ContextMenuItemTagInspectElement:
 #endif
         case ContextMenuItemBaseCustomTag:
+        case ContextMenuItemCustomTagNoAction:
+        case ContextMenuItemLastCustomTag:
         case ContextMenuItemBaseApplicationTag:
             break;
     }
diff --git a/WebCore/platform/ContextMenuItem.h b/WebCore/platform/ContextMenuItem.h
index 0ffe338..058f644 100644
--- a/WebCore/platform/ContextMenuItem.h
+++ b/WebCore/platform/ContextMenuItem.h
@@ -144,6 +144,8 @@ namespace WebCore {
         ContextMenuItemTagChangeBack,
 #endif
         ContextMenuItemBaseCustomTag = 5000,
+        ContextMenuItemCustomTagNoAction = 5998,
+        ContextMenuItemLastCustomTag = 5999,
         ContextMenuItemBaseApplicationTag = 10000
     };
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d85379d..3add956 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-21  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Chromium Dev Tools: Separators are missing in the context menu.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42761
+
+        * src/ContextMenuClientImpl.cpp:
+        (WebKit::ContextMenuClientImpl::populateCustomMenuItems):
+
 2010-07-21  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/src/ContextMenuClientImpl.cpp b/WebKit/chromium/src/ContextMenuClientImpl.cpp
index d0d09bf..1dc2ee7 100644
--- a/WebKit/chromium/src/ContextMenuClientImpl.cpp
+++ b/WebKit/chromium/src/ContextMenuClientImpl.cpp
@@ -277,7 +277,7 @@ void ContextMenuClientImpl::populateCustomMenuItems(WebCore::ContextMenu* defaul
     Vector<WebMenuItemInfo> customItems;
     for (size_t i = 0; i < defaultMenu->itemCount(); ++i) {
         ContextMenuItem* inputItem = defaultMenu->itemAtIndex(i, defaultMenu->platformDescription());
-        if (inputItem->action() < ContextMenuItemBaseCustomTag || inputItem->action() >=  ContextMenuItemBaseApplicationTag)
+        if (inputItem->action() < ContextMenuItemBaseCustomTag || inputItem->action() >  ContextMenuItemLastCustomTag)
             continue;
 
         WebMenuItemInfo outputItem;

-- 
WebKit Debian packaging