Changeset 249622 in webkit


Ignore:
Timestamp:
Sep 7, 2019, 7:29:11 PM (6 years ago)
Author:
achristensen@apple.com
Message:

Remove WebsiteDataStore::legacyDefaultDataStoreConfiguration
​https://bugs.webkit.org/show_bug.cgi?id=200054

Reviewed by Carlos Garcia Campos.

Source/WebKit:

Its last needed use was removed in rdar://problem/47030981
This changes WKContextConfigurationCreateWithLegacyOptions to be equal to WKContextConfigurationCreate,
but it has no remaining clients so it is only being retained for binary compabibility.
This also changes WKContextCreateWithInjectedBundlePath and WKContextCreate to be equal to WKContextCreateWithConfiguration,
and after rdar://problem/47030981 there are no meaningful clients of those functions, also.
There is one existing client of WKContextCreateWithInjectedBundlePath in rdar://problem/50323967 but our current implementation
is compatible enough for them because it uses their injected bundle still.

  • UIProcess/API/APIProcessPoolConfiguration.cpp:

(API::ProcessPoolConfiguration::copy):
(API::ProcessPoolConfiguration::createWithLegacyOptions): Deleted.

  • UIProcess/API/APIProcessPoolConfiguration.h:
  • UIProcess/API/APIWebsiteDataStore.cpp:

(API::WebsiteDataStore::createLegacy): Deleted.
(API::WebsiteDataStore::legacyDefaultDataStoreConfiguration): Deleted.

  • UIProcess/API/APIWebsiteDataStore.h:
  • UIProcess/API/C/WKContext.cpp:

(WKContextCreate):
(WKContextCreateWithInjectedBundlePath):
(WKContextGetWebsiteDataStore):

  • UIProcess/API/C/WKContextConfigurationRef.cpp:

(WKContextConfigurationCreate):
(WKContextConfigurationCreateWithLegacyOptions):

  • UIProcess/API/C/WKContextConfigurationRef.h:
  • UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm:

(API::WebsiteDataStore::legacyDefaultApplicationCacheDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultNetworkCacheDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultWebSQLDatabaseDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultIndexedDBDatabaseDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultLocalStorageDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultMediaCacheDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultMediaKeysStorageDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultDeviceIdHashSaltsStorageDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultJavaScriptConfigurationDirectory): Deleted.

  • UIProcess/API/Cocoa/WKProcessGroup.mm:

(-[WKProcessGroup initWithInjectedBundleURL:]):

  • UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp:

(API::WebsiteDataStore::legacyDefaultApplicationCacheDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultNetworkCacheDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultWebSQLDatabaseDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultIndexedDBDatabaseDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultLocalStorageDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultMediaCacheDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultMediaKeysStorageDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultDeviceIdHashSaltsStorageDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultJavaScriptConfigurationDirectory): Deleted.

  • UIProcess/API/win/APIWebsiteDataStoreWin.cpp:

(API::WebsiteDataStore::legacyDefaultApplicationCacheDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultNetworkCacheDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultWebSQLDatabaseDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultIndexedDBDatabaseDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultLocalStorageDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultMediaCacheDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultMediaKeysStorageDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultDeviceIdHashSaltsStorageDirectory): Deleted.
(API::WebsiteDataStore::legacyDefaultJavaScriptConfigurationDirectory): Deleted.

  • UIProcess/WebInspectorUtilities.cpp:

(WebKit::inspectorProcessPool):

  • UIProcess/WebProcessPool.cpp:

(WebKit::m_webProcessCache):
(WebKit::legacyWebsiteDataStoreConfiguration): Deleted.

  • UIProcess/WebProcessPool.h:

Tools:

  • TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:

This test relied on the default data store having been instantiated.

Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r249620 r249622  
     12019-09-07  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove WebsiteDataStore::legacyDefaultDataStoreConfiguration
     4        https://bugs.webkit.org/show_bug.cgi?id=200054
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Its last needed use was removed in rdar://problem/47030981
     9        This changes WKContextConfigurationCreateWithLegacyOptions to be equal to WKContextConfigurationCreate,
     10        but it has no remaining clients so it is only being retained for binary compabibility.
     11        This also changes WKContextCreateWithInjectedBundlePath and WKContextCreate to be equal to WKContextCreateWithConfiguration,
     12        and after rdar://problem/47030981 there are no meaningful clients of those functions, also.
     13        There is one existing client of WKContextCreateWithInjectedBundlePath in rdar://problem/50323967 but our current implementation
     14        is compatible enough for them because it uses their injected bundle still.
     15
     16        * UIProcess/API/APIProcessPoolConfiguration.cpp:
     17        (API::ProcessPoolConfiguration::copy):
     18        (API::ProcessPoolConfiguration::createWithLegacyOptions): Deleted.
     19        * UIProcess/API/APIProcessPoolConfiguration.h:
     20        * UIProcess/API/APIWebsiteDataStore.cpp:
     21        (API::WebsiteDataStore::createLegacy): Deleted.
     22        (API::WebsiteDataStore::legacyDefaultDataStoreConfiguration): Deleted.
     23        * UIProcess/API/APIWebsiteDataStore.h:
     24        * UIProcess/API/C/WKContext.cpp:
     25        (WKContextCreate):
     26        (WKContextCreateWithInjectedBundlePath):
     27        (WKContextGetWebsiteDataStore):
     28        * UIProcess/API/C/WKContextConfigurationRef.cpp:
     29        (WKContextConfigurationCreate):
     30        (WKContextConfigurationCreateWithLegacyOptions):
     31        * UIProcess/API/C/WKContextConfigurationRef.h:
     32        * UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm:
     33        (API::WebsiteDataStore::legacyDefaultApplicationCacheDirectory): Deleted.
     34        (API::WebsiteDataStore::legacyDefaultNetworkCacheDirectory): Deleted.
     35        (API::WebsiteDataStore::legacyDefaultWebSQLDatabaseDirectory): Deleted.
     36        (API::WebsiteDataStore::legacyDefaultIndexedDBDatabaseDirectory): Deleted.
     37        (API::WebsiteDataStore::legacyDefaultLocalStorageDirectory): Deleted.
     38        (API::WebsiteDataStore::legacyDefaultMediaCacheDirectory): Deleted.
     39        (API::WebsiteDataStore::legacyDefaultMediaKeysStorageDirectory): Deleted.
     40        (API::WebsiteDataStore::legacyDefaultDeviceIdHashSaltsStorageDirectory): Deleted.
     41        (API::WebsiteDataStore::legacyDefaultJavaScriptConfigurationDirectory): Deleted.
     42        * UIProcess/API/Cocoa/WKProcessGroup.mm:
     43        (-[WKProcessGroup initWithInjectedBundleURL:]):
     44        * UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp:
     45        (API::WebsiteDataStore::legacyDefaultApplicationCacheDirectory): Deleted.
     46        (API::WebsiteDataStore::legacyDefaultNetworkCacheDirectory): Deleted.
     47        (API::WebsiteDataStore::legacyDefaultWebSQLDatabaseDirectory): Deleted.
     48        (API::WebsiteDataStore::legacyDefaultIndexedDBDatabaseDirectory): Deleted.
     49        (API::WebsiteDataStore::legacyDefaultLocalStorageDirectory): Deleted.
     50        (API::WebsiteDataStore::legacyDefaultMediaCacheDirectory): Deleted.
     51        (API::WebsiteDataStore::legacyDefaultMediaKeysStorageDirectory): Deleted.
     52        (API::WebsiteDataStore::legacyDefaultDeviceIdHashSaltsStorageDirectory): Deleted.
     53        (API::WebsiteDataStore::legacyDefaultJavaScriptConfigurationDirectory): Deleted.
     54        * UIProcess/API/win/APIWebsiteDataStoreWin.cpp:
     55        (API::WebsiteDataStore::legacyDefaultApplicationCacheDirectory): Deleted.
     56        (API::WebsiteDataStore::legacyDefaultNetworkCacheDirectory): Deleted.
     57        (API::WebsiteDataStore::legacyDefaultWebSQLDatabaseDirectory): Deleted.
     58        (API::WebsiteDataStore::legacyDefaultIndexedDBDatabaseDirectory): Deleted.
     59        (API::WebsiteDataStore::legacyDefaultLocalStorageDirectory): Deleted.
     60        (API::WebsiteDataStore::legacyDefaultMediaCacheDirectory): Deleted.
     61        (API::WebsiteDataStore::legacyDefaultMediaKeysStorageDirectory): Deleted.
     62        (API::WebsiteDataStore::legacyDefaultDeviceIdHashSaltsStorageDirectory): Deleted.
     63        (API::WebsiteDataStore::legacyDefaultJavaScriptConfigurationDirectory): Deleted.
     64        * UIProcess/WebInspectorUtilities.cpp:
     65        (WebKit::inspectorProcessPool):
     66        * UIProcess/WebProcessPool.cpp:
     67        (WebKit::m_webProcessCache):
     68        (WebKit::legacyWebsiteDataStoreConfiguration): Deleted.
     69        * UIProcess/WebProcessPool.h:
     70
    1712019-09-07  Alex Christensen  <achristensen@webkit.org>
    272

  • trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp

    r247759 r249622  
    3535{
    3636    return adoptRef(*new ProcessPoolConfiguration);
    37 }
    38 
    39 Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::createWithLegacyOptions()
    40 {
    41     auto configuration = ProcessPoolConfiguration::createWithWebsiteDataStoreConfiguration(WebsiteDataStore::legacyDefaultDataStoreConfiguration());
    42 
    43     configuration->m_shouldHaveLegacyDataStore = true;
    44     configuration->m_cacheModel = WebKit::CacheModel::DocumentViewer;
    45 
    46     return configuration;
    4737}
    4838
    … …  
    8777    auto copy = this->create();
    8878
    89     copy->m_shouldHaveLegacyDataStore = this->m_shouldHaveLegacyDataStore;
    9079    copy->m_cacheModel = this->m_cacheModel;
    9180    copy->m_diskCacheDirectory = this->m_diskCacheDirectory;

  • trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h

    r247759 r249622  
    5454    Ref<ProcessPoolConfiguration> copy();
    5555
    56     bool shouldHaveLegacyDataStore() const { return m_shouldHaveLegacyDataStore; }
    57     void setShouldHaveLegacyDataStore(bool shouldHaveLegacyDataStore) { m_shouldHaveLegacyDataStore = shouldHaveLegacyDataStore; }
    58 
    5956    bool usesSingleWebProcess() const { return m_usesSingleWebProcess; }
    6057    void setUsesSingleWebProcess(bool enabled) { m_usesSingleWebProcess = enabled; }
    … …  
    187184
    188185private:
    189     bool m_shouldHaveLegacyDataStore { false };
    190 
    191186    bool m_diskCacheSpeculativeValidationEnabled { false };
    192187    WebKit::CacheModel m_cacheModel { WebKit::CacheModel::PrimaryWebBrowser };

  • trunk/Source/WebKit/UIProcess/API/APIWebsiteDataStore.cpp

    r249614 r249622  
    6363{
    6464    return adoptRef(*new WebsiteDataStore);
    65 }
    66 
    67 Ref<WebsiteDataStore> WebsiteDataStore::createLegacy(Ref<WebKit::WebsiteDataStoreConfiguration>&& configuration)
    68 {
    69     configuration->setIndexedDBDatabaseDirectory(legacyDefaultIndexedDBDatabaseDirectory());
    70     return adoptRef(*new WebsiteDataStore(WTFMove(configuration), PAL::SessionID::defaultSessionID()));
    7165}
    7266
    … …  
    172166}
    173167
    174 Ref<WebKit::WebsiteDataStoreConfiguration> WebsiteDataStore::legacyDefaultDataStoreConfiguration()
    175 {
    176     auto configuration = defaultDataStoreConfiguration();
    177 
    178     configuration->setApplicationCacheDirectory(legacyDefaultApplicationCacheDirectory());
    179     configuration->setApplicationCacheFlatFileSubdirectoryName("ApplicationCache");
    180     configuration->setNetworkCacheDirectory(legacyDefaultNetworkCacheDirectory());
    181     configuration->setMediaCacheDirectory(legacyDefaultMediaCacheDirectory());
    182     configuration->setMediaKeysStorageDirectory(legacyDefaultMediaKeysStorageDirectory());
    183     configuration->setDeviceIdHashSaltsStorageDirectory(legacyDefaultDeviceIdHashSaltsStorageDirectory());
    184     configuration->setIndexedDBDatabaseDirectory(legacyDefaultIndexedDBDatabaseDirectory());
    185     configuration->setWebSQLDatabaseDirectory(legacyDefaultWebSQLDatabaseDirectory());
    186     configuration->setLocalStorageDirectory(legacyDefaultLocalStorageDirectory());
    187     configuration->setJavaScriptConfigurationDirectory(legacyDefaultJavaScriptConfigurationDirectory());
    188    
    189     return configuration;
    190 }
    191 
    192168} // namespace API

  • trunk/Source/WebKit/UIProcess/API/APIWebsiteDataStore.h

    r249614 r249622  
    4141    static Ref<WebsiteDataStore> create(Ref<WebKit::WebsiteDataStoreConfiguration>&&, const PAL::SessionID&);
    4242    static Ref<WebsiteDataStore> createNonPersistentDataStore();
    43     static Ref<WebsiteDataStore> createLegacy(Ref<WebKit::WebsiteDataStoreConfiguration>&&);
    4443
    4544    explicit WebsiteDataStore(Ref<WebKit::WebsiteDataStoreConfiguration>&&, PAL::SessionID);
    … …  
    7675    static Ref<WebKit::WebsiteDataStoreConfiguration> defaultDataStoreConfiguration();
    7776
    78     static WTF::String legacyDefaultApplicationCacheDirectory();
    79     static WTF::String legacyDefaultNetworkCacheDirectory();
    80     static WTF::String legacyDefaultLocalStorageDirectory();
    81     static WTF::String legacyDefaultIndexedDBDatabaseDirectory();
    82     static WTF::String legacyDefaultWebSQLDatabaseDirectory();
    83     static WTF::String legacyDefaultMediaKeysStorageDirectory();
    84     static WTF::String legacyDefaultDeviceIdHashSaltsStorageDirectory();
    85     static WTF::String legacyDefaultMediaCacheDirectory();
    86     static WTF::String legacyDefaultJavaScriptConfigurationDirectory();
    87 
    88     static Ref<WebKit::WebsiteDataStoreConfiguration> legacyDefaultDataStoreConfiguration();
    89 
    9077private:
    9178    enum ShouldCreateDirectory { CreateDirectory, DontCreateDirectory };

  • trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp

    r249614 r249622  
    7070WKContextRef WKContextCreate()
    7171{
    72     auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
     72    auto configuration = API::ProcessPoolConfiguration::create();
    7373    return WebKit::toAPI(&WebKit::WebProcessPool::create(configuration).leakRef());
    7474}
    … …  
    7676WKContextRef WKContextCreateWithInjectedBundlePath(WKStringRef pathRef)
    7777{
    78     auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
     78    auto configuration = API::ProcessPoolConfiguration::create();
    7979    configuration->setInjectedBundlePath(WebKit::toWTFString(pathRef));
    8080
    … …  
    444444}
    445445
    446 WKWebsiteDataStoreRef WKContextGetWebsiteDataStore(WKContextRef context)
    447 {
    448     auto* dataStore = WebKit::toImpl(context)->websiteDataStore();
    449     if (!dataStore) {
    450         auto defaultDataStore = API::WebsiteDataStore::defaultDataStore();
    451         WebKit::toImpl(context)->setPrimaryDataStore(defaultDataStore.get());
    452         dataStore = defaultDataStore.ptr();
    453     }
    454 
    455     return WebKit::toAPI(dataStore);
     446WKWebsiteDataStoreRef WKContextGetWebsiteDataStore(WKContextRef)
     447{
     448    return WKWebsiteDataStoreGetDefaultDataStore();
    456449}
    457450

  • trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp

    r249614 r249622  
    3535WKContextConfigurationRef WKContextConfigurationCreate()
    3636{
    37     auto configuration = API::ProcessPoolConfiguration::create();
    38    
    39     // FIXME: A context created like this shouldn't have a data store,
    40     // instead there should be a WKPageConfigurationRef object that specifies the data store.
    41     configuration->setShouldHaveLegacyDataStore(true);
    42    
    43     return toAPI(&configuration.leakRef());
     37    return toAPI(&API::ProcessPoolConfiguration::create().leakRef());
    4438}
    4539
    4640WKContextConfigurationRef WKContextConfigurationCreateWithLegacyOptions()
    4741{
    48     return toAPI(&API::ProcessPoolConfiguration::createWithLegacyOptions().leakRef());
     42    return WKContextConfigurationCreate();
    4943}
    5044

  • trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h

    r249614 r249622  
    3535
    3636WK_EXPORT WKContextConfigurationRef WKContextConfigurationCreate();
    37 WK_EXPORT WKContextConfigurationRef WKContextConfigurationCreateWithLegacyOptions();
     37WK_EXPORT WKContextConfigurationRef WKContextConfigurationCreateWithLegacyOptions() WK_C_API_DEPRECATED_WITH_REPLACEMENT(WKContextConfigurationCreate);
    3838
    3939WK_EXPORT WKStringRef WKContextConfigurationCopyApplicationCacheDirectory(WKContextConfigurationRef configuration) WK_C_API_DEPRECATED_WITH_REPLACEMENT(WKWebsiteDataStoreConfigurationCopyApplicationCacheDirectory);

  • trunk/Source/WebKit/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm

    r242289 r249622  
    110110}
    111111
    112 WTF::String WebsiteDataStore::legacyDefaultApplicationCacheDirectory()
    113 {
    114     NSString *appName = [[NSBundle mainBundle] bundleIdentifier];
    115     if (!appName)
    116         appName = [[NSProcessInfo processInfo] processName];
    117 #if PLATFORM(IOS_FAMILY)
    118     // This quirk used to make these apps share application cache storage, but doesn't accomplish that any more.
    119     // Preserving it avoids the need to migrate data when upgrading.
    120     if (WebCore::IOSApplication::isMobileSafari() || WebCore::IOSApplication::isWebApp())
    121         appName = @"com.apple.WebAppCache";
    122 #endif
    123    
    124     ASSERT(appName);
    125    
    126 #if PLATFORM(IOS_FAMILY)
    127     NSString *cacheDir = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches"];
    128 #else
    129     char cacheDirectory[MAXPATHLEN];
    130     size_t cacheDirectoryLen = confstr(_CS_DARWIN_USER_CACHE_DIR, cacheDirectory, MAXPATHLEN);
    131     if (!cacheDirectoryLen)
    132         return WTF::String();
    133    
    134     NSString *cacheDir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:cacheDirectory length:cacheDirectoryLen - 1];
    135 #endif
    136     NSString* cachePath = [cacheDir stringByAppendingPathComponent:appName];
    137     return WebKit::stringByResolvingSymlinksInPath([cachePath stringByStandardizingPath]);
    138 }
    139 
    140 WTF::String WebsiteDataStore::legacyDefaultNetworkCacheDirectory()
    141 {
    142     NSString *cachePath = CFBridgingRelease(_CFURLCacheCopyCacheDirectory([[NSURLCache sharedURLCache] _CFURLCache]));
    143     if (!cachePath)
    144         cachePath = @"~/Library/Caches/com.apple.WebKit.WebProcess";
    145    
    146     cachePath = [cachePath stringByAppendingPathComponent:@"WebKitCache"];
    147    
    148     return WebKit::stringByResolvingSymlinksInPath([cachePath stringByStandardizingPath]);
    149 }
    150 
    151 WTF::String WebsiteDataStore::legacyDefaultWebSQLDatabaseDirectory()
    152 {
    153     NSString *databasesDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebDatabaseDirectoryDefaultsKey];
    154     if (!databasesDirectory || ![databasesDirectory isKindOfClass:[NSString class]])
    155         databasesDirectory = @"~/Library/WebKit/Databases";
    156     return WebKit::stringByResolvingSymlinksInPath([databasesDirectory stringByStandardizingPath]);
    157 }
    158 
    159 WTF::String WebsiteDataStore::legacyDefaultIndexedDBDatabaseDirectory()
    160 {
    161     // Indexed databases exist in a subdirectory of the "database directory path."
    162     // Currently, the top level of that directory contains entities related to WebSQL databases.
    163     // We should fix this, and move WebSQL into a subdirectory (https://bugs.webkit.org/show_bug.cgi?id=124807)
    164     // In the meantime, an entity name prefixed with three underscores will not conflict with any WebSQL entities.
    165     return FileSystem::pathByAppendingComponent(legacyDefaultWebSQLDatabaseDirectory(), "___IndexedDB");
    166 }
    167 
    168 WTF::String WebsiteDataStore::legacyDefaultLocalStorageDirectory()
    169 {
    170     NSString *localStorageDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebStorageDirectoryDefaultsKey];
    171     if (!localStorageDirectory || ![localStorageDirectory isKindOfClass:[NSString class]])
    172         localStorageDirectory = @"~/Library/WebKit/LocalStorage";
    173     return WebKit::stringByResolvingSymlinksInPath([localStorageDirectory stringByStandardizingPath]);
    174 }
    175 
    176 WTF::String WebsiteDataStore::legacyDefaultMediaCacheDirectory()
    177 {
    178     NSString *mediaKeysCacheDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebKitMediaCacheDirectoryDefaultsKey];
    179     if (!mediaKeysCacheDirectory || ![mediaKeysCacheDirectory isKindOfClass:[NSString class]]) {
    180         mediaKeysCacheDirectory = NSTemporaryDirectory();
    181        
    182         if (!WebKit::processHasContainer()) {
    183             NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
    184             if (!bundleIdentifier)
    185                 bundleIdentifier = [NSProcessInfo processInfo].processName;
    186             mediaKeysCacheDirectory = [mediaKeysCacheDirectory stringByAppendingPathComponent:bundleIdentifier];
    187         }
    188         mediaKeysCacheDirectory = [mediaKeysCacheDirectory stringByAppendingPathComponent:@"WebKit/MediaCache"];
    189     }
    190     return WebKit::stringByResolvingSymlinksInPath([mediaKeysCacheDirectory stringByStandardizingPath]);
    191 }
    192 
    193 WTF::String WebsiteDataStore::legacyDefaultMediaKeysStorageDirectory()
    194 {
    195     NSString *mediaKeysStorageDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebKitMediaKeysStorageDirectoryDefaultsKey];
    196     if (!mediaKeysStorageDirectory || ![mediaKeysStorageDirectory isKindOfClass:[NSString class]])
    197         mediaKeysStorageDirectory = @"~/Library/WebKit/MediaKeys";
    198     return WebKit::stringByResolvingSymlinksInPath([mediaKeysStorageDirectory stringByStandardizingPath]);
    199 }
    200 
    201 WTF::String WebsiteDataStore::legacyDefaultDeviceIdHashSaltsStorageDirectory()
    202 {
    203     // Not implemented.
    204     return String();
    205 }
    206 
    207 WTF::String WebsiteDataStore::legacyDefaultJavaScriptConfigurationDirectory()
    208 {
    209 #if PLATFORM(IOS_FAMILY)
    210     WTF::String path = WebKit::pathForProcessContainer();
    211     if (path.isEmpty())
    212         path = NSHomeDirectory();
    213    
    214     path = path + "/Library/WebKit/JavaScriptCoreDebug";
    215     path = WebKit::stringByResolvingSymlinksInPath(path);
    216    
    217     return path;
    218 #else
    219     RetainPtr<NSString> javaScriptConfigPath = @"~/Library/WebKit/JavaScriptCoreDebug";
    220    
    221     return WebKit::stringByResolvingSymlinksInPath([javaScriptConfigPath stringByStandardizingPath]);
    222 #endif
    223 }
    224 
    225112WTF::String WebsiteDataStore::tempDirectoryFileSystemRepresentation(const WTF::String& directoryName, ShouldCreateDirectory shouldCreateDirectory)
    226113{

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessGroup.mm

    r247837 r249622  
    196196        return nil;
    197197
    198     auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
     198    auto configuration = API::ProcessPoolConfiguration::create();
    199199    configuration->setInjectedBundlePath(bundleURL ? String(bundleURL.path) : String());
    200200

  • trunk/Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp

    r249192 r249622  
    105105}
    106106
    107 WTF::String WebsiteDataStore::legacyDefaultApplicationCacheDirectory()
    108 {
    109 #if PLATFORM(WPE)
    110     GUniquePtr<gchar> cacheDirectory(g_build_filename(g_get_user_cache_dir(), "wpe", "appcache", nullptr));
    111     return FileSystem::stringFromFileSystemRepresentation(cacheDirectory.get());
    112 #endif
    113     return defaultApplicationCacheDirectory();
    114 }
    115 
    116 WTF::String WebsiteDataStore::legacyDefaultNetworkCacheDirectory()
    117 {
    118 #if PLATFORM(WPE)
    119     GUniquePtr<char> diskCacheDirectory(g_build_filename(g_get_user_cache_dir(), "wpe", "cache", nullptr));
    120     return FileSystem::stringFromFileSystemRepresentation(diskCacheDirectory.get());
    121 #endif
    122     return defaultNetworkCacheDirectory();
    123 }
    124 
    125 WTF::String WebsiteDataStore::legacyDefaultWebSQLDatabaseDirectory()
    126 {
    127 #if PLATFORM(WPE)
    128     GUniquePtr<gchar> databaseDirectory(g_build_filename(g_get_user_data_dir(), "wpe", "databases", nullptr));
    129     return FileSystem::stringFromFileSystemRepresentation(databaseDirectory.get());
    130 #endif
    131     return defaultWebSQLDatabaseDirectory();
    132 }
    133 
    134 WTF::String WebsiteDataStore::legacyDefaultIndexedDBDatabaseDirectory()
    135 {
    136 #if PLATFORM(WPE)
    137     GUniquePtr<gchar> indexedDBDatabaseDirectory(g_build_filename(g_get_user_data_dir(), "wpe", "databases", "indexeddb", nullptr));
    138     return FileSystem::stringFromFileSystemRepresentation(indexedDBDatabaseDirectory.get());
    139 #endif
    140     return defaultIndexedDBDatabaseDirectory();
    141 }
    142 
    143 WTF::String WebsiteDataStore::legacyDefaultLocalStorageDirectory()
    144 {
    145 #if PLATFORM(WPE)
    146     GUniquePtr<gchar> storageDirectory(g_build_filename(g_get_user_data_dir(), "wpe", "localstorage", nullptr));
    147     return FileSystem::stringFromFileSystemRepresentation(storageDirectory.get());
    148 #endif
    149     return defaultLocalStorageDirectory();
    150 }
    151 
    152 WTF::String WebsiteDataStore::legacyDefaultMediaCacheDirectory()
    153 {
    154 #if PLATFORM(WPE)
    155     GUniquePtr<gchar> cacheDirectory(g_build_filename(g_get_user_cache_dir(), "wpe", "mediacache", nullptr));
    156     return FileSystem::stringFromFileSystemRepresentation(cacheDirectory.get());
    157 #endif
    158     return defaultMediaCacheDirectory();
    159 }
    160 
    161 WTF::String WebsiteDataStore::legacyDefaultMediaKeysStorageDirectory()
    162 {
    163 #if PLATFORM(WPE)
    164     GUniquePtr<gchar> mediaKeysStorageDirectory(g_build_filename(g_get_user_data_dir(), "wpe", "mediakeys", nullptr));
    165     return FileSystem::stringFromFileSystemRepresentation(mediaKeysStorageDirectory.get());
    166 #endif
    167     return defaultMediaKeysStorageDirectory();
    168 }
    169 
    170 String WebsiteDataStore::legacyDefaultDeviceIdHashSaltsStorageDirectory()
    171 {
    172 #if PLATFORM(WPE)
    173     GUniquePtr<gchar> deviceIdHashSaltsStorageDirectory(g_build_filename(g_get_user_data_dir(), "wpe", "deviceidhashsalts", nullptr));
    174     return FileSystem::stringFromFileSystemRepresentation(deviceIdHashSaltsStorageDirectory.get());
    175 #endif
    176     return defaultDeviceIdHashSaltsStorageDirectory();
    177 }
    178 
    179 WTF::String WebsiteDataStore::legacyDefaultJavaScriptConfigurationDirectory()
    180 {
    181     GUniquePtr<gchar> javaScriptCoreConfigDirectory(g_build_filename(g_get_user_data_dir(), BASE_DIRECTORY, "JavaScriptCoreDebug", nullptr));
    182     return FileSystem::stringFromFileSystemRepresentation(javaScriptCoreConfigDirectory.get());
    183 }
    184 
    185107} // namespace API

  • trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataManager.cpp

    r249192 r249622  
    2828#include "WebsiteDataFetchOption.h"
    2929#include <glib/gi18n-lib.h>
     30#include <pal/SessionID.h>
    3031#include <wtf/FileSystem.h>
    3132#include <wtf/glib/GUniquePtr.h>
    … …  
    384385{
    385386    WebKitWebsiteDataManager* manager = WEBKIT_WEBSITE_DATA_MANAGER(g_object_new(WEBKIT_TYPE_WEBSITE_DATA_MANAGER, nullptr));
    386     manager->priv->websiteDataStore = API::WebsiteDataStore::createLegacy(WTFMove(configuration));
     387    manager->priv->websiteDataStore = API::WebsiteDataStore::create(WTFMove(configuration), PAL::SessionID::defaultSessionID());
    387388
    388389    return manager;
    … …  
    405406            API::WebsiteDataStore::defaultHSTSDirectory() : FileSystem::stringFromFileSystemRepresentation(priv->hstsCacheDirectory.get()));
    406407        configuration->setMediaKeysStorageDirectory(API::WebsiteDataStore::defaultMediaKeysStorageDirectory());
    407         priv->websiteDataStore = API::WebsiteDataStore::createLegacy(WTFMove(configuration));
     408        priv->websiteDataStore = API::WebsiteDataStore::create(WTFMove(configuration), PAL::SessionID::defaultSessionID());
    408409    }
    409410

  • trunk/Source/WebKit/UIProcess/API/win/APIWebsiteDataStoreWin.cpp

    r242289 r249622  
    8686}
    8787
    88 String WebsiteDataStore::legacyDefaultApplicationCacheDirectory()
    89 {
    90     return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "ApplicationCache");
    91 }
    92 
    93 String WebsiteDataStore::legacyDefaultNetworkCacheDirectory()
    94 {
    95     return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "NetworkCache");
    96 }
    97 
    98 String WebsiteDataStore::legacyDefaultWebSQLDatabaseDirectory()
    99 {
    100     return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "WebSQL");
    101 }
    102 
    103 String WebsiteDataStore::legacyDefaultIndexedDBDatabaseDirectory()
    104 {
    105     return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "IndexedDB");
    106 }
    107 
    108 String WebsiteDataStore::legacyDefaultLocalStorageDirectory()
    109 {
    110     return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "LocalStorage");
    111 }
    112 
    113 String WebsiteDataStore::legacyDefaultMediaCacheDirectory()
    114 {
    115     return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "MediaCache");
    116 }
    117 
    118 String WebsiteDataStore::legacyDefaultMediaKeysStorageDirectory()
    119 {
    120     return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "MediaKeyStorage");
    121 }
    122 
    123 String WebsiteDataStore::legacyDefaultDeviceIdHashSaltsStorageDirectory()
    124 {
    125     // Not Implemented.
    126     return String();
    127 }
    128 
    129 String WebsiteDataStore::legacyDefaultJavaScriptConfigurationDirectory()
    130 {
    131     return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "JavaScriptCoreDebug");
    132 }
    133 
    13488} // namespace API

  • trunk/Source/WebKit/UIProcess/WebInspectorUtilities.cpp

    r244418 r249622  
    8181    WebProcessPool*& pool = (inspectionLevel == 1) ? s_mainInspectorProcessPool : s_nestedInspectorProcessPool;
    8282    if (!pool) {
    83         auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
     83        auto configuration = API::ProcessPoolConfiguration::create();
    8484        pool = &WebProcessPool::create(configuration.get()).leakRef();
    8585        // Do not delay process launch for inspector pages as inspector pages do not know how to transition from a terminated process.

  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r249589 r249622  
    206206}
    207207
    208 static Ref<WebsiteDataStoreConfiguration> legacyWebsiteDataStoreConfiguration(API::ProcessPoolConfiguration& processPoolConfiguration)
    209 {
    210     auto configuration = WebsiteDataStoreConfiguration::create();
    211 
    212     configuration->setCacheStorageDirectory(String(API::WebsiteDataStore::defaultCacheStorageDirectory()));
    213     configuration->setServiceWorkerRegistrationDirectory(String(API::WebsiteDataStore::defaultServiceWorkerRegistrationDirectory()));
    214     configuration->setLocalStorageDirectory(String(processPoolConfiguration.localStorageDirectory()));
    215     configuration->setWebSQLDatabaseDirectory(String(processPoolConfiguration.webSQLDatabaseDirectory()));
    216     configuration->setApplicationCacheDirectory(String(processPoolConfiguration.applicationCacheDirectory()));
    217     configuration->setApplicationCacheFlatFileSubdirectoryName(String(processPoolConfiguration.applicationCacheFlatFileSubdirectoryName()));
    218     configuration->setMediaCacheDirectory(String(processPoolConfiguration.mediaCacheDirectory()));
    219     configuration->setMediaKeysStorageDirectory(String(processPoolConfiguration.mediaKeysStorageDirectory()));
    220     configuration->setIndexedDBDatabaseDirectory(String(processPoolConfiguration.indexedDBDatabaseDirectory()));
    221     configuration->setResourceLoadStatisticsDirectory(String(processPoolConfiguration.resourceLoadStatisticsDirectory()));
    222     configuration->setNetworkCacheDirectory(String(processPoolConfiguration.diskCacheDirectory()));
    223 
    224     return configuration;
    225 }
    226 
    227208static HashSet<String, ASCIICaseInsensitiveHash>& globalURLSchemesWithCustomProtocolHandlers()
    228209{
    … …  
    263244        Process::setIdentifier(WebCore::ProcessIdentifier::generate());
    264245    });
    265 
    266     if (m_configuration->shouldHaveLegacyDataStore())
    267         m_websiteDataStore = API::WebsiteDataStore::createLegacy(legacyWebsiteDataStoreConfiguration(m_configuration));
    268246
    269247    if (!m_websiteDataStore && API::WebsiteDataStore::defaultDataStoreExists())

  • trunk/Tools/ChangeLog

    r249619 r249622  
     12019-09-07  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove WebsiteDataStore::legacyDefaultDataStoreConfiguration
     4        https://bugs.webkit.org/show_bug.cgi?id=200054
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:
     9        This test relied on the default data store having been instantiated.
     10
    1112019-09-07  Alex Christensen  <achristensen@webkit.org>
    212

  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm

    r249614 r249622  
    973973    auto pool = configuration.processPool;
    974974    [pool _registerURLSchemeServiceWorkersCanHandle:@"sw"];
    975 
    976     // FIXME: Investigate and remove this last use of WKContextGetWebsiteDataStore.
    977     configuration.websiteDataStore = (WKWebsiteDataStore *)WKContextGetWebsiteDataStore(context.get());
    978975}
    979976
    … …  
    14261423    ASSERT(scriptBytes);
    14271424
     1425    [WKWebsiteDataStore defaultDataStore];
    14281426    [WKWebsiteDataStore _allowWebsiteDataRecordsForAllOrigins];
    14291427
Note: See TracChangeset for help on using the changeset viewer.