Changeset 54886 in webkit
- Timestamp:
- Feb 17, 2010 5:41:47 AM (14 years ago)
- Location:
- trunk/WebKit/gtk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/gtk/ChangeLog
r54885 r54886 1 2010-02-17 Xan Lopez <xlopez@igalia.com> 2 3 Reviewed by Gustavo Noronha. 4 5 [Linux] Webkit incompatible with Java plugins 6 https://bugs.webkit.org/show_bug.cgi?id=24912 7 8 Add a WebKitWebSetting to enable/disable the Java plugin support. 9 10 * webkit/webkitwebsettings.cpp: 11 (webkit_web_settings_class_init): 12 (webkit_web_settings_set_property): 13 (webkit_web_settings_get_property): 14 (webkit_web_settings_copy): 15 * webkit/webkitwebview.cpp: 16 (webkit_web_view_update_settings): 17 (webkit_web_view_settings_notify): 18 1 19 2010-02-17 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> 2 20 -
trunk/WebKit/gtk/webkit/webkitwebsettings.cpp
r54882 r54886 106 106 gboolean enable_page_cache; 107 107 gboolean auto_resize_window; 108 gboolean enable_java; 108 109 }; 109 110 … … 152 153 PROP_ENABLE_SITE_SPECIFIC_QUIRKS, 153 154 PROP_ENABLE_PAGE_CACHE, 154 PROP_AUTO_RESIZE_WINDOW 155 PROP_AUTO_RESIZE_WINDOW, 156 PROP_ENABLE_JAVA 155 157 }; 156 158 … … 801 803 flags)); 802 804 805 /** 806 * WebKitWebSettings:enable-java: 807 * 808 * Enable or disable support for Java plugins. 809 * 810 * Since: 1.1.22 811 */ 812 g_object_class_install_property(gobject_class, 813 PROP_ENABLE_JAVA, 814 g_param_spec_boolean("enable-java", 815 _("Enable Java"), 816 _("Whether Java plugin support should be enabled"), 817 TRUE, 818 flags)); 803 819 804 820 g_type_class_add_private(klass, sizeof(WebKitWebSettingsPrivate)); … … 1016 1032 priv->auto_resize_window = g_value_get_boolean(value); 1017 1033 break; 1034 case PROP_ENABLE_JAVA: 1035 priv->enable_java = g_value_get_boolean(value); 1036 break; 1018 1037 default: 1019 1038 G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); … … 1147 1166 case PROP_AUTO_RESIZE_WINDOW: 1148 1167 g_value_set_boolean(value, priv->auto_resize_window); 1168 break; 1169 case PROP_ENABLE_JAVA: 1170 g_value_set_boolean(value, priv->enable_java); 1149 1171 break; 1150 1172 default: … … 1219 1241 "enable-page-cache", priv->enable_page_cache, 1220 1242 "auto-resize-window", priv->auto_resize_window, 1243 "enable-java", priv->enable_java, 1221 1244 NULL)); 1222 1245 -
trunk/WebKit/gtk/webkit/webkitwebview.cpp
r54873 r54886 2553 2553 enableUniversalAccessFromFileURI, enableFileAccessFromFileURI, 2554 2554 enableDOMPaste, tabKeyCyclesThroughElements, 2555 enableSiteSpecificQuirks, usePageCache ;2555 enableSiteSpecificQuirks, usePageCache, enableJava; 2556 2556 2557 2557 WebKitEditingBehavior editingBehavior; … … 2587 2587 "enable-site-specific-quirks", &enableSiteSpecificQuirks, 2588 2588 "enable-page-cache", &usePageCache, 2589 "enable-java", &enableJava, 2589 2590 NULL); 2590 2591 … … 2617 2618 settings->setNeedsSiteSpecificQuirks(enableSiteSpecificQuirks); 2618 2619 settings->setUsesPageCache(usePageCache); 2620 settings->setJavaEnabled(enableJava); 2619 2621 2620 2622 Page* page = core(webView); … … 2719 2721 else if (name == g_intern_string("enable-page-cache")) 2720 2722 settings->setUsesPageCache(g_value_get_boolean(&value)); 2723 else if (name == g_intern_string("enable-java")) 2724 settings->setJavaEnabled(g_value_get_boolean(&value)); 2721 2725 else if (!g_object_class_find_property(G_OBJECT_GET_CLASS(webSettings), name)) 2722 2726 g_warning("Unexpected setting '%s'", name);
Note: See TracChangeset
for help on using the changeset viewer.