Attachment 347570 Details for Bug 188765 – Patch

[patch] Patch

bug-188765-20180820165049.patch (text/plain), 21.97 KB, created by Sihui Liu on 2018-08-20 16:50:49 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2018-08-20 16:50:49 PDT

Size: 21.97 KB

patch

obsolete

>Subversion Revision: 235087
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 25a94ff4ebb013ef42ff78e9bdd179edd2dbfa97..5340681204ce5829495e3c47ce3f2a0a7c19106e 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,35 @@
>+2018-08-20  Sihui Liu  <sihui_liu@apple.com>
>+
>+        Move legacy directory configuration from WebProcessPool to API::WebsiteDataStore
>+        https://bugs.webkit.org/show_bug.cgi?id=188765
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/APIProcessPoolConfiguration.cpp:
>+        (API::ProcessPoolConfiguration::createWithLegacyOptions):
>+        (API::ProcessPoolConfiguration::createWithWebsiteDataStoreConfiguration):
>+        * UIProcess/API/APIWebsiteDataStore.h:
>+        * UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm:
>+        (API::WebsiteDataStore::legacyDefaultApplicationCacheDirectory):
>+        (API::WebsiteDataStore::legacyDefaultNetworkCacheDirectory):
>+        (API::WebsiteDataStore::legacyDefaultWebSQLDatabaseDirectory):
>+        (API::WebsiteDataStore::legacyDefaultIndexedDBDatabaseDirectory):
>+        (API::WebsiteDataStore::legacyDefaultLocalStorageDirectory):
>+        (API::WebsiteDataStore::legacyDefaultMediaCacheDirectory):
>+        (API::WebsiteDataStore::legacyDefaultMediaKeysStorageDirectory):
>+        (API::WebsiteDataStore::legacyDefaultJavaScriptConfigurationDirectory):
>+        (API::WebsiteDataStore::legacyDefaultDataStoreConfiguration):
>+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
>+        (WebKit::WebProcessPool::legacyPlatformDefaultWebSQLDatabaseDirectory): Deleted.
>+        (WebKit::WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory): Deleted.
>+        (WebKit::WebProcessPool::legacyPlatformDefaultLocalStorageDirectory): Deleted.
>+        (WebKit::WebProcessPool::legacyPlatformDefaultMediaCacheDirectory): Deleted.
>+        (WebKit::WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory): Deleted.
>+        (WebKit::WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory): Deleted.
>+        (WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory): Deleted.
>+        (WebKit::WebProcessPool::legacyPlatformDefaultJavaScriptConfigurationDirectory): Deleted.
>+        * UIProcess/WebProcessPool.h:
>+
> 2018-08-20  Eric Carlson  <eric.carlson@apple.com>
> 
>         [MediaStream] Move capture device monitoring to WebKit
>diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
>index af167de4f9a62b37ab06959a78f7499071568b27..14fa8d6c04f82be40888034fc916bf3c51548d4c 100644
>--- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
>+++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
>@@ -38,22 +38,12 @@ Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::create()
> 
> Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::createWithLegacyOptions()
> {
>-    auto configuration = ProcessPoolConfiguration::create();
>+    auto configuration = ProcessPoolConfiguration::createWithWebsiteDataStoreConfiguration(WebsiteDataStore::legacyDefaultDataStoreConfiguration());
> 
>     configuration->m_shouldHaveLegacyDataStore = true;
>     configuration->m_maximumProcessCount = 1;
>     configuration->m_cacheModel = WebKit::CacheModelDocumentViewer;
> 
>-    configuration->m_applicationCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory();
>-    configuration->m_applicationCacheFlatFileSubdirectoryName = "ApplicationCache";
>-    configuration->m_diskCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory();
>-    configuration->m_mediaCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultMediaCacheDirectory();
>-    configuration->m_indexedDBDatabaseDirectory = WebKit::WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory();
>-    configuration->m_localStorageDirectory = WebKit::WebProcessPool::legacyPlatformDefaultLocalStorageDirectory();
>-    configuration->m_mediaKeysStorageDirectory = WebKit::WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory();
>-    configuration->m_webSQLDatabaseDirectory = WebKit::WebProcessPool::legacyPlatformDefaultWebSQLDatabaseDirectory();
>-    configuration->m_javaScriptConfigurationDirectory = WebKit::WebProcessPool::legacyPlatformDefaultJavaScriptConfigurationDirectory();
>-
>     return configuration;
> }
> 
>@@ -65,7 +55,7 @@ Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::createWithWebsiteDataSto
>     configuration->m_applicationCacheFlatFileSubdirectoryName = legacyConfiguration.applicationCacheFlatFileSubdirectoryName;
>     configuration->m_diskCacheDirectory = legacyConfiguration.networkCacheDirectory;
>     configuration->m_mediaCacheDirectory = legacyConfiguration.mediaCacheDirectory;
>-    configuration->m_indexedDBDatabaseDirectory = WebKit::WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory();
>+    configuration->m_indexedDBDatabaseDirectory = WebsiteDataStore::legacyDefaultIndexedDBDatabaseDirectory();
>     configuration->m_localStorageDirectory = legacyConfiguration.localStorageDirectory;
>     configuration->m_mediaKeysStorageDirectory = legacyConfiguration.mediaKeysStorageDirectory;
>     configuration->m_resourceLoadStatisticsDirectory = legacyConfiguration.resourceLoadStatisticsDirectory;
>diff --git a/Source/WebKit/UIProcess/API/APIWebsiteDataStore.h b/Source/WebKit/UIProcess/API/APIWebsiteDataStore.h
>index 768555d8a90629b33232862d7f7b463438fd143a..bfcbecf617eb16dd897bf6596d19d4dec2e07b0d 100644
>--- a/Source/WebKit/UIProcess/API/APIWebsiteDataStore.h
>+++ b/Source/WebKit/UIProcess/API/APIWebsiteDataStore.h
>@@ -57,18 +57,27 @@ public:
>     static String defaultCacheStorageDirectory();
>     static String defaultNetworkCacheDirectory();
>     static String defaultMediaCacheDirectory();
>-
>     static String defaultIndexedDBDatabaseDirectory();
>     static String defaultServiceWorkerRegistrationDirectory();
>     static String defaultLocalStorageDirectory();
>     static String defaultMediaKeysStorageDirectory();
>     static String defaultWebSQLDatabaseDirectory();
>     static String defaultResourceLoadStatisticsDirectory();
>-
>     static String defaultJavaScriptConfigurationDirectory();
> 
>     static WebKit::WebsiteDataStore::Configuration defaultDataStoreConfiguration();
> 
>+    static String legacyDefaultApplicationCacheDirectory();
>+    static String legacyDefaultNetworkCacheDirectory();
>+    static String legacyDefaultLocalStorageDirectory();
>+    static String legacyDefaultIndexedDBDatabaseDirectory();
>+    static String legacyDefaultWebSQLDatabaseDirectory();
>+    static String legacyDefaultMediaKeysStorageDirectory();
>+    static String legacyDefaultMediaCacheDirectory();
>+    static String legacyDefaultJavaScriptConfigurationDirectory();
>+
>+    static WebKit::WebsiteDataStore::Configuration legacyDefaultDataStoreConfiguration();
>+
> private:
>     enum ShouldCreateDirectory { CreateDirectory, DontCreateDirectory };
> 
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm b/Source/WebKit/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
>index 14c5e36f2ffe64aa23359ea56bb0499bbb516208..965b1dc4e5c4686c74789adae7ebae6f4bc4bb48 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
>@@ -29,12 +29,20 @@
> #include "SandboxExtension.h"
> #include "SandboxUtilities.h"
> 
>+#include <Foundation/Foundation.h>
>+#include <WebCore/FileSystem.h>
>+
> #if PLATFORM(IOS)
> #import <WebCore/RuntimeApplicationChecks.h>
> #endif
> 
> namespace API {
> 
>+NSString *WebDatabaseDirectoryDefaultsKey = @"WebDatabaseDirectory";
>+NSString *WebStorageDirectoryDefaultsKey = @"WebKitLocalStorageDatabasePathPreferenceKey";
>+NSString *WebKitMediaCacheDirectoryDefaultsKey = @"WebKitMediaCacheDirectory";
>+NSString *WebKitMediaKeysStorageDirectoryDefaultsKey = @"WebKitMediaKeysStorageDirectory";
>+
> String WebsiteDataStore::defaultApplicationCacheDirectory()
> {
> #if PLATFORM(IOS)
>@@ -102,6 +110,113 @@ String WebsiteDataStore::defaultJavaScriptConfigurationDirectory()
>     return tempDirectoryFileSystemRepresentation("JavaScriptCoreDebug", DontCreateDirectory);
> }
> 
>+String WebsiteDataStore::legacyDefaultApplicationCacheDirectory()
>+{
>+    NSString *appName = [[NSBundle mainBundle] bundleIdentifier];
>+    if (!appName)
>+        appName = [[NSProcessInfo processInfo] processName];
>+#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.
>+    if (IOSApplication::isMobileSafari() || IOSApplication::isWebApp())
>+        appName = @"com.apple.WebAppCache";
>+#endif
>+    
>+    ASSERT(appName);
>+    
>+#if PLATFORM(IOS)
>+    NSString *cacheDir = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches"];
>+#else
>+    char cacheDirectory[MAXPATHLEN];
>+    size_t cacheDirectoryLen = confstr(_CS_DARWIN_USER_CACHE_DIR, cacheDirectory, MAXPATHLEN);
>+    if (!cacheDirectoryLen)
>+        return String();
>+    
>+    NSString *cacheDir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:cacheDirectory length:cacheDirectoryLen - 1];
>+#endif
>+    NSString* cachePath = [cacheDir stringByAppendingPathComponent:appName];
>+    return WebKit::stringByResolvingSymlinksInPath([cachePath stringByStandardizingPath]);
>+}
>+
>+String WebsiteDataStore::legacyDefaultNetworkCacheDirectory()
>+{
>+    NSString *cachePath = CFBridgingRelease(_CFURLCacheCopyCacheDirectory([[NSURLCache sharedURLCache] _CFURLCache]));
>+    if (!cachePath)
>+        cachePath = @"~/Library/Caches/com.apple.WebKit.WebProcess";
>+    
>+    cachePath = [cachePath stringByAppendingPathComponent:@"WebKitCache"];
>+    
>+    return WebKit::stringByResolvingSymlinksInPath([cachePath stringByStandardizingPath]);
>+}
>+
>+String WebsiteDataStore::legacyDefaultWebSQLDatabaseDirectory()
>+{
>+    NSString *databasesDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebDatabaseDirectoryDefaultsKey];
>+    if (!databasesDirectory || ![databasesDirectory isKindOfClass:[NSString class]])
>+        databasesDirectory = @"~/Library/WebKit/Databases";
>+    return WebKit::stringByResolvingSymlinksInPath([databasesDirectory stringByStandardizingPath]);
>+}
>+
>+String WebsiteDataStore::legacyDefaultIndexedDBDatabaseDirectory()
>+{
>+    // Indexed databases exist in a subdirectory of the "database directory path."
>+    // Currently, the top level of that directory contains entities related to WebSQL databases.
>+    // We should fix this, and move WebSQL into a subdirectory (https://bugs.webkit.org/show_bug.cgi?id=124807)
>+    // In the meantime, an entity name prefixed with three underscores will not conflict with any WebSQL entities.
>+    return WebCore::FileSystem::pathByAppendingComponent(legacyDefaultWebSQLDatabaseDirectory(), "___IndexedDB");
>+}
>+
>+String WebsiteDataStore::legacyDefaultLocalStorageDirectory()
>+{
>+    NSString *localStorageDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebStorageDirectoryDefaultsKey];
>+    if (!localStorageDirectory || ![localStorageDirectory isKindOfClass:[NSString class]])
>+        localStorageDirectory = @"~/Library/WebKit/LocalStorage";
>+    return WebKit::stringByResolvingSymlinksInPath([localStorageDirectory stringByStandardizingPath]);
>+}
>+
>+String WebsiteDataStore::legacyDefaultMediaCacheDirectory()
>+{
>+    NSString *mediaKeysCacheDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebKitMediaCacheDirectoryDefaultsKey];
>+    if (!mediaKeysCacheDirectory || ![mediaKeysCacheDirectory isKindOfClass:[NSString class]]) {
>+        mediaKeysCacheDirectory = NSTemporaryDirectory();
>+        
>+        if (!WebKit::processHasContainer()) {
>+            NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
>+            if (!bundleIdentifier)
>+                bundleIdentifier = [NSProcessInfo processInfo].processName;
>+            mediaKeysCacheDirectory = [mediaKeysCacheDirectory stringByAppendingPathComponent:bundleIdentifier];
>+        }
>+        mediaKeysCacheDirectory = [mediaKeysCacheDirectory stringByAppendingPathComponent:@"WebKit/MediaCache"];
>+    }
>+    return WebKit::stringByResolvingSymlinksInPath([mediaKeysCacheDirectory stringByStandardizingPath]);
>+}
>+
>+String WebsiteDataStore::legacyDefaultMediaKeysStorageDirectory()
>+{
>+    NSString *mediaKeysStorageDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebKitMediaKeysStorageDirectoryDefaultsKey];
>+    if (!mediaKeysStorageDirectory || ![mediaKeysStorageDirectory isKindOfClass:[NSString class]])
>+        mediaKeysStorageDirectory = @"~/Library/WebKit/MediaKeys";
>+    return WebKit::stringByResolvingSymlinksInPath([mediaKeysStorageDirectory stringByStandardizingPath]);
>+}
>+
>+String WebsiteDataStore::legacyDefaultJavaScriptConfigurationDirectory()
>+{
>+#if PLATFORM(IOS)
>+    String path = pathForProcessContainer();
>+    if (path.isEmpty())
>+        path = NSHomeDirectory();
>+    
>+    path = path + "/Library/WebKit/JavaScriptCoreDebug";
>+    path = stringByResolvingSymlinksInPath(path);
>+    
>+    return path;
>+#else
>+    RetainPtr<NSString> javaScriptConfigPath = @"~/Library/WebKit/JavaScriptCoreDebug";
>+    
>+    return WebKit::stringByResolvingSymlinksInPath([javaScriptConfigPath stringByStandardizingPath]);
>+#endif
>+}
>+
> String WebsiteDataStore::tempDirectoryFileSystemRepresentation(const String& directoryName, ShouldCreateDirectory shouldCreateDirectory)
> {
>     static dispatch_once_t onceToken;
>@@ -209,4 +324,19 @@ WebKit::WebsiteDataStore::Configuration WebsiteDataStore::defaultDataStoreConfig
>     return configuration;
> }
> 
>+WebKit::WebsiteDataStore::Configuration WebsiteDataStore::legacyDefaultDataStoreConfiguration()
>+{
>+    WebKit::WebsiteDataStore::Configuration configuration;
>+    configuration.applicationCacheDirectory = legacyDefaultApplicationCacheDirectory();
>+    configuration.applicationCacheFlatFileSubdirectoryName = "ApplicationCache";
>+    configuration.networkCacheDirectory = legacyDefaultNetworkCacheDirectory();
>+    configuration.mediaCacheDirectory = legacyDefaultMediaCacheDirectory();
>+    configuration.mediaKeysStorageDirectory = legacyDefaultMediaKeysStorageDirectory();
>+    configuration.indexedDBDatabaseDirectory = legacyDefaultIndexedDBDatabaseDirectory();
>+    configuration.webSQLDatabaseDirectory = legacyDefaultWebSQLDatabaseDirectory();
>+    configuration.javaScriptConfigurationDirectory = legacyDefaultJavaScriptConfigurationDirectory();
>+    
>+    return configuration;
> }
>+
>+} // namespace API
>diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
>index 232273f7655e0cc538b95bd57cedf23d698319a6..e19f04dd3d82949c7d4a9a1935a7d2ddbcd531d1 100644
>--- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
>@@ -62,14 +62,10 @@
> 
> using namespace WebCore;
> 
>-NSString *WebDatabaseDirectoryDefaultsKey = @"WebDatabaseDirectory";
> NSString *WebServiceWorkerRegistrationDirectoryDefaultsKey = @"WebServiceWorkerRegistrationDirectory";
> NSString *WebKitLocalCacheDefaultsKey = @"WebKitLocalCache";
>-NSString *WebStorageDirectoryDefaultsKey = @"WebKitLocalStorageDatabasePathPreferenceKey";
> NSString *WebKitJSCJITEnabledDefaultsKey = @"WebKitJSCJITEnabledDefaultsKey";
> NSString *WebKitJSCFTLJITEnabledDefaultsKey = @"WebKitJSCFTLJITEnabledDefaultsKey";
>-NSString *WebKitMediaKeysStorageDirectoryDefaultsKey = @"WebKitMediaKeysStorageDirectory";
>-NSString *WebKitMediaCacheDirectoryDefaultsKey = @"WebKitMediaCacheDirectory";
> 
> #if !PLATFORM(IOS)
> static NSString *WebKitApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification = @"NSApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification";
>@@ -393,121 +389,6 @@ String WebProcessPool::containerTemporaryDirectory() const
> }
> #endif
> 
>-String WebProcessPool::legacyPlatformDefaultWebSQLDatabaseDirectory()
>-{
>-    registerUserDefaultsIfNeeded();
>-
>-    NSString *databasesDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebDatabaseDirectoryDefaultsKey];
>-    if (!databasesDirectory || ![databasesDirectory isKindOfClass:[NSString class]])
>-        databasesDirectory = @"~/Library/WebKit/Databases";
>-    return stringByResolvingSymlinksInPath([databasesDirectory stringByStandardizingPath]);
>-}
>-
>-String WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory()
>-{
>-    // Indexed databases exist in a subdirectory of the "database directory path."
>-    // Currently, the top level of that directory contains entities related to WebSQL databases.
>-    // We should fix this, and move WebSQL into a subdirectory (https://bugs.webkit.org/show_bug.cgi?id=124807)
>-    // In the meantime, an entity name prefixed with three underscores will not conflict with any WebSQL entities.
>-    return FileSystem::pathByAppendingComponent(legacyPlatformDefaultWebSQLDatabaseDirectory(), "___IndexedDB");
>-}
>-
>-String WebProcessPool::legacyPlatformDefaultLocalStorageDirectory()
>-{
>-    registerUserDefaultsIfNeeded();
>-
>-    NSString *localStorageDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebStorageDirectoryDefaultsKey];
>-    if (!localStorageDirectory || ![localStorageDirectory isKindOfClass:[NSString class]])
>-        localStorageDirectory = @"~/Library/WebKit/LocalStorage";
>-    return stringByResolvingSymlinksInPath([localStorageDirectory stringByStandardizingPath]);
>-}
>-
>-String WebProcessPool::legacyPlatformDefaultMediaCacheDirectory()
>-{
>-    registerUserDefaultsIfNeeded();
>-    
>-    NSString *mediaKeysCacheDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebKitMediaCacheDirectoryDefaultsKey];
>-    if (!mediaKeysCacheDirectory || ![mediaKeysCacheDirectory isKindOfClass:[NSString class]]) {
>-        mediaKeysCacheDirectory = NSTemporaryDirectory();
>-        
>-        if (!WebKit::processHasContainer()) {
>-            NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
>-            if (!bundleIdentifier)
>-                bundleIdentifier = [NSProcessInfo processInfo].processName;
>-            mediaKeysCacheDirectory = [mediaKeysCacheDirectory stringByAppendingPathComponent:bundleIdentifier];
>-        }
>-        mediaKeysCacheDirectory = [mediaKeysCacheDirectory stringByAppendingPathComponent:@"WebKit/MediaCache"];
>-    }
>-    return stringByResolvingSymlinksInPath([mediaKeysCacheDirectory stringByStandardizingPath]);
>-}
>-
>-String WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory()
>-{
>-    registerUserDefaultsIfNeeded();
>-
>-    NSString *mediaKeysStorageDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebKitMediaKeysStorageDirectoryDefaultsKey];
>-    if (!mediaKeysStorageDirectory || ![mediaKeysStorageDirectory isKindOfClass:[NSString class]])
>-        mediaKeysStorageDirectory = @"~/Library/WebKit/MediaKeys";
>-    return stringByResolvingSymlinksInPath([mediaKeysStorageDirectory stringByStandardizingPath]);
>-}
>-
>-String WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory()
>-{
>-    NSString *appName = [[NSBundle mainBundle] bundleIdentifier];
>-    if (!appName)
>-        appName = [[NSProcessInfo processInfo] processName];
>-#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.
>-    if (IOSApplication::isMobileSafari() || IOSApplication::isWebApp())
>-        appName = @"com.apple.WebAppCache";
>-#endif
>-
>-    ASSERT(appName);
>-
>-#if PLATFORM(IOS)
>-    NSString *cacheDir = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches"];
>-#else
>-    char cacheDirectory[MAXPATHLEN];
>-    size_t cacheDirectoryLen = confstr(_CS_DARWIN_USER_CACHE_DIR, cacheDirectory, MAXPATHLEN);
>-    if (!cacheDirectoryLen)
>-        return String();
>-
>-    NSString *cacheDir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:cacheDirectory length:cacheDirectoryLen - 1];
>-#endif
>-    NSString* cachePath = [cacheDir stringByAppendingPathComponent:appName];
>-    return stringByResolvingSymlinksInPath([cachePath stringByStandardizingPath]);
>-}
>-
>-String WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory()
>-{
>-    NSString *cachePath = CFBridgingRelease(_CFURLCacheCopyCacheDirectory([[NSURLCache sharedURLCache] _CFURLCache]));
>-    if (!cachePath)
>-        cachePath = @"~/Library/Caches/com.apple.WebKit.WebProcess";
>-
>-    cachePath = [cachePath stringByAppendingPathComponent:@"WebKitCache"];
>-
>-    return stringByResolvingSymlinksInPath([cachePath stringByStandardizingPath]);
>-}
>-
>-String WebProcessPool::legacyPlatformDefaultJavaScriptConfigurationDirectory()
>-{
>-#if PLATFORM(IOS)
>-    String path = pathForProcessContainer();
>-    if (path.isEmpty())
>-        path = NSHomeDirectory();
>-    
>-    path = path + "/Library/WebKit/JavaScriptCoreDebug";
>-    path = stringByResolvingSymlinksInPath(path);
>-
>-    return path;
>-#else
>-    RetainPtr<NSString> javaScriptConfigPath = @"~/Library/WebKit/JavaScriptCoreDebug";
>-    
>-    return stringByResolvingSymlinksInPath([javaScriptConfigPath stringByStandardizingPath]);
>-#endif
>-}
>-
> #if PLATFORM(IOS)
> void WebProcessPool::setJavaScriptConfigurationFileEnabledFromDefaults()
> {
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.h b/Source/WebKit/UIProcess/WebProcessPool.h
>index 25cc4d420c2e6f9acfea8b5e4cd81dcad66a47d8..8f002fa84f5fe47f5bf32bc300aef73e04600055 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.h
>+++ b/Source/WebKit/UIProcess/WebProcessPool.h
>@@ -417,16 +417,6 @@ public:
>         return m_hiddenPageThrottlingAutoIncreasesCounter.count();
>     }
> 
>-    // FIXME: Move these to API::WebsiteDataStore.
>-    static String legacyPlatformDefaultLocalStorageDirectory();
>-    static String legacyPlatformDefaultIndexedDBDatabaseDirectory();
>-    static String legacyPlatformDefaultWebSQLDatabaseDirectory();
>-    static String legacyPlatformDefaultMediaKeysStorageDirectory();
>-    static String legacyPlatformDefaultMediaCacheDirectory();
>-    static String legacyPlatformDefaultApplicationCacheDirectory();
>-    static String legacyPlatformDefaultNetworkCacheDirectory();
>-    static String legacyPlatformDefaultJavaScriptConfigurationDirectory();
>-
>     void setResourceLoadStatisticsEnabled(bool);
>     void clearResourceLoadStatistics();
>

Actions: View | Formatted Diff | Diff

Attachments on bug 188765: 347570 | 347656 | 347663 | 347680 | 347691 | 347722 | 347759 | 347813 | 347942