Changeset 259799 in webkit

Timestamp:

Apr 9, 2020, 7:48:31 AM (6 years ago)

Author:

Claudio Saavedra

Message:

[GTK] Clean-up use of deprecated GtkAction
​https://bugs.webkit.org/show_bug.cgi?id=210273

Reviewed by Carlos Garcia Campos.

Source/WebKit:

GtkAction is deprecated, however we use it because it's exposed
in the public API. Guard deprecated API usage to remove warnings and
update docs to not suggest using the deprecated API.

• Shared/API/glib/WebKitContextMenuItem.cpp:
• Shared/glib/WebContextMenuItemGlib.cpp:

(WebKit::WebContextMenuItemGlib::buildActionName const):
(WebKit::WebContextMenuItemGlib::createActionIfNeeded):

Tools:

GtkAction is deprecated so remove usage of it in the
context menu API tests and guard its API usage when
we still need to use it to test the deprecated WebKitGTK+ API
exposing GtkAction.

• TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp:

(testContextMenuPopulateMenu):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/API/glib/WebKitContextMenuItem.cpp (modified) (1 diff)
• Source/WebKit/Shared/glib/WebContextMenuItemGlib.cpp (modified) (5 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp (modified) (7 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-09  Claudio Saavedra  <csaavedra@igalia.com>
+
+        [GTK] Clean-up use of deprecated GtkAction
+        https://bugs.webkit.org/show_bug.cgi?id=210273
+
+        Reviewed by Carlos Garcia Campos.
+
+        GtkAction is deprecated, however we use it because it's exposed
+        in the public API. Guard deprecated API usage to remove warnings and
+        update docs to not suggest using the deprecated API.
+
+        * Shared/API/glib/WebKitContextMenuItem.cpp:
+        * Shared/glib/WebContextMenuItemGlib.cpp:
+        (WebKit::WebContextMenuItemGlib::buildActionName const):
+        (WebKit::WebContextMenuItemGlib::createActionIfNeeded):
+
 2020-04-09  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebKit/Shared/API/glib/WebKitContextMenuItem.cpp

@@ -181 +181 @@
  * when a menu item created with a %WEBKIT_CONTEXT_MENU_ACTION_STOP is
  * activated the action associated will be handled by WebKit and the current
- * load operation will be stopped. You can get the #GtkAction of a
+ * load operation will be stopped. You can get the #GAction of a
  * #WebKitContextMenuItem created with a #WebKitContextMenuAction with
- * webkit_context_menu_item_get_action() and connect to #GtkAction::activate signal
- * to be notified when the item is activated. But you can't prevent the associated
+ * webkit_context_menu_item_get_gaction() and connect to the #GSimpleAction::activate signal
+ * to be notified when the item is activated, but you can't prevent the associated
  * action from being performed.
  *

trunk/Source/WebKit/Shared/glib/WebContextMenuItemGlib.cpp

@@ -79 +79 @@
 
 #if PLATFORM(GTK)
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
 WebContextMenuItemGlib::WebContextMenuItemGlib(GtkAction* action)
     : WebContextMenuItemData(GTK_IS_TOGGLE_ACTION(action) ? CheckableActionType : ActionType, ContextMenuItemBaseApplicationTag, String::fromUTF8(gtk_action_get_label(action)), gtk_action_get_sensitive(action), GTK_IS_TOGGLE_ACTION(action) ? gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)) : false)
@@ -86 +87 @@
     g_object_set_data_full(G_OBJECT(m_gAction.get()), "webkit-gtk-action", g_object_ref(m_gtkAction), g_object_unref);
 }
+ALLOW_DEPRECATED_DECLARATIONS_END
 #endif
 
@@ -95 +97 @@
 {
 #if PLATFORM(GTK)
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     if (m_gtkAction)
         return GUniquePtr<char>(g_strdup(gtk_action_get_name(m_gtkAction)));
+ALLOW_DEPRECATED_DECLARATIONS_END
 #endif
 
@@ -118 +122 @@
 
 #if PLATFORM(GTK)
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     // Create the GtkAction for backwards compatibility only.
     if (!m_gtkAction) {
@@ -130 +135 @@
 
     g_signal_connect_object(m_gAction.get(), "activate", G_CALLBACK(gtk_action_activate), m_gtkAction, G_CONNECT_SWAPPED);
+ALLOW_DEPRECATED_DECLARATIONS_END
 #endif
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-09  Claudio Saavedra  <csaavedra@igalia.com>
+
+        [GTK] Clean-up use of deprecated GtkAction
+        https://bugs.webkit.org/show_bug.cgi?id=210273
+
+        Reviewed by Carlos Garcia Campos.
+
+        GtkAction is deprecated so remove usage of it in the
+        context menu API tests and guard its API usage when
+        we still need to use it to test the deprecated WebKitGTK+ API
+        exposing GtkAction.
+
+        * TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp:
+        (testContextMenuPopulateMenu):
+
 2020-04-09  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp

@@ -113 +113 @@
     }
 
-    void checkActionState(GtkAction* action, unsigned state)
-    {
-        if (state & Visible)
-            g_assert_true(gtk_action_get_visible(action));
+    void checkActionState(GAction* action, unsigned state)
+    {
+        if (state & Enabled)
+            g_assert_true(g_action_get_enabled(action));
         else
-            g_assert_false(gtk_action_get_visible(action));
-
-        if (state & Enabled)
-            g_assert_true(gtk_action_get_sensitive(action));
-        else
-            g_assert_false(gtk_action_get_sensitive(action));
-
-        if (GTK_IS_TOGGLE_ACTION(action)) {
+            g_assert_false(g_action_get_enabled(action));
+
+        const GVariantType* type = g_action_get_state_type(action);
+        if (type && g_variant_type_equal(type, G_VARIANT_TYPE_BOOLEAN)) {
+            GRefPtr<GVariant> actionState = adoptGRef(g_action_get_state(action));
             if (state & Checked)
-                g_assert_true(gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)));
+                g_assert_true(g_variant_get_boolean(actionState.get()));
             else
-                g_assert_false(gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)));
+                g_assert_false(g_variant_get_boolean(actionState.get()));
         }
     }
@@ -151 +148 @@
         g_assert_cmpint(webkit_context_menu_item_get_stock_action(item), ==, stockAction);
 
-        checkActionState(action, state);
+        checkActionState(gAction, state);
 
         return g_list_next(items);
@@ -167 +164 @@
         GtkAction* action = webkit_context_menu_item_get_action(item);
         g_assert_true(GTK_IS_ACTION(action));
-        G_GNUC_END_IGNORE_DEPRECATIONS;
 
         GAction* gAction = webkit_context_menu_item_get_gaction(item);
@@ -182 +178 @@
         g_assert_cmpint(webkit_context_menu_item_get_stock_action(item), ==, WEBKIT_CONTEXT_MENU_ACTION_CUSTOM);
         g_assert_cmpstr(gtk_action_get_label(action), ==, label);
-
-        checkActionState(action, state);
+        G_GNUC_END_IGNORE_DEPRECATIONS;
+
+        checkActionState(gAction, state);
 
         return g_list_next(items);
@@ -205 +202 @@
         g_assert_true(G_IS_ACTION(gAction));
 
-        checkActionState(action, state);
+        checkActionState(gAction, state);
 
         WebKitContextMenu* subMenu = webkit_context_menu_item_get_submenu(item);
@@ -656 +653 @@
     test->waitUntilLoadFinished();
 
+    G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
     // Create a custom menu item.
     GRefPtr<GtkAction> action = adoptGRef(gtk_action_new("WebKitGTKCustomAction", "Custom _Action", nullptr, nullptr));
@@ -671 +669 @@
     g_assert_false(test->m_activated);
     g_assert_true(test->m_toggled);
+    G_GNUC_END_IGNORE_DEPRECATIONS;
 
     // Create a custom menu item using GAction.