Changeset 73936 in webkit

Timestamp:

Dec 13, 2010 11:29:25 AM (13 years ago)

Author:

xan@webkit.org

Message:

2010-12-13 Xan Lopez <​xlopez@igalia.com>

Reviewed by Martin Robinson.

[GTK] Add API to enable/disable plugins at runtime
​https://bugs.webkit.org/show_bug.cgi?id=50891

• tests/testwebplugindatabase.c: (test_webkit_web_plugin_database_get_plugins): test that disabling a plugin works.
• webkit/webkitwebplugin.cpp: (webkit_web_plugin_get_property): hook 'enabled' property. (webkit_web_plugin_set_property): ditto. (webkit_web_plugin_class_init): define 'enabled' property. (webkit_web_plugin_set_enabled): setter for the property. (webkit_web_plugin_get_enabled): getter for the property.
• webkit/webkitwebplugin.h: add the APIs to the header.

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• tests/testwebplugindatabase.c (modified) (2 diffs)
• webkit/webkitwebplugin.cpp (modified) (4 diffs)
• webkit/webkitwebplugin.h (modified) (1 diff)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-12-13  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Add API to enable/disable plugins at runtime
+        https://bugs.webkit.org/show_bug.cgi?id=50891
+
+        * tests/testwebplugindatabase.c:
+        (test_webkit_web_plugin_database_get_plugins): test that disabling
+        a plugin works.
+        * webkit/webkitwebplugin.cpp:
+        (webkit_web_plugin_get_property): hook 'enabled' property.
+        (webkit_web_plugin_set_property): ditto.
+        (webkit_web_plugin_class_init): define 'enabled' property.
+        (webkit_web_plugin_set_enabled): setter for the property.
+        (webkit_web_plugin_get_enabled): getter for the property.
+        * webkit/webkitwebplugin.h: add the APIs to the header.
+
 2010-12-13  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/WebKit/gtk/tests/testwebplugindatabase.c

@@ -35 +35 @@
     GSList* pluginList, *p;
     gboolean found = FALSE;
+    gboolean enabled = FALSE;
 
     webkit_web_settings_add_extra_plugin_directory(view, TEST_PLUGIN_DIR);
@@ -44 +45 @@
         WebKitWebPlugin* plugin = (WebKitWebPlugin*)p->data;
         if (!g_strcmp0(webkit_web_plugin_get_name(plugin), "WebKit Test PlugIn") &&
-            !g_strcmp0(webkit_web_plugin_get_description(plugin), "Simple Netscape plug-in that handles test content for WebKit"))
+            !g_strcmp0(webkit_web_plugin_get_description(plugin), "Simple Netscape plug-in that handles test content for WebKit")) {
             found = TRUE;
+            enabled = webkit_web_plugin_get_enabled(plugin);
+            webkit_web_plugin_set_enabled(plugin, FALSE);
+        }
     }
     webkit_web_plugin_database_plugins_list_free(pluginList);
     g_assert(found);
+    g_assert(enabled);
+
+    webkit_web_plugin_database_refresh(database);
+    pluginList = webkit_web_plugin_database_get_plugins(database);
+
+    for (p = pluginList; p; p = p->next) {
+        WebKitWebPlugin* plugin = (WebKitWebPlugin*)p->data;
+        if (!g_strcmp0(webkit_web_plugin_get_name(plugin), "WebKit Test PlugIn") &&
+            !g_strcmp0(webkit_web_plugin_get_description(plugin), "Simple Netscape plug-in that handles test content for WebKit"))
+            enabled = webkit_web_plugin_get_enabled(plugin);
+    }
+    webkit_web_plugin_database_plugins_list_free(pluginList);
+    g_assert(!enabled);
 
     g_object_unref(view);

trunk/WebKit/gtk/webkit/webkitwebplugin.cpp

@@ -23 +23 @@
 #include "webkitprivate.h"
 #include "webkitwebpluginprivate.h"
+#include <glib/gi18n-lib.h>
 
 using namespace WebCore;
+
+enum {
+    PROP_0,
+
+    PROP_ENABLED
+};
 
 G_DEFINE_TYPE(WebKitWebPlugin, webkit_web_plugin, G_TYPE_OBJECT)
@@ -58 +65 @@
 }
 
+static void webkit_web_plugin_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* paramSpec)
+{
+    WebKitWebPlugin* plugin = WEBKIT_WEB_PLUGIN(object);
+
+    switch (prop_id) {
+    case PROP_ENABLED:
+        g_value_set_boolean(value, webkit_web_plugin_get_enabled(plugin));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, paramSpec);
+    }
+}
+
+static void webkit_web_plugin_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* paramSpec)
+{
+    WebKitWebPlugin* plugin = WEBKIT_WEB_PLUGIN(object);
+
+    switch (prop_id) {
+    case PROP_ENABLED:
+        webkit_web_plugin_set_enabled(plugin, g_value_get_boolean(value));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, paramSpec);
+    }
+}
+
 static void webkit_web_plugin_class_init(WebKitWebPluginClass* klass)
 {
@@ -65 +98 @@
 
     gobjectClass->finalize = webkit_web_plugin_finalize;
+    gobjectClass->get_property = webkit_web_plugin_get_property;
+    gobjectClass->set_property = webkit_web_plugin_set_property;
+
+    g_object_class_install_property(gobjectClass,
+                                    PROP_ENABLED,
+                                    g_param_spec_boolean("enabled",
+                                                         _("Enabled"),
+                                                         _("Whether the plugin is enabled"),
+                                                         FALSE,
+                                                         WEBKIT_PARAM_READWRITE));
 
     g_type_class_add_private(klass, sizeof(WebKitWebPluginPrivate));
@@ -164 +207 @@
     return priv->mimeTypes;
 }
+
+/**
+ * webkit_web_plugin_set_enabled:
+ * @plugin: a #WebKitWebPlugin
+ * @enabled: whether to enable the plugin
+ *
+ * Sets the enabled status of the @plugin.
+ *
+ * Since: 1.3.8
+ */
+void webkit_web_plugin_set_enabled(WebKitWebPlugin* plugin, gboolean enabled)
+{
+    g_return_if_fail(WEBKIT_IS_WEB_PLUGIN(plugin));
+    WebKitWebPluginPrivate* priv = plugin->priv;
+
+    ASSERT(priv->corePlugin);
+    if (priv->corePlugin->isEnabled() == enabled)
+        return;
+
+    priv->corePlugin->setEnabled(enabled);
+
+    g_object_notify(G_OBJECT(plugin), "enabled");
+}
+
+/**
+ * webkit_web_plugin_get_enabled:
+ * @plugin: a #WebKitWebPlugin
+ *
+ * Returns: %TRUE if the plugin is enabled, %FALSE otherwise
+ *
+ * Since: 1.3.8
+ */
+gboolean webkit_web_plugin_get_enabled(WebKitWebPlugin* plugin)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_PLUGIN(plugin), FALSE);
+
+    ASSERT(plugin->priv->corePlugin);
+    return plugin->priv->corePlugin->isEnabled();
+}

trunk/WebKit/gtk/webkit/webkitwebplugin.h

@@ -80 +80 @@
 webkit_web_plugin_get_mimetypes   (WebKitWebPlugin*);
 
+WEBKIT_API void
+webkit_web_plugin_set_enabled     (WebKitWebPlugin*, gboolean);
+
+WEBKIT_API gboolean
+webkit_web_plugin_get_enabled     (WebKitWebPlugin*);
+
 G_END_DECLS