Changeset 243793 in webkit

Timestamp:

Apr 3, 2019, 1:25:26 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Web Inspector: [GTK] Copy copies to nowhere
​https://bugs.webkit.org/show_bug.cgi?id=181228

Reviewed by Michael Catanzaro.

The thing is that those items are actually submenu items, with options, for example in the case of Copy to copy
HTML, Text, XPath, etc. We are not correctly handling submenus when populating the context menu received from
the web process.

• UIProcess/gtk/WebContextMenuProxyGtk.cpp:

(WebKit::WebContextMenuProxyGtk::populateSubMenu): Helper to populate submenu items recursively.
(WebKit::WebContextMenuProxyGtk::populate): Handle submenu items.

• UIProcess/gtk/WebContextMenuProxyGtk.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/gtk/WebContextMenuProxyGtk.cpp (modified) (2 diffs)
• UIProcess/gtk/WebContextMenuProxyGtk.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Web Inspector: [GTK] Copy copies to nowhere
+        https://bugs.webkit.org/show_bug.cgi?id=181228
+
+        Reviewed by Michael Catanzaro.
+
+        The thing is that those items are actually submenu items, with options, for example in the case of Copy to copy
+        HTML, Text, XPath, etc. We are not correctly handling submenus when populating the context menu received from
+        the web process.
+
+        * UIProcess/gtk/WebContextMenuProxyGtk.cpp:
+        (WebKit::WebContextMenuProxyGtk::populateSubMenu): Helper to populate submenu items recursively.
+        (WebKit::WebContextMenuProxyGtk::populate): Handle submenu items.
+        * UIProcess/gtk/WebContextMenuProxyGtk.h:
+
 2019-04-02  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/UIProcess/gtk/WebContextMenuProxyGtk.cpp

@@ -118 +118 @@
 }
 
+Vector<WebContextMenuItemGlib> WebContextMenuProxyGtk::populateSubMenu(const WebContextMenuItemData& subMenuItemData)
+{
+    Vector<WebContextMenuItemGlib> items;
+    for (const auto& itemData : subMenuItemData.submenu()) {
+        if (itemData.type() == SubmenuType)
+            items.append(WebContextMenuItemGlib(itemData, populateSubMenu(itemData)));
+        else
+            items.append(itemData);
+    }
+    return items;
+}
+
 void WebContextMenuProxyGtk::populate(const Vector<WebContextMenuItemGlib>& items)
 {
@@ -129 +141 @@
     GMenu* sectionMenu = menu.get();
     for (const auto& item : items) {
-        if (item->data().type() == SeparatorType) {
+        switch (item->data().type()) {
+        case SeparatorType: {
             GRefPtr<GMenu> section = adoptGRef(g_menu_new());
             g_menu_append_section(menu.get(), nullptr, G_MENU_MODEL(section.get()));
             sectionMenu = section.get();
-        } else {
+            break;
+        }
+        case SubmenuType: {
+            WebContextMenuItemGlib menuitem(item->data(), populateSubMenu(item->data()));
+            append(sectionMenu, menuitem);
+            break;
+        }
+        case ActionType:
+        case CheckableActionType: {
             WebContextMenuItemGlib menuitem(item->data());
             append(sectionMenu, menuitem);
+            break;
+        }
         }
     }

trunk/Source/WebKit/UIProcess/gtk/WebContextMenuProxyGtk.h

@@ -60 +60 @@
     GRefPtr<GMenu> buildMenu(const Vector<WebContextMenuItemGlib>&);
     void populate(const Vector<Ref<WebContextMenuItem>>&);
+    Vector<WebContextMenuItemGlib> populateSubMenu(const WebContextMenuItemData&);
     static void menuPositionFunction(GtkMenu*, gint*, gint*, gboolean*, WebContextMenuProxyGtk*);