Title: [294920] trunk
- Revision
- 294920
- Author
- lmo...@igalia.com
- Date
- 2022-05-26 18:40:53 -0700 (Thu, 26 May 2022)
Log Message
[GTK] Deprecate WebKitSettings:enable-java
https://bugs.webkit.org/show_bug.cgi?id=239538
Reviewed by Adrian Perez de Castro and Michael Catanzaro.
250264@main removed the WKPreference entry regarding Java support, which in turn
was dropped long time ago.
* Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:
(webKitSettingsSetProperty): Do not call deprecated function.
(webKitSettingsGetProperty): Ditto.
(webkit_settings_class_init): Ditto.
(webkit_settings_get_enable_java): Add deprecation warnings.
(webkit_settings_set_enable_java): Add deprecation warnings.
* Source/WebKit/UIProcess/API/gtk/WebKitSettings.h: Mark functions as
deprecated.
* Source/WebKit/UIProcess/API/wpe/WebKitSettings.h: Ditto.
* Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:
(testWebKitSettings): Update for new behavior and remove fatal warning
flag for enable-java block as the warnings are expected.
Canonical link: https://commits.webkit.org/251036@main
Modified Paths
Diff
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp (294919 => 294920)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2022-05-27 00:58:34 UTC (rev 294919)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2022-05-27 01:40:53 UTC (rev 294920)
@@ -236,7 +236,6 @@
case PROP_ENABLE_PLUGINS:
break;
case PROP_ENABLE_JAVA:
- webkit_settings_set_enable_java(settings, g_value_get_boolean(value));
break;
case PROP_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY:
webkit_settings_set_javascript_can_open_windows_automatically(settings, g_value_get_boolean(value));
@@ -439,7 +438,7 @@
g_value_set_boolean(value, FALSE);
break;
case PROP_ENABLE_JAVA:
- g_value_set_boolean(value, webkit_settings_get_enable_java(settings));
+ g_value_set_boolean(value, FALSE);
break;
case PROP_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY:
g_value_set_boolean(value, webkit_settings_get_javascript_can_open_windows_automatically(settings));
@@ -752,6 +751,8 @@
* WebKitSettings:enable-java:
*
* Determines whether or not Java is enabled on the page.
+ *
+ * Deprecated: 2.38
*/
sObjProperties[PROP_ENABLE_JAVA] =
g_param_spec_boolean(
@@ -758,7 +759,7 @@
"enable-java",
_("Enable Java"),
_("Whether Java support should be enabled."),
- TRUE,
+ FALSE,
readWriteConstructParamFlags);
/**
@@ -1917,11 +1918,15 @@
* Get the #WebKitSettings:enable-java property.
*
* Returns: %FALSE always.
+ *
+ * Deprecated: 2.38. This function always returns %FALSE.
*/
gboolean webkit_settings_get_enable_java(WebKitSettings* settings)
{
g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
+ g_warning("webkit_settings_get_enable_java is deprecated and always returns FALSE. Java is no longer supported.");
+
return FALSE;
}
@@ -1931,10 +1936,15 @@
* @enabled: Value to be set
*
* Set the #WebKitSettings:enable-java property. Deprecated function that does nothing.
+ *
+ * Deprecated: 2.38. This function does nothing.
*/
-void webkit_settings_set_enable_java(WebKitSettings* settings, gboolean)
+void webkit_settings_set_enable_java(WebKitSettings* settings, gboolean enabled)
{
g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+ if (enabled)
+ g_warning("webkit_settings_set_enable_java is deprecated and does nothing. Java is no longer supported.");
}
/**
Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitSettings.h (294919 => 294920)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitSettings.h 2022-05-27 00:58:34 UTC (rev 294919)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitSettings.h 2022-05-27 01:40:53 UTC (rev 294920)
@@ -156,10 +156,10 @@
webkit_settings_set_enable_plugins (WebKitSettings *settings,
gboolean enabled);
-WEBKIT_API gboolean
+WEBKIT_DEPRECATED gboolean
webkit_settings_get_enable_java (WebKitSettings *settings);
-WEBKIT_API void
+WEBKIT_DEPRECATED void
webkit_settings_set_enable_java (WebKitSettings *settings,
gboolean enabled);
Modified: trunk/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h (294919 => 294920)
--- trunk/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h 2022-05-27 00:58:34 UTC (rev 294919)
+++ trunk/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h 2022-05-27 01:40:53 UTC (rev 294920)
@@ -140,10 +140,10 @@
webkit_settings_set_enable_plugins (WebKitSettings *settings,
gboolean enabled);
-WEBKIT_API gboolean
+WEBKIT_DEPRECATED gboolean
webkit_settings_get_enable_java (WebKitSettings *settings);
-WEBKIT_API void
+WEBKIT_DEPRECATED void
webkit_settings_set_enable_java (WebKitSettings *settings,
gboolean enabled);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp (294919 => 294920)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp 2022-05-27 00:58:34 UTC (rev 294919)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp 2022-05-27 01:40:53 UTC (rev 294920)
@@ -77,10 +77,13 @@
webkit_settings_set_enable_frame_flattening(settings, TRUE);
g_assert_true(webkit_settings_get_enable_frame_flattening(settings));
- // Java is enabled by default.
- g_assert_true(webkit_settings_get_enable_java(settings));
+ // Java is not supported, and always disabled.
+ // Make warnings non-fatal for this test to make it pass.
+ Test::removeLogFatalFlag(G_LOG_LEVEL_WARNING);
+ g_assert_false(webkit_settings_get_enable_java(settings));
webkit_settings_set_enable_java(settings, FALSE);
g_assert_false(webkit_settings_get_enable_java(settings));
+ Test::addLogFatalFlag(G_LOG_LEVEL_WARNING);
// By default, _javascript_ can open windows automatically is disabled.
g_assert_false(webkit_settings_get_javascript_can_open_windows_automatically(settings));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
