Changeset 117970 in webkit

Timestamp:

May 22, 2012 7:32:27 AM (12 years ago)

Author:

apavlov@chromium.org

Message:

[Chromium] Implement the ContextMenuItem SubMenu type
​https://bugs.webkit.org/show_bug.cgi?id=86625

Reviewed by Pavel Feldman.

Source/WebCore:

This change is the WebKit part of a two-sided patch that adds subMenuItems to ContextMenuItem
and introduces code needed to handle it properly.

• platform/ContextMenuItem.h:

(PlatformMenuItemDescription): Add a Vector for subMenuItems.

• platform/PlatformMenuDescription.h:

(WebCore): Introduce a meaningful typedef for PlatformMenuDescription in Chromium.

• platform/chromium/ContextMenuChromium.cpp:

(WebCore::ContextMenu::itemWithAction): Search submenus when looking up a requested action id.
(WebCore::ContextMenu::platformDescription): Return a real PlatformMenuDescription rather than 0.

• platform/chromium/ContextMenuItemChromium.cpp:

(WebCore::ContextMenuItem::ContextMenuItem): Set submenu if one has been passed in.
(WebCore::ContextMenuItem::platformSubMenu): Return real subMenuItems instead of an empty PlatformMenuDescription.
(WebCore::ContextMenuItem::setSubMenu): Implemented.
(WebCore):

Source/WebKit/chromium:

• public/WebMenuItemInfo.h:

(WebMenuItemInfo): Add the SubMenu type and a vector of subMenuItems.

• src/ContextMenuClientImpl.cpp:

(WebKit::populateSubMenuItems): A recursive implementation that populates submenu items as well as other item types.
(WebKit):
(WebKit::ContextMenuClientImpl::populateCustomMenuItems): Consider submenus when populating WebMenuItemInfos.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/ContextMenuItem.h (modified) (1 diff)
• WebCore/platform/PlatformMenuDescription.h (modified) (2 diffs)
• WebCore/platform/chromium/ContextMenuChromium.cpp (modified) (2 diffs)
• WebCore/platform/chromium/ContextMenuItemChromium.cpp (modified) (4 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebMenuItemInfo.h (modified) (2 diffs)
• WebKit/chromium/src/ContextMenuClientImpl.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-22  Alexander Pavlov  <apavlov@chromium.org>
+
+        [Chromium] Implement the ContextMenuItem SubMenu type
+        https://bugs.webkit.org/show_bug.cgi?id=86625
+
+        Reviewed by Pavel Feldman.
+
+        This change is the WebKit part of a two-sided patch that adds subMenuItems to ContextMenuItem
+        and introduces code needed to handle it properly.
+
+        * platform/ContextMenuItem.h:
+        (PlatformMenuItemDescription): Add a Vector for subMenuItems.
+        * platform/PlatformMenuDescription.h:
+        (WebCore): Introduce a meaningful typedef for PlatformMenuDescription in Chromium.
+        * platform/chromium/ContextMenuChromium.cpp:
+        (WebCore::ContextMenu::itemWithAction): Search submenus when looking up a requested action id.
+        (WebCore::ContextMenu::platformDescription): Return a real PlatformMenuDescription rather than 0.
+        * platform/chromium/ContextMenuItemChromium.cpp:
+        (WebCore::ContextMenuItem::ContextMenuItem): Set submenu if one has been passed in.
+        (WebCore::ContextMenuItem::platformSubMenu): Return real subMenuItems instead of an empty PlatformMenuDescription.
+        (WebCore::ContextMenuItem::setSubMenu): Implemented.
+        (WebCore):
+
 2012-05-22  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/Source/WebCore/platform/ContextMenuItem.h

@@ -224 +224 @@
         ContextMenuAction action;
         String title;
+        Vector<ContextMenuItem> subMenuItems;
         bool checked;
         bool enabled;

trunk/Source/WebCore/platform/PlatformMenuDescription.h

@@ -35 +35 @@
 #elif PLATFORM(WX)
 class wxMenu;
-#elif PLATFORM(EFL)
+#elif PLATFORM(CHROMIUM) || PLATFORM(EFL)
 #include <wtf/Vector.h>
 #endif
@@ -51 +51 @@
 #elif PLATFORM(WX)
     typedef wxMenu* PlatformMenuDescription;
-#elif PLATFORM(EFL)
+#elif PLATFORM(CHROMIUM) || PLATFORM(EFL)
     class ContextMenuItem;
     typedef const Vector<ContextMenuItem>* PlatformMenuDescription;

trunk/Source/WebCore/platform/chromium/ContextMenuChromium.cpp

@@ -66 +66 @@
 ContextMenuItem* ContextMenu::itemWithAction(unsigned action)
 {
-    for (size_t i = 0; i < m_items.size(); ++i) {
-        if (m_items[i].action() == static_cast<ContextMenuAction>(action))
-            return &m_items[i];
+    Vector<Vector<ContextMenuItem>*> menuItemStack;
+    menuItemStack.append(&m_items);
+    while (!menuItemStack.isEmpty()) {
+        Vector<ContextMenuItem>& items = *(menuItemStack.last());
+        menuItemStack.removeLast();
+        for (size_t i = 0; i < items.size(); ++i) {
+            if (items[i].action() == static_cast<ContextMenuAction>(action))
+                return &items[i];
+            if (items[i].type() == SubmenuType)
+                menuItemStack.append(const_cast<Vector<ContextMenuItem>*>(items[i].platformSubMenu()));
+        }
     }
     return 0;
@@ -84 +92 @@
 PlatformMenuDescription ContextMenu::platformDescription() const
 {
-    return 0;
+    return &m_items;
 }
 

trunk/Source/WebCore/platform/chromium/ContextMenuItemChromium.cpp

@@ -32 +32 @@
 #include "ContextMenuItem.h"
 
+#include "ContextMenu.h"
+
 namespace WebCore {
 
@@ -50 +52 @@
     m_platformDescription.action = action;
     m_platformDescription.title = title;
+    if (subMenu)
+        setSubMenu(subMenu);
 }
 
@@ -88 +92 @@
 PlatformMenuDescription ContextMenuItem::platformSubMenu() const
 {
-    return PlatformMenuDescription();
+    return &m_platformDescription.subMenuItems;
 }
 
@@ -106 +110 @@
 }
 
-void ContextMenuItem::setSubMenu(ContextMenu* subMenu)
+void ContextMenuItem::setSubMenu(ContextMenu* menu)
 {
+    m_platformDescription.subMenuItems = *menu->platformDescription();
+}
+
+void ContextMenuItem::setSubMenu(Vector<ContextMenuItem>& items)
+{
+    m_platformDescription.subMenuItems = items;
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-05-22  Alexander Pavlov  <apavlov@chromium.org>
+
+        [Chromium] Implement the ContextMenuItem SubMenu type
+        https://bugs.webkit.org/show_bug.cgi?id=86625
+
+        Reviewed by Pavel Feldman.
+
+        * public/WebMenuItemInfo.h:
+        (WebMenuItemInfo): Add the SubMenu type and a vector of subMenuItems.
+        * src/ContextMenuClientImpl.cpp:
+        (WebKit::populateSubMenuItems): A recursive implementation that populates submenu items as well as other item types.
+        (WebKit):
+        (WebKit::ContextMenuClientImpl::populateCustomMenuItems): Consider submenus when populating WebMenuItemInfos.
+
 2012-05-22  Ian Vollick  <vollick@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebMenuItemInfo.h

@@ -45 +45 @@
         Group,
         Separator,
+        SubMenu
     };
 
@@ -62 +63 @@
     unsigned action;
     WebTextDirection textDirection;
+    WebVector<WebMenuItemInfo> subMenuItems;
     bool hasTextDirectionOverride;
     bool enabled;

trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp

@@ -348 +348 @@
 }
 
-void ContextMenuClientImpl::populateCustomMenuItems(WebCore::ContextMenu* defaultMenu, WebContextMenuData* data)
-{
-    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() >  ContextMenuItemLastCustomTag)
+static void populateSubMenuItems(PlatformMenuDescription inputMenu, WebVector<WebMenuItemInfo>& subMenuItems)
+{
+    Vector<WebMenuItemInfo> subItems;
+    for (size_t i = 0; i < inputMenu->size(); ++i) {
+        const ContextMenuItem* inputItem = &inputMenu->at(i);
+        if (inputItem->action() < ContextMenuItemBaseCustomTag || inputItem->action() > ContextMenuItemLastCustomTag)
             continue;
 
@@ -372 +372 @@
             break;
         case SubmenuType:
-            outputItem.type = WebMenuItemInfo::Group;
+            outputItem.type = WebMenuItemInfo::SubMenu;
+            populateSubMenuItems(inputItem->platformSubMenu(), outputItem.subMenuItems);
             break;
         }
-        customItems.append(outputItem);
-    }
-
-    WebVector<WebMenuItemInfo> outputItems(customItems.size());
-    for (size_t i = 0; i < customItems.size(); ++i)
-        outputItems[i] = customItems[i];
-    data->customItems.swap(outputItems);
+        subItems.append(outputItem);
+    }
+
+    WebVector<WebMenuItemInfo> outputItems(subItems.size());
+    for (size_t i = 0; i < subItems.size(); ++i)
+        outputItems[i] = subItems[i];
+    subMenuItems.swap(outputItems);
+}
+
+void ContextMenuClientImpl::populateCustomMenuItems(WebCore::ContextMenu* defaultMenu, WebContextMenuData* data)
+{
+    populateSubMenuItems(defaultMenu->platformDescription(), data->customItems);
 }