Title: [251128] trunk
Revision
251128
Author
carlo...@webkit.org
Date
2019-10-15 03:12:11 -0700 (Tue, 15 Oct 2019)

Log Message

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):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (251127 => 251128)


--- trunk/Source/WebKit/ChangeLog	2019-10-15 09:11:39 UTC (rev 251127)
+++ trunk/Source/WebKit/ChangeLog	2019-10-15 10:12:11 UTC (rev 251128)
@@ -1,5 +1,15 @@
 2019-10-15  Carlos Garcia Campos  <cgar...@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  <cgar...@igalia.com>
+
         [GTK][WPE] WebKitWebContext should identify web views by their WebPageProxy identifier
         https://bugs.webkit.org/show_bug.cgi?id=202924
 

Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp (251127 => 251128)


--- trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp	2019-10-15 09:11:39 UTC (rev 251127)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp	2019-10-15 10:12:11 UTC (rev 251128)
@@ -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
 

Modified: trunk/Tools/ChangeLog (251127 => 251128)


--- trunk/Tools/ChangeLog	2019-10-15 09:11:39 UTC (rev 251127)
+++ trunk/Tools/ChangeLog	2019-10-15 10:12:11 UTC (rev 251128)
@@ -1,3 +1,12 @@
+2019-10-15  Carlos Garcia Campos  <cgar...@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  <ab...@igalia.com>
 
         gdb webkit.py: Fix iterator error in Python3

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp (251127 => 251128)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp	2019-10-15 09:11:39 UTC (rev 251127)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp	2019-10-15 10:12:11 UTC (rev 251128)
@@ -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));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to