Diff
Modified: trunk/Source/WebKit/ChangeLog (250142 => 250143)
--- trunk/Source/WebKit/ChangeLog 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/ChangeLog 2019-09-20 20:11:50 UTC (rev 250143)
@@ -1,3 +1,52 @@
+2019-09-20 Alex Christensen <achristen...@webkit.org>
+
+ Remove unused storage paths on APIProcessPoolConfiguration
+ https://bugs.webkit.org/show_bug.cgi?id=202028
+
+ Reviewed by Chris Dumez.
+
+ This is a piece of r249768.
+ There is no way to set these paths and they have been replaced by WebsiteDataStore paths.
+ There was one remaining use of the global disk cache directory in NetworkProcess::setCacheModel,
+ which I replaced with the default session's disk cache directory, which is equivalent.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::setCacheModel):
+ * NetworkProcess/NetworkProcess.h:
+ (WebKit::NetworkProcess::diskCacheDirectory const): Deleted.
+ * NetworkProcess/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode const):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ (WebKit::NetworkProcessCreationParameters::NetworkProcessCreationParameters): Deleted.
+ * NetworkProcess/NetworkProcessCreationParameters.h:
+ * NetworkProcess/NetworkSession.cpp:
+ (WebKit::NetworkSession::NetworkSession):
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::open):
+ (WebKit::NetworkCache::Cache::Cache):
+ * NetworkProcess/cache/NetworkCache.h:
+ (WebKit::NetworkCache::Cache::storageDirectory):
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * UIProcess/API/APIProcessPoolConfiguration.cpp:
+ (API::ProcessPoolConfiguration::copy):
+ (API::ProcessPoolConfiguration::createWithWebsiteDataStoreConfiguration): Deleted.
+ (API::ProcessPoolConfiguration::ProcessPoolConfiguration): Deleted.
+ (API::ProcessPoolConfiguration::~ProcessPoolConfiguration): Deleted.
+ * UIProcess/API/APIProcessPoolConfiguration.h:
+ * UIProcess/API/glib/WebKitWebContext.cpp:
+ (webkitWebContextConstructed):
+ (webkit_web_context_set_disk_cache_directory):
+ (websiteDataStoreConfigurationForWebProcessPoolConfiguration): Deleted.
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::ensureNetworkProcess):
+ (WebKit::WebProcessPool::resolvePathsForSandboxExtensions):
+ (WebKit::WebProcessPool::webProcessDataStoreParameters):
+ * UIProcess/WebProcessPool.h:
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::processPools const):
+ * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:
+
2019-09-20 Keith Rollin <krol...@apple.com>
Remove some support for < iOS 13
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (250142 => 250143)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-09-20 20:11:50 UTC (rev 250143)
@@ -1985,7 +1985,17 @@
unsigned urlCacheMemoryCapacity = 0;
uint64_t urlCacheDiskCapacity = 0;
uint64_t diskFreeSize = 0;
- if (FileSystem::getVolumeFreeSpace(m_diskCacheDirectory, diskFreeSize)) {
+
+ // FIXME: Move the cache model to WebsiteDataStore so we don't need to assume the first cache is on the same volume as all caches.
+ String cacheStorageDirectory;
+ forEachNetworkSession([&](auto& session) {
+ if (!cacheStorageDirectory.isNull())
+ return;
+ if (auto* cache = session.cache())
+ cacheStorageDirectory = cache->storageDirectory();
+ });
+
+ if (FileSystem::getVolumeFreeSpace(cacheStorageDirectory, diskFreeSize)) {
// As a fudge factor, use 1000 instead of 1024, in case the reported byte
// count doesn't align exactly to a megabyte boundary.
diskFreeSize /= KB * 1000;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (250142 => 250143)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-09-20 20:11:50 UTC (rev 250143)
@@ -339,7 +339,6 @@
void addKeptAliveLoad(Ref<NetworkResourceLoader>&&);
void removeKeptAliveLoad(NetworkResourceLoader&);
- const String& diskCacheDirectory() const { return m_diskCacheDirectory; }
const OptionSet<NetworkCache::CacheOption>& cacheOptions() const { return m_cacheOptions; }
NetworkConnectionToWebProcess* webProcessConnection(WebCore::ProcessIdentifier) const;
@@ -477,7 +476,6 @@
// Connections to WebProcesses.
HashMap<WebCore::ProcessIdentifier, Ref<NetworkConnectionToWebProcess>> m_webProcessConnections;
- String m_diskCacheDirectory;
bool m_hasSetCacheModel { false };
CacheModel m_cacheModel { CacheModel::DocumentViewer };
bool m_suppressMemoryPressureHandler { false };
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (250142 => 250143)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2019-09-20 20:11:50 UTC (rev 250143)
@@ -35,16 +35,12 @@
namespace WebKit {
-NetworkProcessCreationParameters::NetworkProcessCreationParameters()
-{
-}
+NetworkProcessCreationParameters::NetworkProcessCreationParameters() = default;
void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
{
encoder.encodeEnum(cacheModel);
encoder << canHandleHTTPSServerTrustEvaluation;
- encoder << diskCacheDirectory;
- encoder << diskCacheDirectoryExtensionHandle;
#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
encoder << shouldEnableNetworkCacheSpeculativeRevalidation;
#endif
@@ -103,15 +99,6 @@
if (!decoder.decode(result.canHandleHTTPSServerTrustEvaluation))
return false;
- if (!decoder.decode(result.diskCacheDirectory))
- return false;
-
- Optional<SandboxExtension::Handle> diskCacheDirectoryExtensionHandle;
- decoder >> diskCacheDirectoryExtensionHandle;
- if (!diskCacheDirectoryExtensionHandle)
- return false;
- result.diskCacheDirectoryExtensionHandle = WTFMove(*diskCacheDirectoryExtensionHandle);
-
#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
if (!decoder.decode(result.shouldEnableNetworkCacheSpeculativeRevalidation))
return false;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (250142 => 250143)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2019-09-20 20:11:50 UTC (rev 250143)
@@ -54,8 +54,6 @@
CacheModel cacheModel { CacheModel::DocumentViewer };
bool canHandleHTTPSServerTrustEvaluation { true };
- String diskCacheDirectory;
- SandboxExtension::Handle diskCacheDirectoryExtensionHandle;
#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
bool shouldEnableNetworkCacheSpeculativeRevalidation { false };
#endif
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp (250142 => 250143)
--- trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp 2019-09-20 20:11:50 UTC (rev 250143)
@@ -87,9 +87,7 @@
{
if (!m_sessionID.isEphemeral()) {
String networkCacheDirectory = parameters.networkCacheDirectory;
- if (networkCacheDirectory.isNull())
- networkCacheDirectory = networkProcess.diskCacheDirectory();
- else
+ if (!networkCacheDirectory.isNull())
SandboxExtension::consumePermanently(parameters.networkCacheDirectoryExtensionHandle);
m_cache = NetworkCache::Cache::open(networkProcess, networkCacheDirectory, networkProcess.cacheOptions(), m_sessionID);
Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp (250142 => 250143)
--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp 2019-09-20 20:11:50 UTC (rev 250143)
@@ -68,7 +68,7 @@
if (!storage)
return nullptr;
- return adoptRef(*new Cache(networkProcess, storage.releaseNonNull(), options, sessionID));
+ return adoptRef(*new Cache(networkProcess, cachePath, storage.releaseNonNull(), options, sessionID));
}
#if PLATFORM(GTK) || PLATFORM(WPE)
@@ -78,10 +78,11 @@
}
#endif
-Cache::Cache(NetworkProcess& networkProcess, Ref<Storage>&& storage, OptionSet<CacheOption> options, PAL::SessionID sessionID)
+Cache::Cache(NetworkProcess& networkProcess, const String& storageDirectory, Ref<Storage>&& storage, OptionSet<CacheOption> options, PAL::SessionID sessionID)
: m_storage(WTFMove(storage))
, m_networkProcess(networkProcess)
, m_sessionID(sessionID)
+ , m_storageDirectory(storageDirectory)
{
#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
if (options.contains(CacheOption::SpeculativeRevalidation)) {
Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.h (250142 => 250143)
--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.h 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.h 2019-09-20 20:11:50 UTC (rev 250143)
@@ -170,11 +170,12 @@
NetworkProcess& networkProcess() { return m_networkProcess.get(); }
const PAL::SessionID& sessionID() const { return m_sessionID; }
+ const String& storageDirectory() const { return m_storageDirectory; }
~Cache();
private:
- Cache(NetworkProcess&, Ref<Storage>&&, OptionSet<CacheOption>, PAL::SessionID);
+ Cache(NetworkProcess&, const String& storageDirectory, Ref<Storage>&&, OptionSet<CacheOption>, PAL::SessionID);
Key makeCacheKey(const WebCore::ResourceRequest&);
@@ -195,6 +196,7 @@
unsigned m_traverseCount { 0 };
PAL::SessionID m_sessionID;
+ String m_storageDirectory;
};
} // namespace NetworkCache
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (250142 => 250143)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2019-09-20 20:11:50 UTC (rev 250143)
@@ -90,7 +90,6 @@
SandboxExtension::consumePermanently(parameters.defaultDataStoreParameters.indexedDatabaseTempBlobDirectoryExtensionHandle);
#endif
#endif
- m_diskCacheDirectory = parameters.diskCacheDirectory;
_CFNetworkSetATSContext(parameters.networkATSContext.get());
@@ -116,10 +115,6 @@
ASSERT(!m_diskCacheIsDisabledForTesting);
- if (m_diskCacheDirectory.isNull())
- return;
-
- SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
m_cacheOptions = { NetworkCache::CacheOption::RegisterNotify };
if (parameters.shouldUseTestingNetworkSession)
m_cacheOptions.add(NetworkCache::CacheOption::TestingMode);
Modified: trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp (250142 => 250143)
--- trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp 2019-09-20 20:11:50 UTC (rev 250143)
@@ -127,14 +127,9 @@
if (parameters.proxySettings.mode != SoupNetworkProxySettings::Mode::Default)
setNetworkProxySettings(parameters.proxySettings);
- ASSERT(!parameters.diskCacheDirectory.isEmpty());
- m_diskCacheDirectory = parameters.diskCacheDirectory;
-
GRefPtr<GResolver> cachedResolver = adoptGRef(webkitCachedResolverNew(adoptGRef(g_resolver_get_default())));
g_resolver_set_default(cachedResolver.get());
- SoupNetworkSession::clearOldSoupCache(FileSystem::directoryName(m_diskCacheDirectory));
-
m_cacheOptions = { NetworkCache::CacheOption::RegisterNotify };
#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
if (parameters.shouldEnableNetworkCacheSpeculativeRevalidation)
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp (250142 => 250143)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2019-09-20 20:11:50 UTC (rev 250143)
@@ -36,60 +36,18 @@
return adoptRef(*new ProcessPoolConfiguration);
}
-Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::createWithWebsiteDataStoreConfiguration(const WebKit::WebsiteDataStoreConfiguration& legacyConfiguration)
-{
- auto configuration = ProcessPoolConfiguration::create();
+ProcessPoolConfiguration::ProcessPoolConfiguration() = default;
- configuration->m_applicationCacheDirectory = legacyConfiguration.applicationCacheDirectory();
- configuration->m_applicationCacheFlatFileSubdirectoryName = legacyConfiguration.applicationCacheFlatFileSubdirectoryName();
- configuration->m_diskCacheDirectory = legacyConfiguration.networkCacheDirectory();
- configuration->m_mediaCacheDirectory = legacyConfiguration.mediaCacheDirectory();
- configuration->m_indexedDBDatabaseDirectory = legacyConfiguration.indexedDBDatabaseDirectory();
- configuration->m_localStorageDirectory = legacyConfiguration.localStorageDirectory();
- configuration->m_deviceIdHashSaltsStorageDirectory = legacyConfiguration.deviceIdHashSaltsStorageDirectory();
- configuration->m_mediaKeysStorageDirectory = legacyConfiguration.mediaKeysStorageDirectory();
- configuration->m_resourceLoadStatisticsDirectory = legacyConfiguration.resourceLoadStatisticsDirectory();
- configuration->m_webSQLDatabaseDirectory = legacyConfiguration.webSQLDatabaseDirectory();
+ProcessPoolConfiguration::~ProcessPoolConfiguration() = default;
- return configuration;
-}
-
-ProcessPoolConfiguration::ProcessPoolConfiguration()
- : m_applicationCacheDirectory(WebsiteDataStore::defaultApplicationCacheDirectory())
- , m_applicationCacheFlatFileSubdirectoryName("Files")
- , m_diskCacheDirectory(WebsiteDataStore::defaultNetworkCacheDirectory())
- , m_mediaCacheDirectory(WebsiteDataStore::defaultMediaCacheDirectory())
- , m_indexedDBDatabaseDirectory(WebsiteDataStore::defaultIndexedDBDatabaseDirectory())
- , m_localStorageDirectory(WebsiteDataStore::defaultLocalStorageDirectory())
- , m_deviceIdHashSaltsStorageDirectory(WebsiteDataStore::defaultDeviceIdHashSaltsStorageDirectory())
- , m_webSQLDatabaseDirectory(WebsiteDataStore::defaultWebSQLDatabaseDirectory())
- , m_mediaKeysStorageDirectory(WebsiteDataStore::defaultMediaKeysStorageDirectory())
- , m_resourceLoadStatisticsDirectory(WebsiteDataStore::defaultResourceLoadStatisticsDirectory())
-{
-}
-
-ProcessPoolConfiguration::~ProcessPoolConfiguration()
-{
-}
-
Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::copy()
{
auto copy = this->create();
copy->m_cacheModel = this->m_cacheModel;
- copy->m_diskCacheDirectory = this->m_diskCacheDirectory;
copy->m_diskCacheSpeculativeValidationEnabled = this->m_diskCacheSpeculativeValidationEnabled;
- copy->m_applicationCacheDirectory = this->m_applicationCacheDirectory;
- copy->m_applicationCacheFlatFileSubdirectoryName = this->m_applicationCacheFlatFileSubdirectoryName;
- copy->m_mediaCacheDirectory = this->m_mediaCacheDirectory;
- copy->m_indexedDBDatabaseDirectory = this->m_indexedDBDatabaseDirectory;
copy->m_injectedBundlePath = this->m_injectedBundlePath;
copy->m_customClassesForParameterCoder = this->m_customClassesForParameterCoder;
- copy->m_localStorageDirectory = this->m_localStorageDirectory;
- copy->m_deviceIdHashSaltsStorageDirectory = this->m_deviceIdHashSaltsStorageDirectory;
- copy->m_mediaKeysStorageDirectory = this->m_mediaKeysStorageDirectory;
- copy->m_resourceLoadStatisticsDirectory = this->m_resourceLoadStatisticsDirectory;
- copy->m_webSQLDatabaseDirectory = this->m_webSQLDatabaseDirectory;
copy->m_cachePartitionedURLSchemes = this->m_cachePartitionedURLSchemes;
copy->m_alwaysRevalidatedURLSchemes = this->m_alwaysRevalidatedURLSchemes;
copy->m_additionalReadAccessAllowedPaths = this->m_additionalReadAccessAllowedPaths;
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (250142 => 250143)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2019-09-20 20:11:50 UTC (rev 250143)
@@ -45,8 +45,6 @@
class ProcessPoolConfiguration final : public ObjectImpl<Object::Type::ProcessPoolConfiguration> {
public:
static Ref<ProcessPoolConfiguration> create();
- static Ref<ProcessPoolConfiguration> createWithLegacyOptions();
- static Ref<ProcessPoolConfiguration> createWithWebsiteDataStoreConfiguration(const WebKit::WebsiteDataStoreConfiguration&);
explicit ProcessPoolConfiguration();
virtual ~ProcessPoolConfiguration();
@@ -79,38 +77,9 @@
WebKit::CacheModel cacheModel() const { return m_cacheModel; }
void setCacheModel(WebKit::CacheModel cacheModel) { m_cacheModel = cacheModel; }
- const WTF::String& applicationCacheDirectory() const { return m_applicationCacheDirectory; }
- void setApplicationCacheDirectory(const WTF::String& applicationCacheDirectory) { m_applicationCacheDirectory = applicationCacheDirectory; }
-
- const WTF::String& applicationCacheFlatFileSubdirectoryName() const { return m_applicationCacheFlatFileSubdirectoryName; }
-
- const WTF::String& diskCacheDirectory() const { return m_diskCacheDirectory; }
- void setDiskCacheDirectory(const WTF::String& diskCacheDirectory) { m_diskCacheDirectory = diskCacheDirectory; }
-
- const WTF::String& mediaCacheDirectory() const { return m_mediaCacheDirectory; }
- void setMediaCacheDirectory(const WTF::String& mediaCacheDirectory) { m_mediaCacheDirectory = mediaCacheDirectory; }
-
- const WTF::String& indexedDBDatabaseDirectory() const { return m_indexedDBDatabaseDirectory; }
- void setIndexedDBDatabaseDirectory(const WTF::String& indexedDBDatabaseDirectory) { m_indexedDBDatabaseDirectory = indexedDBDatabaseDirectory; }
-
const WTF::String& injectedBundlePath() const { return m_injectedBundlePath; }
void setInjectedBundlePath(const WTF::String& injectedBundlePath) { m_injectedBundlePath = injectedBundlePath; }
- const WTF::String& localStorageDirectory() const { return m_localStorageDirectory; }
- void setLocalStorageDirectory(const WTF::String& localStorageDirectory) { m_localStorageDirectory = localStorageDirectory; }
-
- const WTF::String& deviceIdHashSaltsStorageDirectory() const { return m_deviceIdHashSaltsStorageDirectory; }
- void setDeviceIdHashSaltsStorageDirectory(const WTF::String& directory) { m_deviceIdHashSaltsStorageDirectory = directory; }
-
- const WTF::String& webSQLDatabaseDirectory() const { return m_webSQLDatabaseDirectory; }
- void setWebSQLDatabaseDirectory(const WTF::String& webSQLDatabaseDirectory) { m_webSQLDatabaseDirectory = webSQLDatabaseDirectory; }
-
- const WTF::String& mediaKeysStorageDirectory() const { return m_mediaKeysStorageDirectory; }
- void setMediaKeysStorageDirectory(const WTF::String& mediaKeysStorageDirectory) { m_mediaKeysStorageDirectory = mediaKeysStorageDirectory; }
-
- const WTF::String& resourceLoadStatisticsDirectory() const { return m_resourceLoadStatisticsDirectory; }
- void setResourceLoadStatisticsDirectory(const WTF::String& resourceLoadStatisticsDirectory) { m_resourceLoadStatisticsDirectory = resourceLoadStatisticsDirectory; }
-
const Vector<WTF::String>& customClassesForParameterCoder() const { return m_customClassesForParameterCoder; }
void setCustomClassesForParameterCoder(Vector<WTF::String>&& classesForCoder) { m_customClassesForParameterCoder = WTFMove(classesForCoder); }
@@ -191,17 +160,7 @@
bool m_diskCacheSpeculativeValidationEnabled { false };
WebKit::CacheModel m_cacheModel { WebKit::CacheModel::PrimaryWebBrowser };
- WTF::String m_applicationCacheDirectory;
- WTF::String m_applicationCacheFlatFileSubdirectoryName;
- WTF::String m_diskCacheDirectory;
- WTF::String m_mediaCacheDirectory;
- WTF::String m_indexedDBDatabaseDirectory;
WTF::String m_injectedBundlePath;
- WTF::String m_localStorageDirectory;
- WTF::String m_deviceIdHashSaltsStorageDirectory;
- WTF::String m_webSQLDatabaseDirectory;
- WTF::String m_mediaKeysStorageDirectory;
- WTF::String m_resourceLoadStatisticsDirectory;
Vector<WTF::String> m_customClassesForParameterCoder;
Vector<WTF::String> m_cachePartitionedURLSchemes;
Vector<WTF::String> m_alwaysRevalidatedURLSchemes;
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp (250142 => 250143)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2019-09-20 20:11:50 UTC (rev 250143)
@@ -311,18 +311,6 @@
}
}
-static inline Ref<WebsiteDataStoreConfiguration> websiteDataStoreConfigurationForWebProcessPoolConfiguration(const API::ProcessPoolConfiguration& processPoolconfigurarion)
-{
- auto configuration = WebsiteDataStoreConfiguration::create();
- configuration->setApplicationCacheDirectory(String(processPoolconfigurarion.applicationCacheDirectory()));
- configuration->setNetworkCacheDirectory(String(processPoolconfigurarion.diskCacheDirectory()));
- configuration->setWebSQLDatabaseDirectory(String(processPoolconfigurarion.webSQLDatabaseDirectory()));
- configuration->setLocalStorageDirectory(String(processPoolconfigurarion.localStorageDirectory()));
- configuration->setDeviceIdHashSaltsStorageDirectory(String(processPoolconfigurarion.deviceIdHashSaltsStorageDirectory()));
- configuration->setMediaKeysStorageDirectory(String(processPoolconfigurarion.mediaKeysStorageDirectory()));
- return configuration;
-}
-
static void webkitWebContextConstructed(GObject* object)
{
G_OBJECT_CLASS(webkit_web_context_parent_class)->constructed(object);
@@ -335,22 +323,13 @@
WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object);
WebKitWebContextPrivate* priv = webContext->priv;
- if (priv->websiteDataManager && !webkit_website_data_manager_is_ephemeral(priv->websiteDataManager.get())) {
- configuration.setLocalStorageDirectory(FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_local_storage_directory(priv->websiteDataManager.get())));
- configuration.setDiskCacheDirectory(FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_disk_cache_directory(priv->websiteDataManager.get())), networkCacheSubdirectory));
- configuration.setApplicationCacheDirectory(FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_offline_application_cache_directory(priv->websiteDataManager.get())));
- configuration.setIndexedDBDatabaseDirectory(FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_indexeddb_directory(priv->websiteDataManager.get())));
+ if (!priv->websiteDataManager)
+ priv->websiteDataManager = adoptGRef(webkit_website_data_manager_new("local-storage-directory", priv->localStorageDirectory.data(), nullptr));
+
+ if (!webkit_website_data_manager_is_ephemeral(priv->websiteDataManager.get()))
configuration.setHSTSStorageDirectory(FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_hsts_cache_directory(priv->websiteDataManager.get())));
-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- configuration.setWebSQLDatabaseDirectory(FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_websql_directory(priv->websiteDataManager.get())));
-ALLOW_DEPRECATED_DECLARATIONS_END
- } else if (!priv->localStorageDirectory.isNull())
- configuration.setLocalStorageDirectory(FileSystem::stringFromFileSystemRepresentation(priv->localStorageDirectory.data()));
priv->processPool = WebProcessPool::create(configuration);
-
- if (!priv->websiteDataManager)
- priv->websiteDataManager = adoptGRef(webkitWebsiteDataManagerCreate(websiteDataStoreConfigurationForWebProcessPoolConfiguration(configuration)));
priv->processPool->setPrimaryDataStore(webkitWebsiteDataManagerGetDataStore(priv->websiteDataManager.get()));
webkitWebsiteDataManagerAddProcessPool(priv->websiteDataManager.get(), *priv->processPool);
@@ -1474,12 +1453,9 @@
*
* Deprecated: 2.10. Use webkit_web_context_new_with_website_data_manager() instead.
*/
-void webkit_web_context_set_disk_cache_directory(WebKitWebContext* context, const char* directory)
+void webkit_web_context_set_disk_cache_directory(WebKitWebContext*, const char*)
{
- g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
- g_return_if_fail(directory);
-
- context->priv->processPool->configuration().setDiskCacheDirectory(FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(directory), networkCacheSubdirectory));
+ g_warning("webkit_web_context_set_disk_cache_directory is deprecated and does nothing, use WebKitWebsiteDataManager instead");
}
#endif
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (250142 => 250143)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-09-20 20:11:50 UTC (rev 250143)
@@ -502,9 +502,6 @@
for (auto& scheme : m_urlSchemesRegisteredForCustomProtocols)
parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
- parameters.diskCacheDirectory = m_configuration->diskCacheDirectory();
- if (!parameters.diskCacheDirectory.isEmpty())
- SandboxExtension::createHandleForReadWriteDirectory(parameters.diskCacheDirectory, parameters.diskCacheDirectoryExtensionHandle);
#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
parameters.shouldEnableNetworkCacheSpeculativeRevalidation = m_configuration->diskCacheSpeculativeValidationEnabled();
#endif
@@ -545,12 +542,13 @@
// *********
// IMPORTANT: Do not change the directory structure for indexed databases on disk without first consulting a reviewer from Apple (<rdar://problem/17454712>)
// *********
- parameters.defaultDataStoreParameters.indexedDatabaseDirectory = m_configuration->indexedDBDatabaseDirectory();
- if (parameters.defaultDataStoreParameters.indexedDatabaseDirectory.isEmpty())
+ if (API::WebsiteDataStore::defaultDataStoreExists())
parameters.defaultDataStoreParameters.indexedDatabaseDirectory = API::WebsiteDataStore::defaultDataStore()->websiteDataStore().parameters().indexedDatabaseDirectory;
- SandboxExtension::createHandleForReadWriteDirectory(parameters.defaultDataStoreParameters.indexedDatabaseDirectory, parameters.defaultDataStoreParameters.indexedDatabaseDirectoryExtensionHandle);
- networkProcess->createSymLinkForFileUpgrade(parameters.defaultDataStoreParameters.indexedDatabaseDirectory);
+ if (!parameters.defaultDataStoreParameters.indexedDatabaseDirectory.isEmpty()) {
+ SandboxExtension::createHandleForReadWriteDirectory(parameters.defaultDataStoreParameters.indexedDatabaseDirectory, parameters.defaultDataStoreParameters.indexedDatabaseDirectoryExtensionHandle);
+ networkProcess->createSymLinkForFileUpgrade(parameters.defaultDataStoreParameters.indexedDatabaseDirectory);
+ }
#endif
#if ENABLE(SERVICE_WORKER)
@@ -769,11 +767,6 @@
void WebProcessPool::resolvePathsForSandboxExtensions()
{
m_resolvedPaths.injectedBundlePath = resolvePathForSandboxExtension(injectedBundlePath());
- m_resolvedPaths.applicationCacheDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration->applicationCacheDirectory());
- m_resolvedPaths.webSQLDatabaseDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration->webSQLDatabaseDirectory());
- m_resolvedPaths.mediaCacheDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration->mediaCacheDirectory());
- m_resolvedPaths.mediaKeyStorageDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration->mediaKeysStorageDirectory());
- m_resolvedPaths.indexedDatabaseDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration->indexedDBDatabaseDirectory());
m_resolvedPaths.additionalWebProcessSandboxExtensionPaths.reserveCapacity(m_configuration->additionalReadAccessAllowedPaths().size());
for (const auto& path : m_configuration->additionalReadAccessAllowedPaths())
@@ -850,37 +843,23 @@
websiteDataStore.resolveDirectoriesIfNecessary();
String applicationCacheDirectory = websiteDataStore.resolvedApplicationCacheDirectory();
- if (applicationCacheDirectory.isEmpty())
- applicationCacheDirectory = m_resolvedPaths.applicationCacheDirectory;
-
SandboxExtension::Handle applicationCacheDirectoryExtensionHandle;
if (!applicationCacheDirectory.isEmpty())
SandboxExtension::createHandleWithoutResolvingPath(applicationCacheDirectory, SandboxExtension::Type::ReadWrite, applicationCacheDirectoryExtensionHandle);
String applicationCacheFlatFileSubdirectoryName = websiteDataStore.applicationCacheFlatFileSubdirectoryName();
- if (applicationCacheFlatFileSubdirectoryName.isEmpty())
- applicationCacheFlatFileSubdirectoryName = m_configuration->applicationCacheFlatFileSubdirectoryName();
String webSQLDatabaseDirectory = websiteDataStore.resolvedDatabaseDirectory();
- if (webSQLDatabaseDirectory.isEmpty())
- webSQLDatabaseDirectory = m_resolvedPaths.webSQLDatabaseDirectory;
-
SandboxExtension::Handle webSQLDatabaseDirectoryExtensionHandle;
if (!webSQLDatabaseDirectory.isEmpty())
SandboxExtension::createHandleWithoutResolvingPath(webSQLDatabaseDirectory, SandboxExtension::Type::ReadWrite, webSQLDatabaseDirectoryExtensionHandle);
String mediaCacheDirectory = websiteDataStore.resolvedMediaCacheDirectory();
- if (mediaCacheDirectory.isEmpty())
- mediaCacheDirectory = m_resolvedPaths.mediaCacheDirectory;
-
SandboxExtension::Handle mediaCacheDirectoryExtensionHandle;
if (!mediaCacheDirectory.isEmpty())
SandboxExtension::createHandleWithoutResolvingPath(mediaCacheDirectory, SandboxExtension::Type::ReadWrite, mediaCacheDirectoryExtensionHandle);
String mediaKeyStorageDirectory = websiteDataStore.resolvedMediaKeysDirectory();
- if (mediaKeyStorageDirectory.isEmpty())
- mediaKeyStorageDirectory = m_resolvedPaths.mediaKeyStorageDirectory;
-
SandboxExtension::Handle mediaKeyStorageDirectoryExtensionHandle;
if (!mediaKeyStorageDirectory.isEmpty())
SandboxExtension::createHandleWithoutResolvingPath(mediaKeyStorageDirectory, SandboxExtension::Type::ReadWrite, mediaKeyStorageDirectoryExtensionHandle);
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (250142 => 250143)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.h 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h 2019-09-20 20:11:50 UTC (rev 250143)
@@ -764,12 +764,7 @@
struct Paths {
String injectedBundlePath;
- String applicationCacheDirectory;
- String webSQLDatabaseDirectory;
- String mediaCacheDirectory;
- String mediaKeyStorageDirectory;
String uiProcessBundleResourcePath;
- String indexedDatabaseDirectory;
#if PLATFORM(IOS_FAMILY)
String cookieStorageDirectory;
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (250142 => 250143)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2019-09-20 20:11:50 UTC (rev 250143)
@@ -1754,7 +1754,7 @@
}
if (processPools.isEmpty() && count && ensureAPoolExists) {
- auto processPool = WebProcessPool::create(API::ProcessPoolConfiguration::createWithWebsiteDataStoreConfiguration(m_configuration));
+ auto processPool = WebProcessPool::create(API::ProcessPoolConfiguration::create());
processPools.add(processPool.ptr());
}
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h (250142 => 250143)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h 2019-09-20 20:10:37 UTC (rev 250142)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h 2019-09-20 20:11:50 UTC (rev 250143)
@@ -116,7 +116,7 @@
uint64_t m_perOriginStorageQuota { WebCore::StorageQuotaManager::defaultQuota() };
String m_networkCacheDirectory;
String m_applicationCacheDirectory;
- String m_applicationCacheFlatFileSubdirectoryName;
+ String m_applicationCacheFlatFileSubdirectoryName { "Files"_s };
String m_mediaCacheDirectory;
String m_indexedDBDatabaseDirectory;
String m_serviceWorkerRegistrationDirectory;
