Unreviewed. Fix GTK test /webkit/WebKitSettings/webkit-settings after r249962.
Source/WebKit:
Legacy private browsing was removed in r249962, so webkit_settings_set_enable_private_browsing() is now no-op.
* UIProcess/API/glib/WebKitSettings.cpp:
(webKitSettingsSetProperty): Only call webkit_settings_set_enable_private_browsing() when trying to enable it.
(webkit_settings_set_enable_private_browsing): Show a warning to let users know that it does nothing now.
Tools:
Stop testing WebKitSettings:enable-private-browsing.
* TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:
(testWebKitSettings):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@251128 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 3b8156c..ca6230b 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,5 +1,15 @@
2019-10-15 Carlos Garcia Campos <cgarcia@igalia.com>
+ Unreviewed. Fix GTK test /webkit/WebKitSettings/webkit-settings after r249962.
+
+ Legacy private browsing was removed in r249962, so webkit_settings_set_enable_private_browsing() is now no-op.
+
+ * UIProcess/API/glib/WebKitSettings.cpp:
+ (webKitSettingsSetProperty): Only call webkit_settings_set_enable_private_browsing() when trying to enable it.
+ (webkit_settings_set_enable_private_browsing): Show a warning to let users know that it does nothing now.
+
+2019-10-15 Carlos Garcia Campos <cgarcia@igalia.com>
+
[GTK][WPE] WebKitWebContext should identify web views by their WebPageProxy identifier
https://bugs.webkit.org/show_bug.cgi?id=202924
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
index f25bc8e..ae278c7 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
@@ -284,7 +284,8 @@
#if PLATFORM(GTK)
case PROP_ENABLE_PRIVATE_BROWSING:
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
- webkit_settings_set_enable_private_browsing(settings, g_value_get_boolean(value));
+ if (g_value_get_boolean(value))
+ webkit_settings_set_enable_private_browsing(settings, TRUE);
G_GNUC_END_IGNORE_DEPRECATIONS;
break;
#endif
@@ -2403,6 +2404,8 @@
void webkit_settings_set_enable_private_browsing(WebKitSettings* settings, gboolean enabled)
{
g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+ g_warning("webkit_settings_set_enable_private_browsing is deprecated and does nothing, use #WebKitWebView:is-ephemeral or #WebKitWebContext:is-ephemeral instead");
}
#endif
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 8da23ad..b201a6c 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-15 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Unreviewed. Fix GTK test /webkit/WebKitSettings/webkit-settings after r249962.
+
+ Stop testing WebKitSettings:enable-private-browsing.
+
+ * TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:
+ (testWebKitSettings):
+
2019-10-15 Alicia Boya García <aboya@igalia.com>
gdb webkit.py: Fix iterator error in Python3
diff --git a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp
index 84f9095..3a40c29 100644
--- a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp
+++ b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp
@@ -200,14 +200,6 @@
webkit_settings_set_default_charset(settings, "utf8");
g_assert_cmpstr(webkit_settings_get_default_charset(settings), ==, "utf8");
-#if PLATFORM(GTK)
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
- g_assert_false(webkit_settings_get_enable_private_browsing(settings));
- webkit_settings_set_enable_private_browsing(settings, TRUE);
- g_assert_true(webkit_settings_get_enable_private_browsing(settings));
- G_GNUC_END_IGNORE_DEPRECATIONS;
-#endif
-
g_assert_false(webkit_settings_get_enable_developer_extras(settings));
webkit_settings_set_enable_developer_extras(settings, TRUE);
g_assert_true(webkit_settings_get_enable_developer_extras(settings));
