[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
xan at webkit.org
xan at webkit.org
Fri Feb 26 22:22:42 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit f9c892d2274807fec6b3210d88fbf9d12473319f
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 17 13:41:47 2010 +0000
2010-02-17 Xan Lopez <xlopez at igalia.com>
Reviewed by Gustavo Noronha.
[Linux] Webkit incompatible with Java plugins
https://bugs.webkit.org/show_bug.cgi?id=24912
Add a WebKitWebSetting to enable/disable the Java plugin support.
* webkit/webkitwebsettings.cpp:
(webkit_web_settings_class_init):
(webkit_web_settings_set_property):
(webkit_web_settings_get_property):
(webkit_web_settings_copy):
* webkit/webkitwebview.cpp:
(webkit_web_view_update_settings):
(webkit_web_view_settings_notify):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54886 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 270c987..ca00076 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,21 @@
+2010-02-17 Xan Lopez <xlopez at igalia.com>
+
+ Reviewed by Gustavo Noronha.
+
+ [Linux] Webkit incompatible with Java plugins
+ https://bugs.webkit.org/show_bug.cgi?id=24912
+
+ Add a WebKitWebSetting to enable/disable the Java plugin support.
+
+ * webkit/webkitwebsettings.cpp:
+ (webkit_web_settings_class_init):
+ (webkit_web_settings_set_property):
+ (webkit_web_settings_get_property):
+ (webkit_web_settings_copy):
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_update_settings):
+ (webkit_web_view_settings_notify):
+
2010-02-17 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp
index ff13252..b288d55 100644
--- a/WebKit/gtk/webkit/webkitwebsettings.cpp
+++ b/WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -105,6 +105,7 @@ struct _WebKitWebSettingsPrivate {
gboolean enable_site_specific_quirks;
gboolean enable_page_cache;
gboolean auto_resize_window;
+ gboolean enable_java;
};
#define WEBKIT_WEB_SETTINGS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_SETTINGS, WebKitWebSettingsPrivate))
@@ -151,7 +152,8 @@ enum {
PROP_ENABLE_DEFAULT_CONTEXT_MENU,
PROP_ENABLE_SITE_SPECIFIC_QUIRKS,
PROP_ENABLE_PAGE_CACHE,
- PROP_AUTO_RESIZE_WINDOW
+ PROP_AUTO_RESIZE_WINDOW,
+ PROP_ENABLE_JAVA
};
// Create a default user agent string
@@ -800,6 +802,20 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass)
FALSE,
flags));
+ /**
+ * WebKitWebSettings:enable-java:
+ *
+ * Enable or disable support for Java plugins.
+ *
+ * Since: 1.1.22
+ */
+ g_object_class_install_property(gobject_class,
+ PROP_ENABLE_JAVA,
+ g_param_spec_boolean("enable-java",
+ _("Enable Java"),
+ _("Whether Java plugin support should be enabled"),
+ TRUE,
+ flags));
g_type_class_add_private(klass, sizeof(WebKitWebSettingsPrivate));
}
@@ -1015,6 +1031,9 @@ static void webkit_web_settings_set_property(GObject* object, guint prop_id, con
case PROP_AUTO_RESIZE_WINDOW:
priv->auto_resize_window = g_value_get_boolean(value);
break;
+ case PROP_ENABLE_JAVA:
+ priv->enable_java = g_value_get_boolean(value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@@ -1147,6 +1166,9 @@ static void webkit_web_settings_get_property(GObject* object, guint prop_id, GVa
case PROP_AUTO_RESIZE_WINDOW:
g_value_set_boolean(value, priv->auto_resize_window);
break;
+ case PROP_ENABLE_JAVA:
+ g_value_set_boolean(value, priv->enable_java);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@@ -1218,6 +1240,7 @@ WebKitWebSettings* webkit_web_settings_copy(WebKitWebSettings* web_settings)
"enable-site-specific-quirks", priv->enable_site_specific_quirks,
"enable-page-cache", priv->enable_page_cache,
"auto-resize-window", priv->auto_resize_window,
+ "enable-java", priv->enable_java,
NULL));
return copy;
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index d5167ad..5057c3d 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -2552,7 +2552,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
enableXSSAuditor, javascriptCanOpenWindows, enableOfflineWebAppCache,
enableUniversalAccessFromFileURI, enableFileAccessFromFileURI,
enableDOMPaste, tabKeyCyclesThroughElements,
- enableSiteSpecificQuirks, usePageCache;
+ enableSiteSpecificQuirks, usePageCache, enableJava;
WebKitEditingBehavior editingBehavior;
@@ -2586,6 +2586,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
"tab-key-cycles-through-elements", &tabKeyCyclesThroughElements,
"enable-site-specific-quirks", &enableSiteSpecificQuirks,
"enable-page-cache", &usePageCache,
+ "enable-java", &enableJava,
NULL);
settings->setDefaultTextEncodingName(defaultEncoding);
@@ -2616,6 +2617,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
settings->setDOMPasteAllowed(enableDOMPaste);
settings->setNeedsSiteSpecificQuirks(enableSiteSpecificQuirks);
settings->setUsesPageCache(usePageCache);
+ settings->setJavaEnabled(enableJava);
Page* page = core(webView);
if (page)
@@ -2718,6 +2720,8 @@ static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GPar
settings->setNeedsSiteSpecificQuirks(g_value_get_boolean(&value));
else if (name == g_intern_string("enable-page-cache"))
settings->setUsesPageCache(g_value_get_boolean(&value));
+ else if (name == g_intern_string("enable-java"))
+ settings->setJavaEnabled(g_value_get_boolean(&value));
else if (!g_object_class_find_property(G_OBJECT_GET_CLASS(webSettings), name))
g_warning("Unexpected setting '%s'", name);
g_value_unset(&value);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list