Title: [185248] trunk/Source/WebKit2
- Revision
- 185248
- Author
- ander...@apple.com
- Date
- 2015-06-05 09:50:51 -0700 (Fri, 05 Jun 2015)
Log Message
Consolidate default website data directory computations
https://bugs.webkit.org/show_bug.cgi?id=145698
Reviewed by Andreas Kling.
* UIProcess/API/APIProcessPoolConfiguration.cpp:
(API::ProcessPoolConfiguration::ProcessPoolConfiguration):
* UIProcess/API/APIWebsiteDataStore.h:
* UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm:
(API::WebsiteDataStore::defaultApplicationCacheDirectory):
(API::WebsiteDataStore::defaultNetworkCacheDirectory):
(API::WebsiteDataStore::defaultIndexedDBDatabaseDirectory):
(API::WebsiteDataStore::defaultLocalStorageDirectory):
(API::WebsiteDataStore::defaultMediaKeysStorageDirectory):
(API::WebsiteDataStore::defaultWebSQLDatabaseDirectory):
(API::WebsiteDataStore::defaultDataStoreConfiguration):
(API::applicationCacheDirectory): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185247 => 185248)
--- trunk/Source/WebKit2/ChangeLog 2015-06-05 16:19:26 UTC (rev 185247)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-05 16:50:51 UTC (rev 185248)
@@ -1,3 +1,23 @@
+2015-06-05 Anders Carlsson <ander...@apple.com>
+
+ Consolidate default website data directory computations
+ https://bugs.webkit.org/show_bug.cgi?id=145698
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/API/APIProcessPoolConfiguration.cpp:
+ (API::ProcessPoolConfiguration::ProcessPoolConfiguration):
+ * UIProcess/API/APIWebsiteDataStore.h:
+ * UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm:
+ (API::WebsiteDataStore::defaultApplicationCacheDirectory):
+ (API::WebsiteDataStore::defaultNetworkCacheDirectory):
+ (API::WebsiteDataStore::defaultIndexedDBDatabaseDirectory):
+ (API::WebsiteDataStore::defaultLocalStorageDirectory):
+ (API::WebsiteDataStore::defaultMediaKeysStorageDirectory):
+ (API::WebsiteDataStore::defaultWebSQLDatabaseDirectory):
+ (API::WebsiteDataStore::defaultDataStoreConfiguration):
+ (API::applicationCacheDirectory): Deleted.
+
2015-06-01 Jon Honeycutt <jhoneyc...@apple.com>
[iOS] Uploading an animated GIF from the photo library uploads a JPEG
Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (185247 => 185248)
--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-06-05 16:19:26 UTC (rev 185247)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-06-05 16:50:51 UTC (rev 185248)
@@ -53,10 +53,10 @@
}
ProcessPoolConfiguration::ProcessPoolConfiguration()
- : m_indexedDBDatabaseDirectory(WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation("IndexedDB"))
- , m_localStorageDirectory(WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation("LocalStorage"))
- , m_webSQLDatabaseDirectory(WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation("WebSQL"))
- , m_mediaKeysStorageDirectory(WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation("MediaKeys"))
+ : m_indexedDBDatabaseDirectory(WebsiteDataStore::defaultIndexedDBDatabaseDirectory())
+ , m_localStorageDirectory(WebsiteDataStore::defaultLocalStorageDirectory())
+ , m_webSQLDatabaseDirectory(WebsiteDataStore::defaultWebSQLDatabaseDirectory())
+ , m_mediaKeysStorageDirectory(WebsiteDataStore::defaultMediaKeysStorageDirectory())
{
}
Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h (185247 => 185248)
--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h 2015-06-05 16:19:26 UTC (rev 185247)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h 2015-06-05 16:50:51 UTC (rev 185248)
@@ -44,13 +44,21 @@
WebKit::WebsiteDataStore& websiteDataStore() { return *m_websiteDataStore; }
- static String cacheDirectoryFileSystemRepresentation(const String& directoryName);
- static String websiteDataDirectoryFileSystemRepresentation(const String& directoryName);
+ static String defaultApplicationCacheDirectory();
+ static String defaultNetworkCacheDirectory();
+ static String defaultIndexedDBDatabaseDirectory();
+ static String defaultLocalStorageDirectory();
+ static String defaultMediaKeysStorageDirectory();
+ static String defaultWebSQLDatabaseDirectory();
+
private:
WebsiteDataStore(WebKit::WebsiteDataStore::Configuration);
WebsiteDataStore();
+ static String cacheDirectoryFileSystemRepresentation(const String& directoryName);
+ static String websiteDataDirectoryFileSystemRepresentation(const String& directoryName);
+
static WebKit::WebsiteDataStore::Configuration defaultDataStoreConfiguration();
RefPtr<WebKit::WebsiteDataStore> m_websiteDataStore;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm (185247 => 185248)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm 2015-06-05 16:19:26 UTC (rev 185247)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm 2015-06-05 16:50:51 UTC (rev 185248)
@@ -35,6 +35,48 @@
namespace API {
+String WebsiteDataStore::defaultApplicationCacheDirectory()
+{
+#if PLATFORM(IOS)
+ // This quirk used to make these apps share application cache storage, but doesn't accomplish that any more.
+ // Preserving it avoids the need to migrate data when upgrading.
+ // FIXME: Ideally we should just have Safari and WebApp create a data store with
+ // this application cache path, but that's not supported as of right now.
+ if (WebCore::applicationIsMobileSafari() || WebCore::applicationIsWebApp()) {
+ NSString *cachePath = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches/com.apple.WebAppCache"];
+
+ return WebKit::stringByResolvingSymlinksInPath(cachePath.stringByStandardizingPath);
+ }
+#endif
+
+ return cacheDirectoryFileSystemRepresentation("OfflineWebApplicationCache");
+}
+
+String WebsiteDataStore::defaultNetworkCacheDirectory()
+{
+ return cacheDirectoryFileSystemRepresentation("NetworkCache");
+}
+
+String WebsiteDataStore::defaultIndexedDBDatabaseDirectory()
+{
+ return cacheDirectoryFileSystemRepresentation("IndexedDB");
+}
+
+String WebsiteDataStore::defaultLocalStorageDirectory()
+{
+ return websiteDataDirectoryFileSystemRepresentation("LocalStorage");
+}
+
+String WebsiteDataStore::defaultMediaKeysStorageDirectory()
+{
+ return websiteDataDirectoryFileSystemRepresentation("MediaKeys");
+}
+
+String WebsiteDataStore::defaultWebSQLDatabaseDirectory()
+{
+ return websiteDataDirectoryFileSystemRepresentation("WebSQL");
+}
+
String WebsiteDataStore::cacheDirectoryFileSystemRepresentation(const String& directoryName)
{
static dispatch_once_t onceToken;
@@ -91,33 +133,16 @@
return url.absoluteURL.path.fileSystemRepresentation;
}
-static String applicationCacheDirectory()
-{
-#if PLATFORM(IOS)
- // This quirk used to make these apps share application cache storage, but doesn't accomplish that any more.
- // Preserving it avoids the need to migrate data when upgrading.
- // FIXME: Ideally we should just have Safari and WebApp create a data store with
- // this application cache path, but that's not supported as of right now.
- if (WebCore::applicationIsMobileSafari() || WebCore::applicationIsWebApp()) {
- NSString *cachePath = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches/com.apple.WebAppCache"];
-
- return WebKit::stringByResolvingSymlinksInPath(cachePath.stringByStandardizingPath);
- }
-#endif
-
- return WebsiteDataStore::cacheDirectoryFileSystemRepresentation("OfflineWebApplicationCache");
-}
-
WebKit::WebsiteDataStore::Configuration WebsiteDataStore::defaultDataStoreConfiguration()
{
WebKit::WebsiteDataStore::Configuration configuration;
- configuration.networkCacheDirectory = cacheDirectoryFileSystemRepresentation("NetworkCache");
- configuration.applicationCacheDirectory = applicationCacheDirectory();
+ configuration.applicationCacheDirectory = defaultApplicationCacheDirectory();
+ configuration.networkCacheDirectory = defaultNetworkCacheDirectory();
- configuration.webSQLDatabaseDirectory = websiteDataDirectoryFileSystemRepresentation("WebSQL");
- configuration.localStorageDirectory = websiteDataDirectoryFileSystemRepresentation("LocalStorage");
- configuration.mediaKeysStorageDirectory = websiteDataDirectoryFileSystemRepresentation("MediaKeys");
+ configuration.webSQLDatabaseDirectory = defaultWebSQLDatabaseDirectory();
+ configuration.localStorageDirectory = defaultLocalStorageDirectory();
+ configuration.mediaKeysStorageDirectory = defaultMediaKeysStorageDirectory();
return configuration;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
