Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp (229457 => 229458)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2018-03-09 10:37:01 UTC (rev 229457)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2018-03-09 10:58:17 UTC (rev 229458)
@@ -310,7 +310,6 @@
configuration.webSQLDatabaseDirectory = processPoolconfigurarion.webSQLDatabaseDirectory();
configuration.localStorageDirectory = processPoolconfigurarion.localStorageDirectory();
configuration.mediaKeysStorageDirectory = processPoolconfigurarion.mediaKeysStorageDirectory();
- configuration.resourceLoadStatisticsDirectory = processPoolconfigurarion.resourceLoadStatisticsDirectory();
return configuration;
}
@@ -333,7 +332,6 @@
configuration.setApplicationCacheDirectory(WebCore::FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_offline_application_cache_directory(priv->websiteDataManager.get())));
configuration.setIndexedDBDatabaseDirectory(WebCore::FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_indexeddb_directory(priv->websiteDataManager.get())));
configuration.setWebSQLDatabaseDirectory(WebCore::FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_websql_directory(priv->websiteDataManager.get())));
- configuration.setResourceLoadStatisticsDirectory(WebCore::FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_resource_load_statistics_directory(priv->websiteDataManager.get())));
} else if (!priv->localStorageDirectory.isNull())
configuration.setLocalStorageDirectory(WebCore::FileSystem::stringFromFileSystemRepresentation(priv->localStorageDirectory.data()));
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebsiteData.cpp (229457 => 229458)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebsiteData.cpp 2018-03-09 10:37:01 UTC (rev 229457)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebsiteData.cpp 2018-03-09 10:58:17 UTC (rev 229458)
@@ -73,7 +73,6 @@
WebsiteDataType::LocalStorage,
WebsiteDataType::WebSQLDatabases,
WebsiteDataType::IndexedDBDatabases,
- WebsiteDataType::ResourceLoadStatistics,
#if ENABLE(NETSCAPE_PLUGIN_API)
WebsiteDataType::PlugInData,
#endif
@@ -99,8 +98,6 @@
returnValue |= WEBKIT_WEBSITE_DATA_WEBSQL_DATABASES;
if (types.contains(WebsiteDataType::IndexedDBDatabases))
returnValue |= WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES;
- if (types.contains(WebsiteDataType::ResourceLoadStatistics))
- returnValue |= WEBKIT_WEBSITE_DATA_RESOURCE_LOAD_STATISTICS;
#if ENABLE(NETSCAPE_PLUGIN_API)
if (types.contains(WebsiteDataType::PlugInData))
returnValue |= WEBKIT_WEBSITE_DATA_PLUGIN_DATA;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataManager.cpp (229457 => 229458)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataManager.cpp 2018-03-09 10:37:01 UTC (rev 229457)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataManager.cpp 2018-03-09 10:58:17 UTC (rev 229458)
@@ -84,7 +84,6 @@
PROP_APPLICATION_CACHE_DIRECTORY,
PROP_INDEXEDDB_DIRECTORY,
PROP_WEBSQL_DIRECTORY,
- PROP_RESOURCE_LOAD_STATISTICS_DIRECTORY,
PROP_IS_EPHEMERAL
};
@@ -102,7 +101,6 @@
GUniquePtr<char> applicationCacheDirectory;
GUniquePtr<char> indexedDBDirectory;
GUniquePtr<char> webSQLDirectory;
- GUniquePtr<char> resourceLoadStatisticsDirectory;
GRefPtr<WebKitCookieManager> cookieManager;
Vector<WebProcessPool*> processPools;
@@ -136,9 +134,6 @@
case PROP_WEBSQL_DIRECTORY:
g_value_set_string(value, webkit_website_data_manager_get_websql_directory(manager));
break;
- case PROP_RESOURCE_LOAD_STATISTICS_DIRECTORY:
- g_value_set_string(value, webkit_website_data_manager_get_resource_load_statistics_directory(manager));
- break;
case PROP_IS_EPHEMERAL:
g_value_set_boolean(value, webkit_website_data_manager_is_ephemeral(manager));
break;
@@ -173,9 +168,6 @@
case PROP_WEBSQL_DIRECTORY:
manager->priv->webSQLDirectory.reset(g_value_dup_string(value));
break;
- case PROP_RESOURCE_LOAD_STATISTICS_DIRECTORY:
- manager->priv->resourceLoadStatisticsDirectory.reset(g_value_dup_string(value));
- break;
case PROP_IS_EPHEMERAL:
if (g_value_get_boolean(value))
manager->priv->websiteDataStore = API::WebsiteDataStore::createNonPersistentDataStore();
@@ -197,8 +189,6 @@
priv->indexedDBDirectory.reset(g_build_filename(priv->baseDataDirectory.get(), "databases", "indexeddb", nullptr));
if (!priv->webSQLDirectory)
priv->webSQLDirectory.reset(g_build_filename(priv->baseDataDirectory.get(), "databases", nullptr));
- if (!priv->resourceLoadStatisticsDirectory)
- priv->resourceLoadStatisticsDirectory.reset(g_build_filename(priv->baseDataDirectory.get(), "resourceloadstatistics", nullptr));
}
if (priv->baseCacheDirectory) {
@@ -339,23 +329,6 @@
static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
/**
- * WebKitWebsiteDataManager:resource-load-statistics-directory:
- *
- * The directory where resource load statistics will be stored.
- *
- * Since: 2.20
- */
- g_object_class_install_property(
- gObjectClass,
- PROP_RESOURCE_LOAD_STATISTICS_DIRECTORY,
- g_param_spec_string(
- "resource-load-statistics-directory",
- _("Resource Load Statistics Directory"),
- _("The directory where resource load statistics will be stored"),
- nullptr,
- static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
-
- /**
* WebKitWebsiteDataManager:is-ephemeral:
*
* Whether the #WebKitWebsiteDataManager is ephemeral. An ephemeral #WebKitWebsiteDataManager
@@ -397,8 +370,6 @@
API::WebsiteDataStore::defaultApplicationCacheDirectory() : WebCore::FileSystem::stringFromFileSystemRepresentation(priv->applicationCacheDirectory.get());
configuration.webSQLDatabaseDirectory = !priv->webSQLDirectory ?
API::WebsiteDataStore::defaultWebSQLDatabaseDirectory() : WebCore::FileSystem::stringFromFileSystemRepresentation(priv->webSQLDirectory.get());
- configuration.resourceLoadStatisticsDirectory = !priv->resourceLoadStatisticsDirectory ?
- API::WebsiteDataStore::defaultResourceLoadStatisticsDirectory() : WebCore::FileSystem::stringFromFileSystemRepresentation(priv->resourceLoadStatisticsDirectory.get());
configuration.mediaKeysStorageDirectory = API::WebsiteDataStore::defaultMediaKeysStorageDirectory();
priv->websiteDataStore = API::WebsiteDataStore::createLegacy(WTFMove(configuration));
}
@@ -636,29 +607,6 @@
}
/**
- * webkit_website_data_manager_get_resource_load_statistics_directory:
- * @manager: a #WebKitWebsiteDataManager
- *
- * Get the #WebKitWebsiteDataManager:resource-load-statistics-directory property.
- *
- * Returns: (allow-none): the directory where resource load statistics are stored or %NULL if @manager is ephemeral.
- *
- * Since: 2.20
- */
-const gchar* webkit_website_data_manager_get_resource_load_statistics_directory(WebKitWebsiteDataManager* manager)
-{
- g_return_val_if_fail(WEBKIT_IS_WEBSITE_DATA_MANAGER(manager), nullptr);
-
- WebKitWebsiteDataManagerPrivate* priv = manager->priv;
- if (priv->websiteDataStore && !priv->websiteDataStore->isPersistent())
- return nullptr;
-
- if (!priv->resourceLoadStatisticsDirectory)
- priv->resourceLoadStatisticsDirectory.reset(g_strdup(API::WebsiteDataStore::defaultResourceLoadStatisticsDirectory().utf8().data()));
- return priv->resourceLoadStatisticsDirectory.get();
-}
-
-/**
* webkit_website_data_manager_get_cookie_manager:
* @manager: a #WebKitWebsiteDataManager
*
@@ -678,39 +626,6 @@
return manager->priv->cookieManager.get();
}
-/**
- * webkit_website_data_manager_set_resource_load_statistics_enabled:
- * @manager: a #WebKitWebsiteDataManager
- * @enabled: value to set
- *
- * Enable collection of resource load statistics for intelligent tracking prevention.
- *
- * Since: 2.20
- */
-void webkit_website_data_manager_set_resource_load_statistics_enabled(WebKitWebsiteDataManager* manager, gboolean enabled)
-{
- g_return_if_fail(WEBKIT_IS_WEBSITE_DATA_MANAGER(manager));
-
- manager->priv->websiteDataStore->setResourceLoadStatisticsEnabled(enabled);
-}
-
-/**
- * webkit_website_data_manager_get_resource_load_statistics_enabled:
- * @manager: a #WebKitWebsiteDataManager
- *
- * Get whether collection of resource load statistics for intelligent tracking prevention is enabled or not.
- *
- * Returns: %TRUE if collection of resource load statistics is enabled, or %FALSE otherwise.
- *
- * Since: 2.20
- */
-gboolean webkit_website_data_manager_get_resource_load_statistics_enabled(WebKitWebsiteDataManager* manager)
-{
- g_return_val_if_fail(WEBKIT_IS_WEBSITE_DATA_MANAGER(manager), FALSE);
-
- return manager->priv->websiteDataStore->resourceLoadStatisticsEnabled();
-}
-
static OptionSet<WebsiteDataType> toWebsiteDataTypes(WebKitWebsiteDataTypes types)
{
OptionSet<WebsiteDataType> returnValue;
@@ -728,8 +643,6 @@
returnValue |= WebsiteDataType::WebSQLDatabases;
if (types & WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES)
returnValue |= WebsiteDataType::IndexedDBDatabases;
- if (types & WEBKIT_WEBSITE_DATA_RESOURCE_LOAD_STATISTICS)
- returnValue |= WebsiteDataType::ResourceLoadStatistics;
#if ENABLE(NETSCAPE_PLUGIN_API)
if (types & WEBKIT_WEBSITE_DATA_PLUGIN_DATA)
returnValue |= WebsiteDataType::PlugInData;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteData.h (229457 => 229458)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteData.h 2018-03-09 10:37:01 UTC (rev 229457)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteData.h 2018-03-09 10:58:17 UTC (rev 229458)
@@ -44,7 +44,6 @@
* @WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES: IndexedDB databases.
* @WEBKIT_WEBSITE_DATA_PLUGIN_DATA: Plugins data.
* @WEBKIT_WEBSITE_DATA_COOKIES: Cookies.
- * @WEBKIT_WEBSITE_DATA_RESOURCE_LOAD_STATISTICS: Resource load statistics. Since 2.20.
* @WEBKIT_WEBSITE_DATA_ALL: All types.
*
* Enum values with flags representing types of Website data.
@@ -61,8 +60,7 @@
WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES = 1 << 6,
WEBKIT_WEBSITE_DATA_PLUGIN_DATA = 1 << 7,
WEBKIT_WEBSITE_DATA_COOKIES = 1 << 8,
- WEBKIT_WEBSITE_DATA_RESOURCE_LOAD_STATISTICS = 1 << 9,
- WEBKIT_WEBSITE_DATA_ALL = (1 << 10) - 1
+ WEBKIT_WEBSITE_DATA_ALL = (1 << 9) - 1
} WebKitWebsiteDataTypes;
WEBKIT_API GType
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteDataManager.h (229457 => 229458)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteDataManager.h 2018-03-09 10:37:01 UTC (rev 229457)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteDataManager.h 2018-03-09 10:58:17 UTC (rev 229458)
@@ -90,20 +90,10 @@
WEBKIT_API const gchar *
webkit_website_data_manager_get_websql_directory (WebKitWebsiteDataManager *manager);
-WEBKIT_API const gchar *
-webkit_website_data_manager_get_resource_load_statistics_directory (WebKitWebsiteDataManager *manager);
-
WEBKIT_API WebKitCookieManager *
webkit_website_data_manager_get_cookie_manager (WebKitWebsiteDataManager *manager);
WEBKIT_API void
-webkit_website_data_manager_set_resource_load_statistics_enabled (WebKitWebsiteDataManager *manager,
- gboolean enabled);
-
-WEBKIT_API gboolean
-webkit_website_data_manager_get_resource_load_statistics_enabled (WebKitWebsiteDataManager *manager);
-
-WEBKIT_API void
webkit_website_data_manager_fetch (WebKitWebsiteDataManager *manager,
WebKitWebsiteDataTypes types,
GCancellable *cancellable,
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt (229457 => 229458)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt 2018-03-09 10:37:01 UTC (rev 229457)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt 2018-03-09 10:58:17 UTC (rev 229458)
@@ -1318,10 +1318,7 @@
webkit_website_data_manager_get_offline_application_cache_directory
webkit_website_data_manager_get_indexeddb_directory
webkit_website_data_manager_get_websql_directory
-webkit_website_data_manager_get_resource_load_statistics_directory
webkit_website_data_manager_get_cookie_manager
-webkit_website_data_manager_set_resource_load_statistics_enabled
-webkit_website_data_manager_get_resource_load_statistics_enabled
webkit_website_data_manager_fetch
webkit_website_data_manager_fetch_finish
webkit_website_data_manager_remove
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteData.h (229457 => 229458)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteData.h 2018-03-09 10:37:01 UTC (rev 229457)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteData.h 2018-03-09 10:58:17 UTC (rev 229458)
@@ -44,7 +44,6 @@
* @WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES: IndexedDB databases.
* @WEBKIT_WEBSITE_DATA_PLUGIN_DATA: Plugins data.
* @WEBKIT_WEBSITE_DATA_COOKIES: Cookies.
- * @WEBKIT_WEBSITE_DATA_RESOURCE_LOAD_STATISTICS: Resource load statistics. Since 2.20.
* @WEBKIT_WEBSITE_DATA_ALL: All types.
*
* Enum values with flags representing types of Website data.
@@ -61,8 +60,7 @@
WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES = 1 << 6,
WEBKIT_WEBSITE_DATA_PLUGIN_DATA = 1 << 7,
WEBKIT_WEBSITE_DATA_COOKIES = 1 << 8,
- WEBKIT_WEBSITE_DATA_RESOURCE_LOAD_STATISTICS = 1 << 9,
- WEBKIT_WEBSITE_DATA_ALL = (1 << 10) - 1
+ WEBKIT_WEBSITE_DATA_ALL = (1 << 9) - 1
} WebKitWebsiteDataTypes;
WEBKIT_API GType
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteDataManager.h (229457 => 229458)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteDataManager.h 2018-03-09 10:37:01 UTC (rev 229457)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteDataManager.h 2018-03-09 10:58:17 UTC (rev 229458)
@@ -90,20 +90,10 @@
WEBKIT_API const gchar *
webkit_website_data_manager_get_websql_directory (WebKitWebsiteDataManager *manager);
-WEBKIT_API const gchar *
-webkit_website_data_manager_get_resource_load_statistics_directory (WebKitWebsiteDataManager *manager);
-
WEBKIT_API WebKitCookieManager *
webkit_website_data_manager_get_cookie_manager (WebKitWebsiteDataManager *manager);
WEBKIT_API void
-webkit_website_data_manager_set_resource_load_statistics_enabled (WebKitWebsiteDataManager *manager,
- gboolean enabled);
-
-WEBKIT_API gboolean
-webkit_website_data_manager_get_resource_load_statistics_enabled (WebKitWebsiteDataManager *manager);
-
-WEBKIT_API void
webkit_website_data_manager_fetch (WebKitWebsiteDataManager *manager,
WebKitWebsiteDataTypes types,
GCancellable *cancellable,
Modified: releases/WebKitGTK/webkit-2.20/Tools/MiniBrowser/gtk/main.c (229457 => 229458)
--- releases/WebKitGTK/webkit-2.20/Tools/MiniBrowser/gtk/main.c 2018-03-09 10:37:01 UTC (rev 229457)
+++ releases/WebKitGTK/webkit-2.20/Tools/MiniBrowser/gtk/main.c 2018-03-09 10:58:17 UTC (rev 229458)
@@ -45,7 +45,6 @@
static gboolean privateMode;
static gboolean automationMode;
static gboolean fullScreen;
-static gboolean enableIntelligentTrackingPrevention;
static const char *proxy;
typedef enum {
@@ -103,7 +102,6 @@
{ "full-screen", 'f', 0, G_OPTION_ARG_NONE, &fullScreen, "Set the window to full-screen mode", NULL },
{ "private", 'p', 0, G_OPTION_ARG_NONE, &privateMode, "Run in private browsing mode", NULL },
{ "automation", 0, 0, G_OPTION_ARG_NONE, &automationMode, "Run in automation mode", NULL },
- { "enable-itp", 0, 0, G_OPTION_ARG_NONE, &enableIntelligentTrackingPrevention, "Enable intelligent tracking prevention", NULL },
{ "proxy", 0, 0, G_OPTION_ARG_STRING, &proxy, "Set proxy", "PROXY" },
{ "ignore-host", 0, 0, G_OPTION_ARG_STRING_ARRAY, &ignoreHosts, "Set proxy ignore hosts", "HOSTS" },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, 0, "[URL…]" },
@@ -518,9 +516,6 @@
// Enable the favicon database, by specifying the default directory.
webkit_web_context_set_favicon_database_directory(webContext, NULL);
- WebKitWebsiteDataManager *manager = webkit_web_context_get_website_data_manager(webContext);
- webkit_website_data_manager_set_resource_load_statistics_enabled(manager, enableIntelligentTrackingPrevention);
-
webkit_web_context_register_uri_scheme(webContext, BROWSER_ABOUT_SCHEME, (WebKitURISchemeRequestCallback)aboutURISchemeRequestCallback, webContext, NULL);
WebKitUserContentManager *userContentManager = webkit_user_content_manager_new();
Modified: releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp (229457 => 229458)
--- releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp 2018-03-09 10:37:01 UTC (rev 229457)
+++ releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp 2018-03-09 10:58:17 UTC (rev 229458)
@@ -21,7 +21,6 @@
#include "WebKitTestServer.h"
#include "WebViewTest.h"
-#include <glib/gstdio.h>
static WebKitTestServer* kServer;
@@ -32,12 +31,7 @@
return;
}
- if (g_str_equal(path, "/")) {
- const char* html = "<html><body></body></html>";
- soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, html, strlen(html));
- soup_message_body_complete(message->response_body);
- soup_message_set_status(message, SOUP_STATUS_OK);
- } else if (g_str_equal(path, "/empty")) {
+ if (g_str_equal(path, "/empty")) {
const char* emptyHTML = "<html><body></body></html>";
soup_message_headers_replace(message->response_headers, "Set-Cookie", "foo=bar; Max-Age=60");
soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, emptyHTML, strlen(emptyHTML));
@@ -167,12 +161,9 @@
g_assert_cmpstr(diskCacheDirectory.get(), ==, webkit_website_data_manager_get_disk_cache_directory(test->m_manager));
g_assert(g_file_test(diskCacheDirectory.get(), G_FILE_TEST_IS_DIR));
- GUniquePtr<char> resourceLoadStatisticsDirectory(g_build_filename(Test::dataDirectory(), "resource-load-statistics", nullptr));
- g_assert_cmpstr(resourceLoadStatisticsDirectory.get(), ==, webkit_website_data_manager_get_resource_load_statistics_directory(test->m_manager));
-
// Clear all persistent caches, since the data dir is common to all test cases.
static const WebKitWebsiteDataTypes persistentCaches = static_cast<WebKitWebsiteDataTypes>(WEBKIT_WEBSITE_DATA_DISK_CACHE | WEBKIT_WEBSITE_DATA_LOCAL_STORAGE
- | WEBKIT_WEBSITE_DATA_WEBSQL_DATABASES | WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES | WEBKIT_WEBSITE_DATA_OFFLINE_APPLICATION_CACHE | WEBKIT_WEBSITE_DATA_RESOURCE_LOAD_STATISTICS);
+ | WEBKIT_WEBSITE_DATA_WEBSQL_DATABASES | WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES | WEBKIT_WEBSITE_DATA_OFFLINE_APPLICATION_CACHE);
test->clear(persistentCaches, 0);
g_assert(!test->fetch(persistentCaches));
@@ -202,9 +193,6 @@
webSQLDirectory.reset(g_build_filename(Test::dataDirectory(), "databases", nullptr));
g_assert_cmpstr(webkit_website_data_manager_get_websql_directory(baseDataManager.get()), ==, webSQLDirectory.get());
- resourceLoadStatisticsDirectory.reset(g_build_filename(Test::dataDirectory(), "resourceloadstatistics", nullptr));
- g_assert_cmpstr(webkit_website_data_manager_get_resource_load_statistics_directory(baseDataManager.get()), ==, resourceLoadStatisticsDirectory.get());
-
g_assert_cmpstr(webkit_website_data_manager_get_disk_cache_directory(baseDataManager.get()), ==, Test::dataDirectory());
// Any specific configuration provided takes precedence over base dirs.
@@ -217,7 +205,6 @@
// The result should be the same as previous manager.
g_assert_cmpstr(webkit_website_data_manager_get_local_storage_directory(baseDataManager.get()), ==, localStorageDirectory.get());
g_assert_cmpstr(webkit_website_data_manager_get_websql_directory(baseDataManager.get()), ==, webSQLDirectory.get());
- g_assert_cmpstr(webkit_website_data_manager_get_resource_load_statistics_directory(baseDataManager.get()), ==, resourceLoadStatisticsDirectory.get());
g_assert_cmpstr(webkit_website_data_manager_get_disk_cache_directory(baseDataManager.get()), ==, Test::dataDirectory());
}
@@ -240,14 +227,11 @@
g_assert(!webkit_website_data_manager_get_offline_application_cache_directory(manager.get()));
g_assert(!webkit_website_data_manager_get_indexeddb_directory(manager.get()));
g_assert(!webkit_website_data_manager_get_websql_directory(manager.get()));
- g_assert(!webkit_website_data_manager_get_resource_load_statistics_directory(manager.get()));
// Configuration is ignored when is-ephemeral is used.
manager = adoptGRef(WEBKIT_WEBSITE_DATA_MANAGER(g_object_new(WEBKIT_TYPE_WEBSITE_DATA_MANAGER, "base-data-directory", Test::dataDirectory(), "is-ephemeral", TRUE, nullptr)));
g_assert(webkit_website_data_manager_is_ephemeral(manager.get()));
g_assert(!webkit_website_data_manager_get_base_data_directory(manager.get()));
- webkit_website_data_manager_set_resource_load_statistics_enabled(manager.get(), TRUE);
- g_assert(webkit_website_data_manager_get_resource_load_statistics_enabled(manager.get()));
// Non persistent data can be queried in an ephemeral manager.
GRefPtr<WebKitWebContext> webContext = adoptGRef(webkit_web_context_new_with_website_data_manager(manager.get()));
@@ -260,9 +244,6 @@
webkit_web_view_load_uri(webView.get(), kServer->getURIForPath("/empty").data());
g_main_loop_run(test->m_mainLoop);
- GUniquePtr<char> resourceLoadStatisticsDirectory(g_build_filename(Test::dataDirectory(), "resource-load-statistics", nullptr));
- g_assert(!g_file_test(resourceLoadStatisticsDirectory.get(), G_FILE_TEST_IS_DIR));
-
webkit_website_data_manager_fetch(manager.get(), WEBKIT_WEBSITE_DATA_MEMORY_CACHE, nullptr, [](GObject* manager, GAsyncResult* result, gpointer userData) {
auto* test = static_cast<WebViewTest*>(userData);
GList* dataList = webkit_website_data_manager_fetch_finish(WEBKIT_WEBSITE_DATA_MANAGER(manager), result, nullptr);
@@ -277,8 +258,6 @@
test->quitMainLoop();
}, test);
g_main_loop_run(test->m_mainLoop);
-
- webkit_website_data_manager_set_resource_load_statistics_enabled(manager.get(), FALSE);
}
static void testWebsiteDataCache(WebsiteDataTest* test, gconstpointer)
@@ -538,54 +517,6 @@
g_assert(!dataList);
}
-static void fileChangedCallback(GFileMonitor*, GFile*, GFile*, GFileMonitorEvent event, bool* fileRemoved)
-{
- if (event == G_FILE_MONITOR_EVENT_DELETED)
- *fileRemoved = true;
-}
-
-static void testWebsiteDataResourceLoadStatistics(WebsiteDataTest* test, gconstpointer)
-{
- const char* resourceLoadStatisticsDirectory = webkit_website_data_manager_get_resource_load_statistics_directory(test->m_manager);
- GUniquePtr<char> resourceLoadStatisticsLogFile(g_build_filename(resourceLoadStatisticsDirectory, "full_browsing_session_resourceLog.plist", nullptr));
-
- // Delete any previous data.
- g_unlink(resourceLoadStatisticsLogFile.get());
- g_rmdir(resourceLoadStatisticsDirectory);
-
- g_assert(!webkit_website_data_manager_get_resource_load_statistics_enabled(test->m_manager));
- test->loadURI(kServer->getURIForPath("/").data());
- test->waitUntilLoadFinished();
-
- webkit_website_data_manager_set_resource_load_statistics_enabled(test->m_manager, TRUE);
- g_assert(webkit_website_data_manager_get_resource_load_statistics_enabled(test->m_manager));
- g_assert(!g_file_test(resourceLoadStatisticsDirectory, G_FILE_TEST_IS_DIR));
- g_assert(!g_file_test(resourceLoadStatisticsLogFile.get(), G_FILE_TEST_IS_REGULAR));
-
- test->loadURI(kServer->getURIForPath("/").data());
- test->waitUntilLoadFinished();
-
- test->waitUntilFileExists(resourceLoadStatisticsLogFile.get());
-
- g_assert(g_file_test(resourceLoadStatisticsDirectory, G_FILE_TEST_IS_DIR));
- g_assert(g_file_test(resourceLoadStatisticsLogFile.get(), G_FILE_TEST_IS_REGULAR));
-
- // Clear all.
- static const WebKitWebsiteDataTypes cacheAndResourceLoadStatistics = static_cast<WebKitWebsiteDataTypes>(WEBKIT_WEBSITE_DATA_RESOURCE_LOAD_STATISTICS | WEBKIT_WEBSITE_DATA_MEMORY_CACHE | WEBKIT_WEBSITE_DATA_DISK_CACHE);
- GRefPtr<GFile> file = adoptGRef(g_file_new_for_path(resourceLoadStatisticsLogFile.get()));
- GRefPtr<GFileMonitor> monitor = adoptGRef(g_file_monitor_file(file.get(), G_FILE_MONITOR_NONE, nullptr, nullptr));
- g_assert(monitor.get());
- bool fileRemoved = false;
- g_signal_connect(monitor.get(), "changed", G_CALLBACK(fileChangedCallback), &fileRemoved);
- test->clear(cacheAndResourceLoadStatistics, 0);
- g_assert(fileRemoved);
-
- webkit_website_data_manager_set_resource_load_statistics_enabled(test->m_manager, FALSE);
- g_assert(!webkit_website_data_manager_get_resource_load_statistics_enabled(test->m_manager));
-
- g_rmdir(resourceLoadStatisticsDirectory);
-}
-
void beforeAll()
{
kServer = new WebKitTestServer();
@@ -598,7 +529,6 @@
WebsiteDataTest::add("WebKitWebsiteData", "databases", testWebsiteDataDatabases);
WebsiteDataTest::add("WebKitWebsiteData", "appcache", testWebsiteDataAppcache);
WebsiteDataTest::add("WebKitWebsiteData", "cookies", testWebsiteDataCookies);
- WebsiteDataTest::add("WebKitWebsiteData", "resource-load-statistics", testWebsiteDataResourceLoadStatistics);
}
void afterAll()
Modified: releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h (229457 => 229458)
--- releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h 2018-03-09 10:37:01 UTC (rev 229457)
+++ releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h 2018-03-09 10:58:17 UTC (rev 229458)
@@ -108,11 +108,10 @@
GUniquePtr<char> diskCacheDirectory(g_build_filename(dataDirectory(), "disk-cache", nullptr));
GUniquePtr<char> applicationCacheDirectory(g_build_filename(dataDirectory(), "appcache", nullptr));
GUniquePtr<char> webSQLDirectory(g_build_filename(dataDirectory(), "websql", nullptr));
- GUniquePtr<char> resourceLoadStatisticsDirectory(g_build_filename(dataDirectory(), "resource-load-statistics", nullptr));
GRefPtr<WebKitWebsiteDataManager> websiteDataManager = adoptGRef(webkit_website_data_manager_new(
"local-storage-directory", localStorageDirectory.get(), "indexeddb-directory", indexedDBDirectory.get(),
"disk-cache-directory", diskCacheDirectory.get(), "offline-application-cache-directory", applicationCacheDirectory.get(),
- "websql-directory", webSQLDirectory.get(), "resource-load-statistics-directory", resourceLoadStatisticsDirectory.get(), nullptr));
+ "websql-directory", webSQLDirectory.get(), nullptr));
m_webContext = adoptGRef(webkit_web_context_new_with_website_data_manager(websiteDataManager.get()));
g_signal_connect(m_webContext.get(), "initialize-web-extensions", G_CALLBACK(initializeWebExtensionsCallback), this);
Modified: releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp (229457 => 229458)
--- releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp 2018-03-09 10:37:01 UTC (rev 229457)
+++ releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp 2018-03-09 10:58:17 UTC (rev 229458)
@@ -217,23 +217,6 @@
waitUntilTitleChangedTo(0);
}
-static void directoryChangedCallback(GFileMonitor*, GFile* file, GFile*, GFileMonitorEvent event, WebViewTest* test)
-{
- if (event == G_FILE_MONITOR_EVENT_CREATED && g_file_equal(file, test->m_monitoredFile.get()))
- test->quitMainLoop();
-}
-
-void WebViewTest::waitUntilFileExists(const char* filename)
-{
- m_monitoredFile = adoptGRef(g_file_new_for_path(filename));
- GRefPtr<GFile> directory = adoptGRef(g_file_get_parent(m_monitoredFile.get()));
- GRefPtr<GFileMonitor> monitor = adoptGRef(g_file_monitor_directory(directory.get(), G_FILE_MONITOR_NONE, nullptr, nullptr));
- g_assert(monitor.get());
- g_signal_connect(monitor.get(), "changed", G_CALLBACK(directoryChangedCallback), this);
- if (!g_file_query_exists(m_monitoredFile.get(), nullptr))
- g_main_loop_run(m_mainLoop);
-}
-
void WebViewTest::selectAll()
{
webkit_web_view_execute_editing_command(m_webView, "SelectAll");
Modified: releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.h (229457 => 229458)
--- releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.h 2018-03-09 10:37:01 UTC (rev 229457)
+++ releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.h 2018-03-09 10:58:17 UTC (rev 229458)
@@ -51,7 +51,6 @@
void waitUntilLoadFinished();
void waitUntilTitleChangedTo(const char* expectedTitle);
void waitUntilTitleChanged();
- void waitUntilFileExists(const char*);
void resizeView(int width, int height);
void hideView();
void selectAll();
@@ -103,7 +102,6 @@
size_t m_resourceDataSize { 0 };
cairo_surface_t* m_surface { nullptr };
bool m_expectedWebProcessCrash { false };
- GRefPtr<GFile> m_monitoredFile;
#if PLATFORM(GTK)
GtkWidget* m_parentWindow { nullptr };
