Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-05-09 23:59:20 UTC (rev 231617)
@@ -1,3 +1,33 @@
+2018-04-25 Michael Catanzaro <[email protected]>
+
+ [WPE] Remove deprecated functions and properties from the API
+ https://bugs.webkit.org/show_bug.cgi?id=179295
+
+ Reviewed by Žan Doberšek.
+
+ * UIProcess/API/glib/WebKitCookieManager.cpp:
+ * UIProcess/API/glib/WebKitFormSubmissionRequest.cpp:
+ * UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp:
+ (webkitNavigationPolicyDecisionGetProperty):
+ (webkit_navigation_policy_decision_class_init):
+ * UIProcess/API/glib/WebKitSettings.cpp:
+ (webKitSettingsSetProperty):
+ (webKitSettingsGetProperty):
+ (webkit_settings_class_init):
+ * UIProcess/API/glib/WebKitWebContext.cpp:
+ (webkitWebContextGetProperty):
+ (webkitWebContextSetProperty):
+ (webkit_web_context_class_init):
+ * UIProcess/API/glib/WebKitWebView.cpp:
+ (webkit_web_view_class_init):
+ (webkitWebViewHandleAuthenticationChallenge):
+ (webkitWebViewWebProcessTerminated):
+ * UIProcess/API/wpe/WebKitCookieManager.h:
+ * UIProcess/API/wpe/WebKitFormSubmissionRequest.h:
+ * UIProcess/API/wpe/WebKitNavigationPolicyDecision.h:
+ * UIProcess/API/wpe/WebKitSettings.h:
+ * UIProcess/API/wpe/WebKitWebContext.h:
+
2018-04-15 Michael Catanzaro <[email protected]>
[WPE] Install files needed for WebKitWebExtensions
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp 2018-05-09 23:59:20 UTC (rev 231617)
@@ -420,6 +420,7 @@
return g_task_propagate_boolean(G_TASK(result), error);
}
+#if PLATFORM(GTK)
/**
* webkit_cookie_manager_get_domains_with_cookies:
* @cookie_manager: a #WebKitCookieManager
@@ -518,3 +519,4 @@
webkit_website_data_manager_clear(manager->priv->dataManager, WEBKIT_WEBSITE_DATA_COOKIES, 0, nullptr, nullptr, nullptr);
}
+#endif
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitFormSubmissionRequest.cpp (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitFormSubmissionRequest.cpp 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitFormSubmissionRequest.cpp 2018-05-09 23:59:20 UTC (rev 231617)
@@ -86,6 +86,7 @@
return request;
}
+#if PLATFORM(GTK)
/**
* webkit_form_submission_request_get_text_fields:
* @request: a #WebKitFormSubmissionRequest
@@ -115,6 +116,7 @@
return request->priv->values.get();
}
+#endif
/**
* webkit_form_submission_request_list_text_fields:
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp 2018-05-09 23:59:20 UTC (rev 231617)
@@ -59,10 +59,12 @@
enum {
PROP_0,
PROP_NAVIGATION_ACTION,
+#if PLATFORM(GTK)
PROP_NAVIGATION_TYPE,
PROP_MOUSE_BUTTON,
PROP_MODIFIERS,
PROP_REQUEST,
+#endif
PROP_FRAME_NAME,
};
@@ -73,6 +75,7 @@
case PROP_NAVIGATION_ACTION:
g_value_set_boxed(value, webkit_navigation_policy_decision_get_navigation_action(decision));
break;
+#if PLATFORM(GTK)
case PROP_NAVIGATION_TYPE:
g_value_set_enum(value, webkit_navigation_action_get_navigation_type(decision->priv->navigationAction));
break;
@@ -85,6 +88,7 @@
case PROP_REQUEST:
g_value_set_object(value, webkit_navigation_action_get_request(decision->priv->navigationAction));
break;
+#endif
case PROP_FRAME_NAME:
g_value_set_string(value, webkit_navigation_policy_decision_get_frame_name(decision));
break;
@@ -116,6 +120,7 @@
WEBKIT_TYPE_NAVIGATION_ACTION,
WEBKIT_PARAM_READABLE));
+#if PLATFORM(GTK)
/**
* WebKitNavigationPolicyDecision:navigation-type:
*
@@ -187,6 +192,7 @@
_("The URI request that is associated with this navigation"),
WEBKIT_TYPE_URI_REQUEST,
WEBKIT_PARAM_READABLE));
+#endif
/**
* WebKitNavigationPolicyDecision:frame-name:
@@ -221,6 +227,7 @@
return decision->priv->navigationAction;
}
+#if PLATFORM(GTK)
/**
* webkit_navigation_policy_decision_get_navigation_type:
* @decision: a #WebKitNavigationPolicyDecision
@@ -284,6 +291,7 @@
g_return_val_if_fail(WEBKIT_IS_NAVIGATION_POLICY_DECISION(decision), nullptr);
return webkit_navigation_action_get_request(decision->priv->navigationAction);
}
+#endif
/**
* webkit_navigation_policy_decision_get_frame_name:
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2018-05-09 23:59:20 UTC (rev 231617)
@@ -127,7 +127,9 @@
PROP_DEFAULT_MONOSPACE_FONT_SIZE,
PROP_MINIMUM_FONT_SIZE,
PROP_DEFAULT_CHARSET,
+#if PLATFORM(GTK)
PROP_ENABLE_PRIVATE_BROWSING,
+#endif
PROP_ENABLE_DEVELOPER_EXTRAS,
PROP_ENABLE_RESIZABLE_TEXT_AREAS,
PROP_ENABLE_TABS_TO_LINKS,
@@ -266,11 +268,13 @@
case PROP_DEFAULT_CHARSET:
webkit_settings_set_default_charset(settings, g_value_get_string(value));
break;
+#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));
G_GNUC_END_IGNORE_DEPRECATIONS;
break;
+#endif
case PROP_ENABLE_DEVELOPER_EXTRAS:
webkit_settings_set_enable_developer_extras(settings, g_value_get_boolean(value));
break;
@@ -443,11 +447,13 @@
case PROP_DEFAULT_CHARSET:
g_value_set_string(value, webkit_settings_get_default_charset(settings));
break;
+#if PLATFORM(GTK)
case PROP_ENABLE_PRIVATE_BROWSING:
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
g_value_set_boolean(value, webkit_settings_get_enable_private_browsing(settings));
G_GNUC_END_IGNORE_DEPRECATIONS;
break;
+#endif
case PROP_ENABLE_DEVELOPER_EXTRAS:
g_value_set_boolean(value, webkit_settings_get_enable_developer_extras(settings));
break;
@@ -879,6 +885,7 @@
"iso-8859-1",
readWriteConstructParamFlags));
+#if PLATFORM(GTK)
/**
* WebKitSettings:enable-private-browsing:
*
@@ -894,6 +901,7 @@
_("Whether to enable private browsing"),
FALSE,
readWriteConstructParamFlags));
+#endif
/**
* WebKitSettings:enable-developer-extras:
@@ -2242,6 +2250,7 @@
g_object_notify(G_OBJECT(settings), "default-charset");
}
+#if PLATFORM(GTK)
/**
* webkit_settings_get_enable_private_browsing:
* @settings: a #WebKitSettings
@@ -2280,6 +2289,7 @@
priv->preferences->setPrivateBrowsingEnabled(enabled);
g_object_notify(G_OBJECT(settings), "enable-private-browsing");
}
+#endif
/**
* webkit_settings_get_enable_developer_extras:
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2018-05-09 23:59:20 UTC (rev 231617)
@@ -109,7 +109,9 @@
enum {
PROP_0,
+#if PLATFORM(GTK)
PROP_LOCAL_STORAGE_DIRECTORY,
+#endif
PROP_WEBSITE_DATA_MANAGER
};
@@ -273,9 +275,11 @@
WebKitWebContext* context = WEBKIT_WEB_CONTEXT(object);
switch (propID) {
+#if PLATFORM(GTK)
case PROP_LOCAL_STORAGE_DIRECTORY:
g_value_set_string(value, context->priv->localStorageDirectory.data());
break;
+#endif
case PROP_WEBSITE_DATA_MANAGER:
g_value_set_object(value, webkit_web_context_get_website_data_manager(context));
break;
@@ -289,9 +293,11 @@
WebKitWebContext* context = WEBKIT_WEB_CONTEXT(object);
switch (propID) {
+#if PLATFORM(GTK)
case PROP_LOCAL_STORAGE_DIRECTORY:
context->priv->localStorageDirectory = g_value_get_string(value);
break;
+#endif
case PROP_WEBSITE_DATA_MANAGER: {
gpointer manager = g_value_get_object(value);
context->priv->websiteDataManager = manager ? WEBKIT_WEBSITE_DATA_MANAGER(manager) : nullptr;
@@ -394,6 +400,7 @@
gObjectClass->constructed = webkitWebContextConstructed;
gObjectClass->dispose = webkitWebContextDispose;
+#if PLATFORM(GTK)
/**
* WebKitWebContext:local-storage-directory:
*
@@ -412,6 +419,7 @@
_("The directory where local storage data will be saved"),
nullptr,
static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
+#endif
/**
* WebKitWebContext:website-data-manager:
@@ -1337,6 +1345,7 @@
context->priv->webExtensionsInitializationUserData = userData;
}
+#if PLATFORM(GTK)
/**
* webkit_web_context_set_disk_cache_directory:
* @context: a #WebKitWebContext
@@ -1359,6 +1368,7 @@
context->priv->processPool->configuration().setDiskCacheDirectory(WebCore::FileSystem::pathByAppendingComponent(WebCore::FileSystem::stringFromFileSystemRepresentation(directory), networkCacheSubdirectory));
}
+#endif
/**
* webkit_web_context_prefetch_dns:
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp 2018-05-09 23:59:20 UTC (rev 231617)
@@ -144,7 +144,9 @@
INSECURE_CONTENT_DETECTED,
+#if PLATFORM(GTK)
WEB_PROCESS_CRASHED,
+#endif
WEB_PROCESS_TERMINATED,
AUTHENTICATE,
@@ -1791,6 +1793,7 @@
G_TYPE_NONE, 1,
WEBKIT_TYPE_INSECURE_CONTENT_EVENT);
+#if PLATFORM(GTK)
/**
* WebKitWebView::web-process-crashed:
* @web_view: the #WebKitWebView
@@ -1810,6 +1813,7 @@
g_signal_accumulator_true_handled, nullptr,
g_cclosure_marshal_generic,
G_TYPE_BOOLEAN, 0);
+#endif
/**
* WebKitWebView::web-process-terminated:
@@ -2345,9 +2349,13 @@
void webkitWebViewHandleAuthenticationChallenge(WebKitWebView* webView, AuthenticationChallengeProxy* authenticationChallenge)
{
+#if PLATFORM(GTK)
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gboolean privateBrowsingEnabled = webView->priv->isEphemeral || webkit_settings_get_enable_private_browsing(webView->priv->settings.get());
G_GNUC_END_IGNORE_DEPRECATIONS;
+#else
+ gboolean privateBrowsingEnabled = webView->priv->isEphemeral;
+#endif
webView->priv->authenticationRequest = adoptGRef(webkitAuthenticationRequestCreate(authenticationChallenge, privateBrowsingEnabled));
gboolean returnValue;
g_signal_emit(webView, signals[AUTHENTICATE], 0, webView->priv->authenticationRequest.get(), &returnValue);
@@ -3835,10 +3843,12 @@
void webkitWebViewWebProcessTerminated(WebKitWebView* webView, WebKitWebProcessTerminationReason reason)
{
+#if PLATFORM(GTK)
if (reason == WEBKIT_WEB_PROCESS_CRASHED) {
gboolean returnValue;
g_signal_emit(webView, signals[WEB_PROCESS_CRASHED], 0, &returnValue);
}
+#endif
g_signal_emit(webView, signals[WEB_PROCESS_TERMINATED], 0, reason);
}
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitCookieManager.h (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitCookieManager.h 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitCookieManager.h 2018-05-09 23:59:20 UTC (rev 231617)
@@ -145,24 +145,6 @@
GAsyncResult *result,
GError **error);
-WEBKIT_DEPRECATED_FOR(webkit_website_data_manager_fetch) void
-webkit_cookie_manager_get_domains_with_cookies (WebKitCookieManager *cookie_manager,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-WEBKIT_DEPRECATED_FOR(webkit_website_data_manager_fetch_finish) gchar **
-webkit_cookie_manager_get_domains_with_cookies_finish (WebKitCookieManager *cookie_manager,
- GAsyncResult *result,
- GError **error);
-
-WEBKIT_DEPRECATED_FOR(webkit_website_data_manager_remove) void
-webkit_cookie_manager_delete_cookies_for_domain (WebKitCookieManager *cookie_manager,
- const gchar *domain);
-
-WEBKIT_DEPRECATED_FOR(webkit_website_data_manager_clear) void
-webkit_cookie_manager_delete_all_cookies (WebKitCookieManager *cookie_manager);
-
G_END_DECLS
#endif
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitFormSubmissionRequest.h (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitFormSubmissionRequest.h 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitFormSubmissionRequest.h 2018-05-09 23:59:20 UTC (rev 231617)
@@ -59,9 +59,6 @@
WEBKIT_API GType
webkit_form_submission_request_get_type (void);
-WEBKIT_DEPRECATED_FOR(webkit_form_submission_request_list_text_fields) GHashTable *
-webkit_form_submission_request_get_text_fields (WebKitFormSubmissionRequest *request);
-
WEBKIT_API gboolean
webkit_form_submission_request_list_text_fields (WebKitFormSubmissionRequest *request,
GPtrArray **field_names,
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitNavigationPolicyDecision.h (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitNavigationPolicyDecision.h 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitNavigationPolicyDecision.h 2018-05-09 23:59:20 UTC (rev 231617)
@@ -65,18 +65,6 @@
WEBKIT_API WebKitNavigationAction *
webkit_navigation_policy_decision_get_navigation_action (WebKitNavigationPolicyDecision *decision);
-WEBKIT_DEPRECATED_FOR(webkit_navigation_policy_decision_get_navigation_action) WebKitNavigationType
-webkit_navigation_policy_decision_get_navigation_type (WebKitNavigationPolicyDecision *decision);
-
-WEBKIT_DEPRECATED_FOR(webkit_navigation_policy_decision_get_navigation_action) guint
-webkit_navigation_policy_decision_get_mouse_button (WebKitNavigationPolicyDecision *decision);
-
-WEBKIT_DEPRECATED_FOR(webkit_navigation_policy_decision_get_navigation_action) guint
-webkit_navigation_policy_decision_get_modifiers (WebKitNavigationPolicyDecision *decision);
-
-WEBKIT_DEPRECATED_FOR(webkit_navigation_policy_decision_get_navigation_action) WebKitURIRequest *
-webkit_navigation_policy_decision_get_request (WebKitNavigationPolicyDecision *decision);
-
WEBKIT_API const gchar *
webkit_navigation_policy_decision_get_frame_name (WebKitNavigationPolicyDecision *decision);
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h 2018-05-09 23:59:20 UTC (rev 231617)
@@ -236,13 +236,6 @@
webkit_settings_set_default_charset (WebKitSettings *settings,
const gchar *default_charset);
-WEBKIT_DEPRECATED gboolean
-webkit_settings_get_enable_private_browsing (WebKitSettings *settings);
-
-WEBKIT_DEPRECATED void
-webkit_settings_set_enable_private_browsing (WebKitSettings *settings,
- gboolean enabled);
-
WEBKIT_API gboolean
webkit_settings_get_enable_developer_extras (WebKitSettings *settings);
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitWebContext.h (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitWebContext.h 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitWebContext.h 2018-05-09 23:59:20 UTC (rev 231617)
@@ -284,10 +284,6 @@
webkit_web_context_prefetch_dns (WebKitWebContext *context,
const gchar *hostname);
-WEBKIT_DEPRECATED_FOR(webkit_web_context_new_with_website_data_manager) void
-webkit_web_context_set_disk_cache_directory (WebKitWebContext *context,
- const gchar *directory);
-
WEBKIT_API void
webkit_web_context_allow_tls_certificate_for_host (WebKitWebContext *context,
GTlsCertificate *certificate,
Modified: releases/WebKitGTK/webkit-2.20/Tools/ChangeLog (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Tools/ChangeLog 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Tools/ChangeLog 2018-05-09 23:59:20 UTC (rev 231617)
@@ -1,3 +1,17 @@
+2018-04-25 Michael Catanzaro <[email protected]>
+
+ [WPE] Remove deprecated functions and properties from the API
+ https://bugs.webkit.org/show_bug.cgi?id=179295
+
+ Reviewed by Žan Doberšek.
+
+ * TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp:
+ (testWebViewAuthenticationStorage): Disable this test for now. It will require some effort
+ to rewrite LoadTrackingTest to not require the web view at construction time.
+ * TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:
+ (testWebKitSettings): Don't test private browsing setting, which is gone.
+ * TestWebKitAPI/glib/CMakeLists.txt: Disable TestCookieManager for now.
+
2018-04-24 Zan Dobersek <[email protected]>
[WPE] Remove libgbm dependency
Modified: releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp 2018-05-09 23:59:20 UTC (rev 231617)
@@ -184,6 +184,8 @@
g_assert_cmpstr(webkit_web_view_get_title(test->m_webView), ==, authExpectedFailureTitle);
}
+// FIXME: Find a way to not use the private browsing setting and enable for WPE.
+#if PLATFORM(GTK)
static void testWebViewAuthenticationStorage(AuthenticationTest* test, gconstpointer)
{
// Enable private browsing before authentication request to test that credentials can't be saved.
@@ -207,6 +209,7 @@
g_assert(webkit_authentication_request_can_save_credentials(request));
#endif
}
+#endif
static void testWebViewAuthenticationSuccess(AuthenticationTest* test, gconstpointer)
{
@@ -416,7 +419,9 @@
AuthenticationTest::add("Authentication", "authentication-success", testWebViewAuthenticationSuccess);
AuthenticationTest::add("Authentication", "authentication-failure", testWebViewAuthenticationFailure);
AuthenticationTest::add("Authentication", "authentication-no-credential", testWebViewAuthenticationNoCredential);
+#if PLATFORM(GTK)
AuthenticationTest::add("Authentication", "authentication-storage", testWebViewAuthenticationStorage);
+#endif
AuthenticationTest::add("Authentication", "authentication-empty-realm", testWebViewAuthenticationEmptyRealm);
ProxyAuthenticationTest::add("Authentication", "authentication-proxy", testWebViewAuthenticationProxy);
ProxyAuthenticationTest::add("Authentication", "authentication-proxy-https", testWebViewAuthenticationProxyHTTPS);
Modified: releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp 2018-05-09 23:59:20 UTC (rev 231617)
@@ -200,11 +200,13 @@
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(!webkit_settings_get_enable_private_browsing(settings));
webkit_settings_set_enable_private_browsing(settings, TRUE);
g_assert(webkit_settings_get_enable_private_browsing(settings));
G_GNUC_END_IGNORE_DEPRECATIONS;
+#endif
g_assert(!webkit_settings_get_enable_developer_extras(settings));
webkit_settings_set_enable_developer_extras(settings, TRUE);
Modified: releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/glib/CMakeLists.txt (231616 => 231617)
--- releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/glib/CMakeLists.txt 2018-05-09 23:59:15 UTC (rev 231616)
+++ releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/glib/CMakeLists.txt 2018-05-09 23:59:20 UTC (rev 231617)
@@ -118,7 +118,6 @@
ADD_WK2_TEST(TestAuthentication ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp)
ADD_WK2_TEST(TestAutomationSession ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestAutomationSession.cpp)
ADD_WK2_TEST(TestBackForwardList ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestBackForwardList.cpp)
-ADD_WK2_TEST(TestCookieManager ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp)
ADD_WK2_TEST(TestDownloads ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestDownloads.cpp)
ADD_WK2_TEST(TestWebKitFaviconDatabase ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestWebKitFaviconDatabase.cpp)
ADD_WK2_TEST(TestWebKitFindController ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestWebKitFindController.cpp)
@@ -137,3 +136,8 @@
ADD_WK2_TEST(TestWebKitUserContentManager ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestWebKitUserContentManager.cpp)
ADD_WK2_TEST(TestWebsiteData ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp)
ADD_WK2_TEST(TestConsoleMessage ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestConsoleMessage.cpp)
+
+# FIXME: Enable for WPE
+if (PORT STREQUAL "GTK")
+ ADD_WK2_TEST(TestCookieManager ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp)
+endif ()
