Changeset 250169 in webkit


Ignore:
Timestamp:
Sep 20, 2019, 5:13:24 PM (6 years ago)
Author:
achristensen@apple.com
Message:

Remove unnecessary abstractions around WebsiteDataStore
​https://bugs.webkit.org/show_bug.cgi?id=201655

Reviewed by Chris Dumez.

Source/WebCore:

  • Modules/webdatabase/cocoa/DatabaseManagerCocoa.mm:

(WebCore::DatabaseManager::platformInitialize):

Source/WebKit:

  • PlatformFTW.cmake:
  • PlatformWin.cmake:
  • Sources.txt:
  • SourcesCocoa.txt:
  • SourcesGTK.txt:
  • SourcesWPE.txt:
  • UIProcess/API/APIHTTPCookieStore.cpp:
  • UIProcess/API/APIHTTPCookieStore.h:
  • UIProcess/API/APIPageConfiguration.cpp:

(API::PageConfiguration::websiteDataStore):
(API::PageConfiguration::setWebsiteDataStore):

  • UIProcess/API/APIPageConfiguration.h:
  • UIProcess/API/APIProcessPoolConfiguration.cpp:
  • UIProcess/API/APIWebsiteDataStore.cpp: Removed.
  • UIProcess/API/APIWebsiteDataStore.h: Removed.
  • UIProcess/API/APIWebsitePolicies.cpp:

(API::WebsitePolicies::WebsitePolicies):
(API::WebsitePolicies::setWebsiteDataStore):
(API::WebsitePolicies::data):

  • UIProcess/API/APIWebsitePolicies.h:
  • UIProcess/API/C/WKAPICast.h:
  • UIProcess/API/C/WKContext.cpp:

(WKContextSetCacheModel):
(WKContextGetCacheModel):

  • UIProcess/API/C/WKFramePolicyListener.cpp:
  • UIProcess/API/C/WKWebsiteDataStoreRef.cpp:

(WKWebsiteDataStoreGetTypeID):
(WKWebsiteDataStoreGetDefaultDataStore):
(WKWebsiteDataStoreCreateNonPersistentDataStore):
(WKWebsiteDataStoreCreateWithConfiguration):
(WKWebsiteDataStoreGetHTTPCookieStore):
(WKWebsiteDataStoreSetResourceLoadStatisticsDebugModeWithCompletionHandler):
(WKWebsiteDataStoreSetResourceLoadStatisticsPrevalentResourceForDebugMode):
(WKWebsiteDataStoreSetStatisticsLastSeen):
(WKWebsiteDataStoreSetStatisticsPrevalentResource):
(WKWebsiteDataStoreSetStatisticsVeryPrevalentResource):
(WKWebsiteDataStoreDumpResourceLoadStatistics):
(WKWebsiteDataStoreIsStatisticsPrevalentResource):
(WKWebsiteDataStoreIsStatisticsVeryPrevalentResource):
(WKWebsiteDataStoreIsStatisticsRegisteredAsSubresourceUnder):
(WKWebsiteDataStoreIsStatisticsRegisteredAsSubFrameUnder):
(WKWebsiteDataStoreIsStatisticsRegisteredAsRedirectingTo):
(WKWebsiteDataStoreSetStatisticsHasHadUserInteraction):
(WKWebsiteDataStoreIsStatisticsHasHadUserInteraction):
(WKWebsiteDataStoreSetStatisticsGrandfathered):
(WKWebsiteDataStoreIsStatisticsGrandfathered):
(WKWebsiteDataStoreSetStatisticsSubframeUnderTopFrameOrigin):
(WKWebsiteDataStoreSetStatisticsSubresourceUnderTopFrameOrigin):
(WKWebsiteDataStoreSetStatisticsSubresourceUniqueRedirectTo):
(WKWebsiteDataStoreSetStatisticsSubresourceUniqueRedirectFrom):
(WKWebsiteDataStoreSetStatisticsTopFrameUniqueRedirectTo):
(WKWebsiteDataStoreSetStatisticsTopFrameUniqueRedirectFrom):
(WKWebsiteDataStoreSetStatisticsCrossSiteLoadWithLinkDecoration):
(WKWebsiteDataStoreSetStatisticsTimeToLiveUserInteraction):
(WKWebsiteDataStoreStatisticsProcessStatisticsAndDataRecords):
(WKWebsiteDataStoreStatisticsUpdateCookieBlocking):
(WKWebsiteDataStoreStatisticsSubmitTelemetry):
(WKWebsiteDataStoreSetStatisticsNotifyPagesWhenDataRecordsWereScanned):
(WKWebsiteDataStoreSetStatisticsIsRunningTest):
(WKWebsiteDataStoreSetStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval):
(WKWebsiteDataStoreSetStatisticsNotifyPagesWhenTelemetryWasCaptured):
(WKWebsiteDataStoreSetStatisticsMinimumTimeBetweenDataRecordsRemoval):
(WKWebsiteDataStoreSetStatisticsGrandfatheringTime):
(WKWebsiteDataStoreSetStatisticsMaxStatisticsEntries):
(WKWebsiteDataStoreSetStatisticsPruneEntriesDownTo):
(WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore):
(WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours):
(WKWebsiteDataStoreStatisticsClearThroughWebsiteDataRemoval):
(WKWebsiteDataStoreStatisticsDeleteCookiesForTesting):
(WKWebsiteDataStoreStatisticsHasLocalStorage):
(WKWebsiteDataStoreSetStatisticsCacheMaxAgeCap):
(WKWebsiteDataStoreStatisticsHasIsolatedSession):
(WKWebsiteDataStoreStatisticsResetToConsistentState):
(WKWebsiteDataStoreRemoveAllFetchCaches):
(WKWebsiteDataStoreRemoveFetchCacheForOrigin):
(WKWebsiteDataStoreRemoveAllIndexedDatabases):
(WKWebsiteDataStoreRemoveLocalStorage):
(WKWebsiteDataStoreRemoveAllServiceWorkerRegistrations):
(WKWebsiteDataStoreGetFetchCacheOrigins):
(WKWebsiteDataStoreGetFetchCacheSizeForOrigin):
(WKWebsiteDataStoreCopyServiceWorkerRegistrationDirectory):
(WKWebsiteDataStoreSetServiceWorkerRegistrationDirectory):
(WKWebsiteDataStoreClearAllDeviceOrientationPermissions):
(WKWebsiteDataStoreSetWebAuthenticationMockConfiguration):
(WKWebsiteDataStoreClearAdClickAttributionsThroughWebsiteDataRemoval):

  • UIProcess/API/C/WKWebsitePolicies.cpp:
  • UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm: Removed.
  • UIProcess/API/Cocoa/WKWebsiteDataStore.mm:

(+[WKWebsiteDataStore defaultDataStore]):
(+[WKWebsiteDataStore nonPersistentDataStore]):
(-[WKWebsiteDataStore dealloc]):
(-[WKWebsiteDataStore httpCookieStore]):
(-[WKWebsiteDataStore removeDataOfTypes:modifiedSince:completionHandler:]):
(-[WKWebsiteDataStore removeDataOfTypes:forDataRecords:completionHandler:]):
(+[WKWebsiteDataStore _defaultDataStoreExists]):
(+[WKWebsiteDataStore _deleteDefaultDataStoreForTesting]):
(-[WKWebsiteDataStore _initWithConfiguration:]):
(-[WKWebsiteDataStore _fetchDataRecordsOfTypes:withOptions:completionHandler:]):
(-[WKWebsiteDataStore _resourceLoadStatisticsEnabled]):
(-[WKWebsiteDataStore _setResourceLoadStatisticsEnabled:]):
(-[WKWebsiteDataStore _resourceLoadStatisticsDebugMode]):
(-[WKWebsiteDataStore _setResourceLoadStatisticsDebugMode:]):
(-[WKWebsiteDataStore _cacheStorageDirectory]):
(-[WKWebsiteDataStore _setCacheStorageDirectory:]):
(-[WKWebsiteDataStore _serviceWorkerRegistrationDirectory]):
(-[WKWebsiteDataStore _setServiceWorkerRegistrationDirectory:]):
(-[WKWebsiteDataStore _setBoundInterfaceIdentifier:]):
(-[WKWebsiteDataStore _boundInterfaceIdentifier]):
(-[WKWebsiteDataStore _setAllowsCellularAccess:]):
(-[WKWebsiteDataStore _allowsCellularAccess]):
(-[WKWebsiteDataStore _setProxyConfiguration:]):
(-[WKWebsiteDataStore _sourceApplicationBundleIdentifier]):
(-[WKWebsiteDataStore _setSourceApplicationBundleIdentifier:]):
(-[WKWebsiteDataStore _sourceApplicationSecondaryIdentifier]):
(-[WKWebsiteDataStore _setSourceApplicationSecondaryIdentifier:]):
(-[WKWebsiteDataStore _proxyConfiguration]):
(-[WKWebsiteDataStore _indexedDBDatabaseDirectory]):
(-[WKWebsiteDataStore _resourceLoadStatisticsSetShouldSubmitTelemetry:]):
(-[WKWebsiteDataStore _setResourceLoadStatisticsTestingCallback:]):
(-[WKWebsiteDataStore _getAllStorageAccessEntriesFor:completionHandler:]):
(-[WKWebsiteDataStore _scheduleCookieBlockingUpdate:]):
(-[WKWebsiteDataStore _setPrevalentDomain:completionHandler:]):
(-[WKWebsiteDataStore _getIsPrevalentDomain:completionHandler:]):
(-[WKWebsiteDataStore _clearPrevalentDomain:completionHandler:]):
(-[WKWebsiteDataStore _processStatisticsAndDataRecords:]):
(-[WKWebsiteDataStore _hasRegisteredServiceWorker]):
(-[WKWebsiteDataStore _delegate]):
(-[WKWebsiteDataStore set_delegate:]):

  • UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h:
  • UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp: Removed.
  • UIProcess/API/glib/WebKitWebsiteDataManager.cpp:

(webkitWebsiteDataManagerSetProperty):
(webkitWebsiteDataManagerGetDataStore):
(webkit_website_data_manager_get_local_storage_directory):
(webkit_website_data_manager_get_disk_cache_directory):
(webkit_website_data_manager_get_offline_application_cache_directory):
(webkit_website_data_manager_get_indexeddb_directory):
(webkit_website_data_manager_get_websql_directory):
(webkit_website_data_manager_get_hsts_cache_directory):
(webkit_website_data_manager_fetch):
(webkit_website_data_manager_remove):
(webkit_website_data_manager_clear):
(webkitWebsiteDataManagerCreate): Deleted.

  • UIProcess/API/glib/WebKitWebsiteDataManagerPrivate.h:
  • UIProcess/API/win/APIWebsiteDataStoreWin.cpp: Removed.
  • UIProcess/Cocoa/NavigationState.mm:
  • UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::NetworkProcessProxy):
(WebKit::NetworkProcessProxy::websiteDataStoreFromSessionID):

  • UIProcess/Network/NetworkProcessProxy.h:
  • UIProcess/WebFramePolicyListenerProxy.cpp:
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::receivedNavigationPolicyDecision):

  • UIProcess/WebProcessPool.cpp:

(WebKit::m_webProcessCache):
(WebKit::WebProcessPool::ensureNetworkProcess):
(WebKit::WebProcessPool::establishWorkerContextConnectionToNetworkProcess):
(WebKit::WebProcessPool::tryTakePrewarmedProcess):
(WebKit::WebProcessPool::processDidFinishLaunching):
(WebKit::WebProcessPool::processForRegistrableDomain):
(WebKit::WebProcessPool::createWebPage):
(WebKit::WebProcessPool::mayHaveRegisteredServiceWorkers):

  • UIProcess/WebProcessPool.h:
  • UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:

(WebKit::WebsiteDataStore::defaultApplicationCacheDirectory):
(WebKit::WebsiteDataStore::defaultCacheStorageDirectory):
(WebKit::WebsiteDataStore::defaultNetworkCacheDirectory):
(WebKit::WebsiteDataStore::defaultMediaCacheDirectory):
(WebKit::WebsiteDataStore::defaultIndexedDBDatabaseDirectory):
(WebKit::WebsiteDataStore::defaultServiceWorkerRegistrationDirectory):
(WebKit::WebsiteDataStore::defaultLocalStorageDirectory):
(WebKit::WebsiteDataStore::defaultMediaKeysStorageDirectory):
(WebKit::WebsiteDataStore::defaultWebSQLDatabaseDirectory):
(WebKit::WebsiteDataStore::defaultResourceLoadStatisticsDirectory):
(WebKit::WebsiteDataStore::defaultJavaScriptConfigurationDirectory):
(WebKit::WebsiteDataStore::tempDirectoryFileSystemRepresentation):
(WebKit::WebsiteDataStore::cacheDirectoryFileSystemRepresentation):
(WebKit::WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation):

  • UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::globalDefaultDataStore):
(WebKit::WebsiteDataStore::defaultDataStore):
(WebKit::WebsiteDataStore::deleteDefaultDataStoreForTesting):
(WebKit::WebsiteDataStore::defaultDataStoreExists):
(WebKit::WebsiteDataStore::defaultDataStoreConfiguration):
(WebKit::WebsiteDataStore::isAssociatedProcessPool const):
(WebKit::WebsiteDataStore::defaultMediaCacheDirectory):
(WebKit::WebsiteDataStore::defaultJavaScriptConfigurationDirectory):
(WebKit::WebsiteDataStore::defaultDeviceIdHashSaltsStorageDirectory):

  • UIProcess/WebsiteData/WebsiteDataStore.h:
  • UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:
  • UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp:

(WebKit::WebsiteDataStore::defaultApplicationCacheDirectory):
(WebKit::WebsiteDataStore::defaultCacheStorageDirectory):
(WebKit::WebsiteDataStore::defaultNetworkCacheDirectory):
(WebKit::WebsiteDataStore::defaultIndexedDBDatabaseDirectory):
(WebKit::WebsiteDataStore::defaultServiceWorkerRegistrationDirectory):
(WebKit::WebsiteDataStore::defaultLocalStorageDirectory):
(WebKit::WebsiteDataStore::defaultMediaKeysStorageDirectory):
(WebKit::WebsiteDataStore::defaultWebSQLDatabaseDirectory):
(WebKit::WebsiteDataStore::defaultResourceLoadStatisticsDirectory):
(WebKit::WebsiteDataStore::cacheDirectoryFileSystemRepresentation):
(WebKit::WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation):

  • UIProcess/glib/WebProcessProxyGLib.cpp:

(WebKit::WebProcessProxy::platformGetLaunchOptions):

  • UIProcess/glib/WebsiteDataStoreGLib.cpp: Copied from Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp.

(API::WebsiteDataStore::defaultApplicationCacheDirectory): Deleted.
(API::WebsiteDataStore::defaultNetworkCacheDirectory): Deleted.
(API::WebsiteDataStore::defaultCacheStorageDirectory): Deleted.
(API::WebsiteDataStore::defaultIndexedDBDatabaseDirectory): Deleted.
(API::WebsiteDataStore::defaultServiceWorkerRegistrationDirectory): Deleted.
(API::WebsiteDataStore::defaultLocalStorageDirectory): Deleted.
(API::WebsiteDataStore::defaultMediaKeysStorageDirectory): Deleted.
(API::WebsiteDataStore::defaultDeviceIdHashSaltsStorageDirectory): Deleted.
(API::WebsiteDataStore::defaultWebSQLDatabaseDirectory): Deleted.
(API::WebsiteDataStore::defaultHSTSDirectory): Deleted.
(API::WebsiteDataStore::defaultResourceLoadStatisticsDirectory): Deleted.
(API::WebsiteDataStore::cacheDirectoryFileSystemRepresentation): Deleted.
(API::WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation): Deleted.

  • WebKit.xcodeproj/project.pbxproj:
  • WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:

(WebKit::WebMediaKeyStorageManager::setWebsiteDataStore):

Location:
trunk/Source
Files:
4 deleted
42 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r250167 r250169  
     12019-09-20  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove unnecessary abstractions around WebsiteDataStore
     4        https://bugs.webkit.org/show_bug.cgi?id=201655
     5
     6        Reviewed by Chris Dumez.
     7
     8        * Modules/webdatabase/cocoa/DatabaseManagerCocoa.mm:
     9        (WebCore::DatabaseManager::platformInitialize):
     10
    1112019-09-20  Alex Christensen  <achristensen@webkit.org>
    212

  • trunk/Source/WebCore/Modules/webdatabase/cocoa/DatabaseManagerCocoa.mm

    r240437 r250169  
    3636void DatabaseManager::platformInitialize(const String& databasePath)
    3737{
     38    if (databasePath.isEmpty())
     39        return;
     40
    3841    // The path needs to exist so that we can resolve it via realPath().
    3942    if (!FileSystem::fileExists(databasePath))

  • trunk/Source/WebKit/ChangeLog

    r250165 r250169  
     12019-09-20  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove unnecessary abstractions around WebsiteDataStore
     4        https://bugs.webkit.org/show_bug.cgi?id=201655
     5
     6        Reviewed by Chris Dumez.
     7
     8        * PlatformFTW.cmake:
     9        * PlatformWin.cmake:
     10        * Sources.txt:
     11        * SourcesCocoa.txt:
     12        * SourcesGTK.txt:
     13        * SourcesWPE.txt:
     14        * UIProcess/API/APIHTTPCookieStore.cpp:
     15        * UIProcess/API/APIHTTPCookieStore.h:
     16        * UIProcess/API/APIPageConfiguration.cpp:
     17        (API::PageConfiguration::websiteDataStore):
     18        (API::PageConfiguration::setWebsiteDataStore):
     19        * UIProcess/API/APIPageConfiguration.h:
     20        * UIProcess/API/APIProcessPoolConfiguration.cpp:
     21        * UIProcess/API/APIWebsiteDataStore.cpp: Removed.
     22        * UIProcess/API/APIWebsiteDataStore.h: Removed.
     23        * UIProcess/API/APIWebsitePolicies.cpp:
     24        (API::WebsitePolicies::WebsitePolicies):
     25        (API::WebsitePolicies::setWebsiteDataStore):
     26        (API::WebsitePolicies::data):
     27        * UIProcess/API/APIWebsitePolicies.h:
     28        * UIProcess/API/C/WKAPICast.h:
     29        * UIProcess/API/C/WKContext.cpp:
     30        (WKContextSetCacheModel):
     31        (WKContextGetCacheModel):
     32        * UIProcess/API/C/WKFramePolicyListener.cpp:
     33        * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
     34        (WKWebsiteDataStoreGetTypeID):
     35        (WKWebsiteDataStoreGetDefaultDataStore):
     36        (WKWebsiteDataStoreCreateNonPersistentDataStore):
     37        (WKWebsiteDataStoreCreateWithConfiguration):
     38        (WKWebsiteDataStoreGetHTTPCookieStore):
     39        (WKWebsiteDataStoreSetResourceLoadStatisticsDebugModeWithCompletionHandler):
     40        (WKWebsiteDataStoreSetResourceLoadStatisticsPrevalentResourceForDebugMode):
     41        (WKWebsiteDataStoreSetStatisticsLastSeen):
     42        (WKWebsiteDataStoreSetStatisticsPrevalentResource):
     43        (WKWebsiteDataStoreSetStatisticsVeryPrevalentResource):
     44        (WKWebsiteDataStoreDumpResourceLoadStatistics):
     45        (WKWebsiteDataStoreIsStatisticsPrevalentResource):
     46        (WKWebsiteDataStoreIsStatisticsVeryPrevalentResource):
     47        (WKWebsiteDataStoreIsStatisticsRegisteredAsSubresourceUnder):
     48        (WKWebsiteDataStoreIsStatisticsRegisteredAsSubFrameUnder):
     49        (WKWebsiteDataStoreIsStatisticsRegisteredAsRedirectingTo):
     50        (WKWebsiteDataStoreSetStatisticsHasHadUserInteraction):
     51        (WKWebsiteDataStoreIsStatisticsHasHadUserInteraction):
     52        (WKWebsiteDataStoreSetStatisticsGrandfathered):
     53        (WKWebsiteDataStoreIsStatisticsGrandfathered):
     54        (WKWebsiteDataStoreSetStatisticsSubframeUnderTopFrameOrigin):
     55        (WKWebsiteDataStoreSetStatisticsSubresourceUnderTopFrameOrigin):
     56        (WKWebsiteDataStoreSetStatisticsSubresourceUniqueRedirectTo):
     57        (WKWebsiteDataStoreSetStatisticsSubresourceUniqueRedirectFrom):
     58        (WKWebsiteDataStoreSetStatisticsTopFrameUniqueRedirectTo):
     59        (WKWebsiteDataStoreSetStatisticsTopFrameUniqueRedirectFrom):
     60        (WKWebsiteDataStoreSetStatisticsCrossSiteLoadWithLinkDecoration):
     61        (WKWebsiteDataStoreSetStatisticsTimeToLiveUserInteraction):
     62        (WKWebsiteDataStoreStatisticsProcessStatisticsAndDataRecords):
     63        (WKWebsiteDataStoreStatisticsUpdateCookieBlocking):
     64        (WKWebsiteDataStoreStatisticsSubmitTelemetry):
     65        (WKWebsiteDataStoreSetStatisticsNotifyPagesWhenDataRecordsWereScanned):
     66        (WKWebsiteDataStoreSetStatisticsIsRunningTest):
     67        (WKWebsiteDataStoreSetStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval):
     68        (WKWebsiteDataStoreSetStatisticsNotifyPagesWhenTelemetryWasCaptured):
     69        (WKWebsiteDataStoreSetStatisticsMinimumTimeBetweenDataRecordsRemoval):
     70        (WKWebsiteDataStoreSetStatisticsGrandfatheringTime):
     71        (WKWebsiteDataStoreSetStatisticsMaxStatisticsEntries):
     72        (WKWebsiteDataStoreSetStatisticsPruneEntriesDownTo):
     73        (WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore):
     74        (WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours):
     75        (WKWebsiteDataStoreStatisticsClearThroughWebsiteDataRemoval):
     76        (WKWebsiteDataStoreStatisticsDeleteCookiesForTesting):
     77        (WKWebsiteDataStoreStatisticsHasLocalStorage):
     78        (WKWebsiteDataStoreSetStatisticsCacheMaxAgeCap):
     79        (WKWebsiteDataStoreStatisticsHasIsolatedSession):
     80        (WKWebsiteDataStoreStatisticsResetToConsistentState):
     81        (WKWebsiteDataStoreRemoveAllFetchCaches):
     82        (WKWebsiteDataStoreRemoveFetchCacheForOrigin):
     83        (WKWebsiteDataStoreRemoveAllIndexedDatabases):
     84        (WKWebsiteDataStoreRemoveLocalStorage):
     85        (WKWebsiteDataStoreRemoveAllServiceWorkerRegistrations):
     86        (WKWebsiteDataStoreGetFetchCacheOrigins):
     87        (WKWebsiteDataStoreGetFetchCacheSizeForOrigin):
     88        (WKWebsiteDataStoreCopyServiceWorkerRegistrationDirectory):
     89        (WKWebsiteDataStoreSetServiceWorkerRegistrationDirectory):
     90        (WKWebsiteDataStoreClearAllDeviceOrientationPermissions):
     91        (WKWebsiteDataStoreSetWebAuthenticationMockConfiguration):
     92        (WKWebsiteDataStoreClearAdClickAttributionsThroughWebsiteDataRemoval):
     93        * UIProcess/API/C/WKWebsitePolicies.cpp:
     94        * UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm: Removed.
     95        * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
     96        (+[WKWebsiteDataStore defaultDataStore]):
     97        (+[WKWebsiteDataStore nonPersistentDataStore]):
     98        (-[WKWebsiteDataStore dealloc]):
     99        (-[WKWebsiteDataStore httpCookieStore]):
     100        (-[WKWebsiteDataStore removeDataOfTypes:modifiedSince:completionHandler:]):
     101        (-[WKWebsiteDataStore removeDataOfTypes:forDataRecords:completionHandler:]):
     102        (+[WKWebsiteDataStore _defaultDataStoreExists]):
     103        (+[WKWebsiteDataStore _deleteDefaultDataStoreForTesting]):
     104        (-[WKWebsiteDataStore _initWithConfiguration:]):
     105        (-[WKWebsiteDataStore _fetchDataRecordsOfTypes:withOptions:completionHandler:]):
     106        (-[WKWebsiteDataStore _resourceLoadStatisticsEnabled]):
     107        (-[WKWebsiteDataStore _setResourceLoadStatisticsEnabled:]):
     108        (-[WKWebsiteDataStore _resourceLoadStatisticsDebugMode]):
     109        (-[WKWebsiteDataStore _setResourceLoadStatisticsDebugMode:]):
     110        (-[WKWebsiteDataStore _cacheStorageDirectory]):
     111        (-[WKWebsiteDataStore _setCacheStorageDirectory:]):
     112        (-[WKWebsiteDataStore _serviceWorkerRegistrationDirectory]):
     113        (-[WKWebsiteDataStore _setServiceWorkerRegistrationDirectory:]):
     114        (-[WKWebsiteDataStore _setBoundInterfaceIdentifier:]):
     115        (-[WKWebsiteDataStore _boundInterfaceIdentifier]):
     116        (-[WKWebsiteDataStore _setAllowsCellularAccess:]):
     117        (-[WKWebsiteDataStore _allowsCellularAccess]):
     118        (-[WKWebsiteDataStore _setProxyConfiguration:]):
     119        (-[WKWebsiteDataStore _sourceApplicationBundleIdentifier]):
     120        (-[WKWebsiteDataStore _setSourceApplicationBundleIdentifier:]):
     121        (-[WKWebsiteDataStore _sourceApplicationSecondaryIdentifier]):
     122        (-[WKWebsiteDataStore _setSourceApplicationSecondaryIdentifier:]):
     123        (-[WKWebsiteDataStore _proxyConfiguration]):
     124        (-[WKWebsiteDataStore _indexedDBDatabaseDirectory]):
     125        (-[WKWebsiteDataStore _resourceLoadStatisticsSetShouldSubmitTelemetry:]):
     126        (-[WKWebsiteDataStore _setResourceLoadStatisticsTestingCallback:]):
     127        (-[WKWebsiteDataStore _getAllStorageAccessEntriesFor:completionHandler:]):
     128        (-[WKWebsiteDataStore _scheduleCookieBlockingUpdate:]):
     129        (-[WKWebsiteDataStore _setPrevalentDomain:completionHandler:]):
     130        (-[WKWebsiteDataStore _getIsPrevalentDomain:completionHandler:]):
     131        (-[WKWebsiteDataStore _clearPrevalentDomain:completionHandler:]):
     132        (-[WKWebsiteDataStore _processStatisticsAndDataRecords:]):
     133        (-[WKWebsiteDataStore _hasRegisteredServiceWorker]):
     134        (-[WKWebsiteDataStore _delegate]):
     135        (-[WKWebsiteDataStore set_delegate:]):
     136        * UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h:
     137        * UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp: Removed.
     138        * UIProcess/API/glib/WebKitWebsiteDataManager.cpp:
     139        (webkitWebsiteDataManagerSetProperty):
     140        (webkitWebsiteDataManagerGetDataStore):
     141        (webkit_website_data_manager_get_local_storage_directory):
     142        (webkit_website_data_manager_get_disk_cache_directory):
     143        (webkit_website_data_manager_get_offline_application_cache_directory):
     144        (webkit_website_data_manager_get_indexeddb_directory):
     145        (webkit_website_data_manager_get_websql_directory):
     146        (webkit_website_data_manager_get_hsts_cache_directory):
     147        (webkit_website_data_manager_fetch):
     148        (webkit_website_data_manager_remove):
     149        (webkit_website_data_manager_clear):
     150        (webkitWebsiteDataManagerCreate): Deleted.
     151        * UIProcess/API/glib/WebKitWebsiteDataManagerPrivate.h:
     152        * UIProcess/API/win/APIWebsiteDataStoreWin.cpp: Removed.
     153        * UIProcess/Cocoa/NavigationState.mm:
     154        * UIProcess/Network/NetworkProcessProxy.cpp:
     155        (WebKit::NetworkProcessProxy::NetworkProcessProxy):
     156        (WebKit::NetworkProcessProxy::websiteDataStoreFromSessionID):
     157        * UIProcess/Network/NetworkProcessProxy.h:
     158        * UIProcess/WebFramePolicyListenerProxy.cpp:
     159        * UIProcess/WebPageProxy.cpp:
     160        (WebKit::WebPageProxy::WebPageProxy):
     161        (WebKit::WebPageProxy::receivedNavigationPolicyDecision):
     162        * UIProcess/WebProcessPool.cpp:
     163        (WebKit::m_webProcessCache):
     164        (WebKit::WebProcessPool::ensureNetworkProcess):
     165        (WebKit::WebProcessPool::establishWorkerContextConnectionToNetworkProcess):
     166        (WebKit::WebProcessPool::tryTakePrewarmedProcess):
     167        (WebKit::WebProcessPool::processDidFinishLaunching):
     168        (WebKit::WebProcessPool::processForRegistrableDomain):
     169        (WebKit::WebProcessPool::createWebPage):
     170        (WebKit::WebProcessPool::mayHaveRegisteredServiceWorkers):
     171        * UIProcess/WebProcessPool.h:
     172        * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
     173        (WebKit::WebsiteDataStore::defaultApplicationCacheDirectory):
     174        (WebKit::WebsiteDataStore::defaultCacheStorageDirectory):
     175        (WebKit::WebsiteDataStore::defaultNetworkCacheDirectory):
     176        (WebKit::WebsiteDataStore::defaultMediaCacheDirectory):
     177        (WebKit::WebsiteDataStore::defaultIndexedDBDatabaseDirectory):
     178        (WebKit::WebsiteDataStore::defaultServiceWorkerRegistrationDirectory):
     179        (WebKit::WebsiteDataStore::defaultLocalStorageDirectory):
     180        (WebKit::WebsiteDataStore::defaultMediaKeysStorageDirectory):
     181        (WebKit::WebsiteDataStore::defaultWebSQLDatabaseDirectory):
     182        (WebKit::WebsiteDataStore::defaultResourceLoadStatisticsDirectory):
     183        (WebKit::WebsiteDataStore::defaultJavaScriptConfigurationDirectory):
     184        (WebKit::WebsiteDataStore::tempDirectoryFileSystemRepresentation):
     185        (WebKit::WebsiteDataStore::cacheDirectoryFileSystemRepresentation):
     186        (WebKit::WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation):
     187        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
     188        (WebKit::globalDefaultDataStore):
     189        (WebKit::WebsiteDataStore::defaultDataStore):
     190        (WebKit::WebsiteDataStore::deleteDefaultDataStoreForTesting):
     191        (WebKit::WebsiteDataStore::defaultDataStoreExists):
     192        (WebKit::WebsiteDataStore::defaultDataStoreConfiguration):
     193        (WebKit::WebsiteDataStore::isAssociatedProcessPool const):
     194        (WebKit::WebsiteDataStore::defaultMediaCacheDirectory):
     195        (WebKit::WebsiteDataStore::defaultJavaScriptConfigurationDirectory):
     196        (WebKit::WebsiteDataStore::defaultDeviceIdHashSaltsStorageDirectory):
     197        * UIProcess/WebsiteData/WebsiteDataStore.h:
     198        * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:
     199        * UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp:
     200        (WebKit::WebsiteDataStore::defaultApplicationCacheDirectory):
     201        (WebKit::WebsiteDataStore::defaultCacheStorageDirectory):
     202        (WebKit::WebsiteDataStore::defaultNetworkCacheDirectory):
     203        (WebKit::WebsiteDataStore::defaultIndexedDBDatabaseDirectory):
     204        (WebKit::WebsiteDataStore::defaultServiceWorkerRegistrationDirectory):
     205        (WebKit::WebsiteDataStore::defaultLocalStorageDirectory):
     206        (WebKit::WebsiteDataStore::defaultMediaKeysStorageDirectory):
     207        (WebKit::WebsiteDataStore::defaultWebSQLDatabaseDirectory):
     208        (WebKit::WebsiteDataStore::defaultResourceLoadStatisticsDirectory):
     209        (WebKit::WebsiteDataStore::cacheDirectoryFileSystemRepresentation):
     210        (WebKit::WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation):
     211        * UIProcess/glib/WebProcessProxyGLib.cpp:
     212        (WebKit::WebProcessProxy::platformGetLaunchOptions):
     213        * UIProcess/glib/WebsiteDataStoreGLib.cpp: Copied from Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp.
     214        (API::WebsiteDataStore::defaultApplicationCacheDirectory): Deleted.
     215        (API::WebsiteDataStore::defaultNetworkCacheDirectory): Deleted.
     216        (API::WebsiteDataStore::defaultCacheStorageDirectory): Deleted.
     217        (API::WebsiteDataStore::defaultIndexedDBDatabaseDirectory): Deleted.
     218        (API::WebsiteDataStore::defaultServiceWorkerRegistrationDirectory): Deleted.
     219        (API::WebsiteDataStore::defaultLocalStorageDirectory): Deleted.
     220        (API::WebsiteDataStore::defaultMediaKeysStorageDirectory): Deleted.
     221        (API::WebsiteDataStore::defaultDeviceIdHashSaltsStorageDirectory): Deleted.
     222        (API::WebsiteDataStore::defaultWebSQLDatabaseDirectory): Deleted.
     223        (API::WebsiteDataStore::defaultHSTSDirectory): Deleted.
     224        (API::WebsiteDataStore::defaultResourceLoadStatisticsDirectory): Deleted.
     225        (API::WebsiteDataStore::cacheDirectoryFileSystemRepresentation): Deleted.
     226        (API::WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation): Deleted.
     227        * WebKit.xcodeproj/project.pbxproj:
     228        * WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
     229        (WebKit::WebMediaKeyStorageManager::setWebsiteDataStore):
     230
    12312019-09-20  Chris Dumez  <cdumez@apple.com>
    2232

  • trunk/Source/WebKit/PlatformFTW.cmake

    r250119 r250169  
    4646
    4747    UIProcess/API/C/win/WKView.cpp
    48 
    49     UIProcess/API/win/APIWebsiteDataStoreWin.cpp
    5048
    5149    UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp

  • trunk/Source/WebKit/PlatformWin.cmake

    r249778 r250169  
    4646
    4747    UIProcess/API/C/win/WKView.cpp
    48 
    49     UIProcess/API/win/APIWebsiteDataStoreWin.cpp
    5048
    5149    UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp

  • trunk/Source/WebKit/Sources.txt

    r250148 r250169  
    319319UIProcess/API/APIUserScript.cpp
    320320UIProcess/API/APIUserStyleSheet.cpp
    321 UIProcess/API/APIWebsiteDataStore.cpp
    322321UIProcess/API/APIWebsitePolicies.cpp
    323322UIProcess/API/APIWindowFeatures.cpp

  • trunk/Source/WebKit/SourcesCocoa.txt

    r249778 r250169  
    275275UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm
    276276UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
    277 UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
    278277UIProcess/API/Cocoa/LegacyBundleForClass.mm
    279278UIProcess/API/Cocoa/NSAttributedString.mm

  • trunk/Source/WebKit/SourcesGTK.txt

    r249778 r250169  
    126126
    127127UIProcess/API/glib/APIContentRuleListStoreGLib.cpp @no-unify
    128 UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp @no-unify
    129128UIProcess/API/glib/IconDatabase.cpp @no-unify
    130129UIProcess/API/glib/WebKitApplicationInfo.cpp @no-unify
    … …  
    233232UIProcess/glib/WebProcessPoolGLib.cpp
    234233UIProcess/glib/WebProcessProxyGLib.cpp
     234UIProcess/glib/WebsiteDataStoreGLib.cpp @no-unify
    235235
    236236UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp

  • trunk/Source/WebKit/SourcesWPE.txt

    r249778 r250169  
    115115
    116116UIProcess/API/glib/APIContentRuleListStoreGLib.cpp @no-unify
    117 UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp @no-unify
    118117UIProcess/API/glib/IconDatabase.cpp @no-unify
    119118UIProcess/API/glib/WebKitApplicationInfo.cpp @no-unify
    … …  
    193192UIProcess/glib/WebProcessPoolGLib.cpp
    194193UIProcess/glib/WebProcessProxyGLib.cpp
     194UIProcess/glib/WebsiteDataStoreGLib.cpp @no-unify
    195195
    196196UIProcess/Launcher/glib/ProcessLauncherGLib.cpp

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

    r249778 r250169  
    2727#include "APIHTTPCookieStore.h"
    2828
    29 #include "APIWebsiteDataStore.h"
    3029#include "WebCookieManagerProxy.h"
    3130#include "WebProcessPool.h"
     31#include "WebsiteDataStore.h"
    3232#include <WebCore/Cookie.h>
    3333#include <WebCore/CookieStorage.h>

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

    r249778 r250169  
    4949
    5050class APIWebCookieManagerProxyObserver;
    51 class WebsiteDataStore;
    5251
    5352class HTTPCookieStore final : public ObjectImpl<Object::Type::HTTPCookieStore> {

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

    r249778 r250169  
    152152}
    153153
    154 API::WebsiteDataStore* PageConfiguration::websiteDataStore()
     154WebKit::WebsiteDataStore* PageConfiguration::websiteDataStore()
    155155{
    156156    return m_websiteDataStore.get();
    157157}
    158158
    159 void PageConfiguration::setWebsiteDataStore(API::WebsiteDataStore* websiteDataStore)
     159void PageConfiguration::setWebsiteDataStore(WebKit::WebsiteDataStore* websiteDataStore)
    160160{
    161161    m_websiteDataStore = websiteDataStore;

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

    r249778 r250169  
    4545class WebURLSchemeHandler;
    4646class WebUserContentControllerProxy;
     47class WebsiteDataStore;
    4748}
    4849
    … …  
    5051
    5152class ApplicationManifest;
    52 class WebsiteDataStore;
    5353class WebsitePolicies;
    5454
    … …  
    8585    void setVisitedLinkStore(WebKit::VisitedLinkStore*);
    8686
    87     WebsiteDataStore* websiteDataStore();
    88     void setWebsiteDataStore(WebsiteDataStore*);
     87    WebKit::WebsiteDataStore* websiteDataStore();
     88    void setWebsiteDataStore(WebKit::WebsiteDataStore*);
    8989
    9090    WebsitePolicies* defaultWebsitePolicies() const;
    … …  
    146146    RefPtr<WebKit::VisitedLinkStore> m_visitedLinkStore;
    147147
    148     RefPtr<WebsiteDataStore> m_websiteDataStore;
     148    RefPtr<WebKit::WebsiteDataStore> m_websiteDataStore;
    149149    RefPtr<WebsitePolicies> m_defaultWebsitePolicies;
    150150

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

    r250148 r250169  
    2727#include "APIProcessPoolConfiguration.h"
    2828
    29 #include "APIWebsiteDataStore.h"
    3029#include "WebProcessPool.h"
     30#include "WebsiteDataStore.h"
    3131
    3232namespace API {

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

    r249778 r250169  
    2727#include "APIWebsitePolicies.h"
    2828
    29 #include "APIWebsiteDataStore.h"
     29#include "WebsiteDataStore.h"
    3030#include "WebsitePoliciesData.h"
    3131
    … …  
    3434WebsitePolicies::WebsitePolicies() = default;
    3535
    36 WebsitePolicies::WebsitePolicies(bool contentBlockersEnabled, OptionSet<WebKit::WebsiteAutoplayQuirk> allowedAutoplayQuirks, WebKit::WebsiteAutoplayPolicy autoplayPolicy, Vector<WebCore::HTTPHeaderField>&& legacyCustomHeaderFields, Vector<WebCore::CustomHeaderFields>&& customHeaderFields, WebKit::WebsitePopUpPolicy popUpPolicy, RefPtr<WebsiteDataStore>&& websiteDataStore)
     36WebsitePolicies::WebsitePolicies(bool contentBlockersEnabled, OptionSet<WebKit::WebsiteAutoplayQuirk> allowedAutoplayQuirks, WebKit::WebsiteAutoplayPolicy autoplayPolicy, Vector<WebCore::HTTPHeaderField>&& legacyCustomHeaderFields, Vector<WebCore::CustomHeaderFields>&& customHeaderFields, WebKit::WebsitePopUpPolicy popUpPolicy, RefPtr<WebKit::WebsiteDataStore>&& websiteDataStore)
    3737    : m_contentBlockersEnabled(contentBlockersEnabled)
    3838    , m_allowedAutoplayQuirks(allowedAutoplayQuirks)
    … …  
    8585}
    8686
    87 void WebsitePolicies::setWebsiteDataStore(RefPtr<WebsiteDataStore>&& websiteDataStore)
     87void WebsitePolicies::setWebsiteDataStore(RefPtr<WebKit::WebsiteDataStore>&& websiteDataStore)
    8888{
    8989    m_websiteDataStore = WTFMove(websiteDataStore);
    … …  
    109109        WTFMove(customHeaderFields),
    110110        popUpPolicy(),
    111         m_websiteDataStore ? Optional<WebKit::WebsiteDataStoreParameters> { m_websiteDataStore->websiteDataStore().parameters() } : WTF::nullopt,
     111        m_websiteDataStore ? Optional<WebKit::WebsiteDataStoreParameters> { m_websiteDataStore->parameters() } : WTF::nullopt,
    112112        m_customUserAgent,
    113113        m_customJavaScriptUserAgentAsSiteSpecificQuirks,

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

    r249778 r250169  
    4343namespace WebKit {
    4444struct WebsitePoliciesData;
     45class WebsiteDataStore;
    4546}
    4647
    4748namespace API {
    48 
    49 class WebsiteDataStore;
    5049
    5150class WebsitePolicies final : public API::ObjectImpl<API::Object::Type::WebsitePolicies> {
    … …  
    8079    void setPopUpPolicy(WebKit::WebsitePopUpPolicy policy) { m_popUpPolicy = policy; }
    8180
    82     WebsiteDataStore* websiteDataStore() const { return m_websiteDataStore.get(); }
    83     void setWebsiteDataStore(RefPtr<WebsiteDataStore>&&);
     81    WebKit::WebsiteDataStore* websiteDataStore() const { return m_websiteDataStore.get(); }
     82    void setWebsiteDataStore(RefPtr<WebKit::WebsiteDataStore>&&);
    8483
    8584    WebKit::WebsitePoliciesData data();
    … …  
    119118
    120119private:
    121     WebsitePolicies(bool contentBlockersEnabled, OptionSet<WebKit::WebsiteAutoplayQuirk>, WebKit::WebsiteAutoplayPolicy, Vector<WebCore::HTTPHeaderField>&&, Vector<WebCore::CustomHeaderFields>&&, WebKit::WebsitePopUpPolicy, RefPtr<WebsiteDataStore>&&);
     120    WebsitePolicies(bool contentBlockersEnabled, OptionSet<WebKit::WebsiteAutoplayQuirk>, WebKit::WebsiteAutoplayPolicy, Vector<WebCore::HTTPHeaderField>&&, Vector<WebCore::CustomHeaderFields>&&, WebKit::WebsitePopUpPolicy, RefPtr<WebKit::WebsiteDataStore>&&);
    122121
    123122    bool m_contentBlockersEnabled { true };
    … …  
    130129    Vector<WebCore::CustomHeaderFields> m_customHeaderFields;
    131130    WebKit::WebsitePopUpPolicy m_popUpPolicy { WebKit::WebsitePopUpPolicy::Default };
    132     RefPtr<WebsiteDataStore> m_websiteDataStore;
     131    RefPtr<WebKit::WebsiteDataStore> m_websiteDataStore;
    133132    WTF::String m_customUserAgent;
    134133    WTF::String m_customJavaScriptUserAgentAsSiteSpecificQuirks;

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

    r249778 r250169  
    7070class SessionState;
    7171class UserScript;
    72 class WebsiteDataStore;
    7372class WebsitePolicies;
    7473class WindowFeatures;
    … …  
    114113class WebUserContentControllerProxy;
    115114class WebViewportAttributes;
     115class WebsiteDataStore;
    116116class WebsiteDataStoreConfiguration;
    117117
    … …  
    170170WK_ADD_API_MAPPING(WKUserScriptRef, API::UserScript)
    171171WK_ADD_API_MAPPING(WKViewportAttributesRef, WebViewportAttributes)
    172 WK_ADD_API_MAPPING(WKWebsiteDataStoreRef, API::WebsiteDataStore)
     172WK_ADD_API_MAPPING(WKWebsiteDataStoreRef, WebKit::WebsiteDataStore)
    173173WK_ADD_API_MAPPING(WKWebsiteDataStoreConfigurationRef, WebKit::WebsiteDataStoreConfiguration)
    174174WK_ADD_API_MAPPING(WKWebsitePoliciesRef, API::WebsitePolicies)

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

    r250148 r250169  
    322322void WKContextSetCacheModel(WKContextRef contextRef, WKCacheModel cacheModel)
    323323{
    324     LegacyGlobalSettings::singleton().setCacheModel(WebKit::toCacheModel(cacheModel));
     324    WebKit::LegacyGlobalSettings::singleton().setCacheModel(WebKit::toCacheModel(cacheModel));
    325325}
    326326
    327327WKCacheModel WKContextGetCacheModel(WKContextRef contextRef)
    328328{
    329     return WebKit::toAPI(LegacyGlobalSettings::singleton().cacheModel());
     329    return WebKit::toAPI(WebKit::LegacyGlobalSettings::singleton().cacheModel());
    330330}
    331331

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

    r249778 r250169  
    2727#include "WKFramePolicyListener.h"
    2828
    29 #include "APIWebsiteDataStore.h"
    3029#include "APIWebsitePolicies.h"
    3130#include "WKAPICast.h"
    … …  
    3332#include "WebFrameProxy.h"
    3433#include "WebProcessPool.h"
     34#include "WebsiteDataStore.h"
    3535#include "WebsitePoliciesData.h"
    3636

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

    r250150 r250169  
    2828
    2929#include "APIArray.h"
    30 #include "APIWebsiteDataStore.h"
     30#include "APIHTTPCookieStore.h"
    3131#include "MockWebAuthenticationConfiguration.h"
    3232#include "ShouldGrandfatherStatistics.h"
    … …  
    4242#include "WebsiteDataFetchOption.h"
    4343#include "WebsiteDataRecord.h"
     44#include "WebsiteDataStore.h"
    4445#include "WebsiteDataType.h"
    4546#include <wtf/CallbackAggregator.h>
    … …  
    4849WKTypeID WKWebsiteDataStoreGetTypeID()
    4950{
    50     return WebKit::toAPI(API::WebsiteDataStore::APIType);
     51    return WebKit::toAPI(WebKit::WebsiteDataStore::APIType);
    5152}
    5253
    5354WKWebsiteDataStoreRef WKWebsiteDataStoreGetDefaultDataStore()
    5455{
    55     return WebKit::toAPI(API::WebsiteDataStore::defaultDataStore().ptr());
     56    return WebKit::toAPI(WebKit::WebsiteDataStore::defaultDataStore().ptr());
    5657}
    5758
    5859WKWebsiteDataStoreRef WKWebsiteDataStoreCreateNonPersistentDataStore()
    5960{
    60     return WebKit::toAPI(&API::WebsiteDataStore::createNonPersistentDataStore().leakRef());
     61    return WebKit::toAPI(&WebKit::WebsiteDataStore::createNonPersistent().leakRef());
    6162}
    6263
    … …  
    6465{
    6566    auto sessionID = WebKit::toImpl(configuration)->isPersistent() ? PAL::SessionID::generatePersistentSessionID() : PAL::SessionID::generateEphemeralSessionID();
    66     return WebKit::toAPI(&API::WebsiteDataStore::create(*WebKit::toImpl(configuration), sessionID).leakRef());
     67    return WebKit::toAPI(&WebKit::WebsiteDataStore::create(*WebKit::toImpl(configuration), sessionID).leakRef());
    6768}
    6869
    … …  
    8485WKHTTPCookieStoreRef WKWebsiteDataStoreGetHTTPCookieStore(WKWebsiteDataStoreRef dataStoreRef)
    8586{
    86     return WebKit::toAPI(&WebKit::toImpl(dataStoreRef)->httpCookieStore());
     87    return WebKit::toAPI(&WebKit::toImpl(dataStoreRef)->cookieStore());
    8788}
    8889
    … …  
    9091{
    9192#if ENABLE(RESOURCE_LOAD_STATISTICS)
    92     WebKit::toImpl(dataStoreRef)->websiteDataStore().setResourceLoadStatisticsDebugMode(enable, [context, completionHandler] {
     93    WebKit::toImpl(dataStoreRef)->setResourceLoadStatisticsDebugMode(enable, [context, completionHandler] {
    9394        completionHandler(context);
    9495    });
    … …  
    101102{
    102103#if ENABLE(RESOURCE_LOAD_STATISTICS)
    103     WebKit::toImpl(dataStoreRef)->websiteDataStore().setPrevalentResourceForDebugMode(URL(URL(), WebKit::toImpl(host)->string()), [context, completionHandler] {
     104    WebKit::toImpl(dataStoreRef)->setPrevalentResourceForDebugMode(URL(URL(), WebKit::toImpl(host)->string()), [context, completionHandler] {
    104105        completionHandler(context);
    105106    });
    … …  
    111112{
    112113#if ENABLE(RESOURCE_LOAD_STATISTICS)
    113     WebKit::toImpl(dataStoreRef)->websiteDataStore().setLastSeen(URL(URL(), WebKit::toImpl(host)->string()), Seconds { seconds }, [context, completionHandler] {
     114    WebKit::toImpl(dataStoreRef)->setLastSeen(URL(URL(), WebKit::toImpl(host)->string()), Seconds { seconds }, [context, completionHandler] {
    114115        completionHandler(context);
    115116    });
    … …  
    122123{
    123124#if ENABLE(RESOURCE_LOAD_STATISTICS)
    124     auto& websiteDataStore = WebKit::toImpl(dataStoreRef)->websiteDataStore();
     125    auto& websiteDataStore = *WebKit::toImpl(dataStoreRef);
    125126
    126127    if (value)
    … …  
    140141{
    141142#if ENABLE(RESOURCE_LOAD_STATISTICS)
    142     auto& websiteDataStore = WebKit::toImpl(dataStoreRef)->websiteDataStore();
     143    auto& websiteDataStore = *WebKit::toImpl(dataStoreRef);
    143144
    144145    if (value)
    … …  
    158159{
    159160#if ENABLE(RESOURCE_LOAD_STATISTICS)
    160     WebKit::toImpl(dataStoreRef)->websiteDataStore().dumpResourceLoadStatistics([context, callback] (const String& resourceLoadStatistics) {
     161    WebKit::toImpl(dataStoreRef)->dumpResourceLoadStatistics([context, callback] (const String& resourceLoadStatistics) {
    161162        callback(WebKit::toAPI(resourceLoadStatistics.impl()), context);
    162163    });
    … …  
    169170{
    170171#if ENABLE(RESOURCE_LOAD_STATISTICS)
    171     WebKit::toImpl(dataStoreRef)->websiteDataStore().isPrevalentResource(URL(URL(), WebKit::toImpl(host)->string()), [context, callback](bool isPrevalentResource) {
     172    WebKit::toImpl(dataStoreRef)->isPrevalentResource(URL(URL(), WebKit::toImpl(host)->string()), [context, callback](bool isPrevalentResource) {
    172173        callback(isPrevalentResource, context);
    173174    });
    … …  
    180181{
    181182#if ENABLE(RESOURCE_LOAD_STATISTICS)
    182     WebKit::toImpl(dataStoreRef)->websiteDataStore().isVeryPrevalentResource(URL(URL(), WebKit::toImpl(host)->string()), [context, callback](bool isVeryPrevalentResource) {
     183    WebKit::toImpl(dataStoreRef)->isVeryPrevalentResource(URL(URL(), WebKit::toImpl(host)->string()), [context, callback](bool isVeryPrevalentResource) {
    183184        callback(isVeryPrevalentResource, context);
    184185    });
    … …  
    191192{
    192193#if ENABLE(RESOURCE_LOAD_STATISTICS)
    193     WebKit::toImpl(dataStoreRef)->websiteDataStore().isRegisteredAsSubresourceUnder(URL(URL(), WebKit::toImpl(subresourceHost)->string()), URL(URL(), WebKit::toImpl(topFrameHost)->string()), [context, callback](bool isRegisteredAsSubresourceUnder) {
     194    WebKit::toImpl(dataStoreRef)->isRegisteredAsSubresourceUnder(URL(URL(), WebKit::toImpl(subresourceHost)->string()), URL(URL(), WebKit::toImpl(topFrameHost)->string()), [context, callback](bool isRegisteredAsSubresourceUnder) {
    194195        callback(isRegisteredAsSubresourceUnder, context);
    195196    });
    … …  
    202203{
    203204#if ENABLE(RESOURCE_LOAD_STATISTICS)
    204     WebKit::toImpl(dataStoreRef)->websiteDataStore().isRegisteredAsSubFrameUnder(URL(URL(), WebKit::toImpl(subFrameHost)->string()), URL(URL(), WebKit::toImpl(topFrameHost)->string()), [context, callback](bool isRegisteredAsSubFrameUnder) {
     205    WebKit::toImpl(dataStoreRef)->isRegisteredAsSubFrameUnder(URL(URL(), WebKit::toImpl(subFrameHost)->string()), URL(URL(), WebKit::toImpl(topFrameHost)->string()), [context, callback](bool isRegisteredAsSubFrameUnder) {
    205206        callback(isRegisteredAsSubFrameUnder, context);
    206207    });
    … …  
    213214{
    214215#if ENABLE(RESOURCE_LOAD_STATISTICS)
    215     WebKit::toImpl(dataStoreRef)->websiteDataStore().isRegisteredAsRedirectingTo(URL(URL(), WebKit::toImpl(hostRedirectedFrom)->string()), URL(URL(), WebKit::toImpl(hostRedirectedTo)->string()), [context, callback](bool isRegisteredAsRedirectingTo) {
     216    WebKit::toImpl(dataStoreRef)->isRegisteredAsRedirectingTo(URL(URL(), WebKit::toImpl(hostRedirectedFrom)->string()), URL(URL(), WebKit::toImpl(hostRedirectedTo)->string()), [context, callback](bool isRegisteredAsRedirectingTo) {
    216217        callback(isRegisteredAsRedirectingTo, context);
    217218    });
    … …  
    224225{
    225226#if ENABLE(RESOURCE_LOAD_STATISTICS)
    226     auto& dataStore = WebKit::toImpl(dataStoreRef)->websiteDataStore();
     227    auto& dataStore = *WebKit::toImpl(dataStoreRef);
    227228
    228229    if (value)
    … …  
    242243{
    243244#if ENABLE(RESOURCE_LOAD_STATISTICS)
    244     WebKit::toImpl(dataStoreRef)->websiteDataStore().hasHadUserInteraction(URL(URL(), WebKit::toImpl(host)->string()), [context, callback](bool hasHadUserInteraction) {
     245    WebKit::toImpl(dataStoreRef)->hasHadUserInteraction(URL(URL(), WebKit::toImpl(host)->string()), [context, callback](bool hasHadUserInteraction) {
    245246        callback(hasHadUserInteraction, context);
    246247    });
    … …  
    253254{
    254255#if ENABLE(RESOURCE_LOAD_STATISTICS)
    255     WebKit::toImpl(dataStoreRef)->websiteDataStore().setGrandfathered(URL(URL(), WebKit::toImpl(host)->string()), value, [] { });
     256    WebKit::toImpl(dataStoreRef)->setGrandfathered(URL(URL(), WebKit::toImpl(host)->string()), value, [] { });
    256257#endif
    257258}
    … …  
    260261{
    261262#if ENABLE(RESOURCE_LOAD_STATISTICS)
    262     WebKit::toImpl(dataStoreRef)->websiteDataStore().hasHadUserInteraction(URL(URL(), WebKit::toImpl(host)->string()), [context, callback](bool isGrandfathered) {
     263    WebKit::toImpl(dataStoreRef)->hasHadUserInteraction(URL(URL(), WebKit::toImpl(host)->string()), [context, callback](bool isGrandfathered) {
    263264        callback(isGrandfathered, context);
    264265    });
    … …  
    271272{
    272273#if ENABLE(RESOURCE_LOAD_STATISTICS)
    273     WebKit::toImpl(dataStoreRef)->websiteDataStore().setSubframeUnderTopFrameDomain(URL(URL(), WebKit::toImpl(host)->string()), URL(URL(), WebKit::toImpl(topFrameHost)->string()), [] { });
     274    WebKit::toImpl(dataStoreRef)->setSubframeUnderTopFrameDomain(URL(URL(), WebKit::toImpl(host)->string()), URL(URL(), WebKit::toImpl(topFrameHost)->string()), [] { });
    274275#endif
    275276}
    … …  
    278279{
    279280#if ENABLE(RESOURCE_LOAD_STATISTICS)
    280     WebKit::toImpl(dataStoreRef)->websiteDataStore().setSubresourceUnderTopFrameDomain(URL(URL(), WebKit::toImpl(host)->string()), URL(URL(), WebKit::toImpl(topFrameHost)->string()), [] { });
     281    WebKit::toImpl(dataStoreRef)->setSubresourceUnderTopFrameDomain(URL(URL(), WebKit::toImpl(host)->string()), URL(URL(), WebKit::toImpl(topFrameHost)->string()), [] { });
    281282#endif
    282283}
    … …  
    285286{
    286287#if ENABLE(RESOURCE_LOAD_STATISTICS)
    287     WebKit::toImpl(dataStoreRef)->websiteDataStore().setSubresourceUniqueRedirectTo(URL(URL(), WebKit::toImpl(host)->string()), URL(URL(), WebKit::toImpl(hostRedirectedTo)->string()), [] { });
     288    WebKit::toImpl(dataStoreRef)->setSubresourceUniqueRedirectTo(URL(URL(), WebKit::toImpl(host)->string()), URL(URL(), WebKit::toImpl(hostRedirectedTo)->string()), [] { });
    288289#endif
    289290}
    … …  
    292293{
    293294#if ENABLE(RESOURCE_LOAD_STATISTICS)
    294     WebKit::toImpl(dataStoreRef)->websiteDataStore().setSubresourceUniqueRedirectFrom(URL(URL(), WebKit::toImpl(host)->string()), URL(URL(), WebKit::toImpl(hostRedirectedFrom)->string()), [] { });
     295    WebKit::toImpl(dataStoreRef)->setSubresourceUniqueRedirectFrom(URL(URL(), WebKit::toImpl(host)->string()), URL(URL(), WebKit::toImpl(hostRedirectedFrom)->string()), [] { });
    295296#endif
    296297}
    … …  
    299300{
    300301#if ENABLE(RESOURCE_LOAD_STATISTICS)
    301     WebKit::toImpl(dataStoreRef)->websiteDataStore().setTopFrameUniqueRedirectTo(URL(URL(), WebKit::toImpl(host)->string()), URL(URL(), WebKit::toImpl(hostRedirectedTo)->string()), [] { });
     302    WebKit::toImpl(dataStoreRef)->setTopFrameUniqueRedirectTo(URL(URL(), WebKit::toImpl(host)->string()), URL(URL(), WebKit::toImpl(hostRedirectedTo)->string()), [] { });
    302303#endif
    303304}
    … …  
    306307{
    307308#if ENABLE(RESOURCE_LOAD_STATISTICS)
    308     WebKit::toImpl(dataStoreRef)->websiteDataStore().setTopFrameUniqueRedirectFrom(URL(URL(), WebKit::toImpl(host)->string()), URL(URL(), WebKit::toImpl(hostRedirectedFrom)->string()), [] { });
     309    WebKit::toImpl(dataStoreRef)->setTopFrameUniqueRedirectFrom(URL(URL(), WebKit::toImpl(host)->string()), URL(URL(), WebKit::toImpl(hostRedirectedFrom)->string()), [] { });
    309310#endif
    310311}
    … …  
    313314{
    314315#if ENABLE(RESOURCE_LOAD_STATISTICS)
    315     WebKit::toImpl(dataStoreRef)->websiteDataStore().setCrossSiteLoadWithLinkDecorationForTesting(URL(URL(), WebKit::toImpl(fromHost)->string()), URL(URL(), WebKit::toImpl(toHost)->string()), [context, callback] {
     316    WebKit::toImpl(dataStoreRef)->setCrossSiteLoadWithLinkDecorationForTesting(URL(URL(), WebKit::toImpl(fromHost)->string()), URL(URL(), WebKit::toImpl(toHost)->string()), [context, callback] {
    316317        callback(context);
    317318    });
    … …  
    324325{
    325326#if ENABLE(RESOURCE_LOAD_STATISTICS)
    326     WebKit::toImpl(dataStoreRef)->websiteDataStore().setTimeToLiveUserInteraction(Seconds { seconds }, [context, callback] {
     327    WebKit::toImpl(dataStoreRef)->setTimeToLiveUserInteraction(Seconds { seconds }, [context, callback] {
    327328        callback(context);
    328329    });
    … …  
    335336{
    336337#if ENABLE(RESOURCE_LOAD_STATISTICS)
    337     WebKit::toImpl(dataStoreRef)->websiteDataStore().scheduleStatisticsAndDataRecordsProcessing([context, callback] {
     338    WebKit::toImpl(dataStoreRef)->scheduleStatisticsAndDataRecordsProcessing([context, callback] {
    338339        callback(context);
    339340    });
    … …  
    346347{
    347348#if ENABLE(RESOURCE_LOAD_STATISTICS)
    348     WebKit::toImpl(dataStoreRef)->websiteDataStore().scheduleCookieBlockingUpdate([context, completionHandler]() {
     349    WebKit::toImpl(dataStoreRef)->scheduleCookieBlockingUpdate([context, completionHandler]() {
    349350        completionHandler(context);
    350351    });
    … …  
    357358{
    358359#if ENABLE(RESOURCE_LOAD_STATISTICS)
    359     WebKit::toImpl(dataStoreRef)->websiteDataStore().submitTelemetry();
     360    WebKit::toImpl(dataStoreRef)->submitTelemetry();
    360361#endif
    361362}
    … …  
    364365{
    365366#if ENABLE(RESOURCE_LOAD_STATISTICS)
    366     WebKit::toImpl(dataStoreRef)->websiteDataStore().setNotifyPagesWhenDataRecordsWereScanned(value, [] { });
     367    WebKit::toImpl(dataStoreRef)->setNotifyPagesWhenDataRecordsWereScanned(value, [] { });
    367368#endif
    368369}
    … …  
    371372{
    372373#if ENABLE(RESOURCE_LOAD_STATISTICS)
    373     WebKit::toImpl(dataStoreRef)->websiteDataStore().setIsRunningResourceLoadStatisticsTest(value, [context, callback] {
     374    WebKit::toImpl(dataStoreRef)->setIsRunningResourceLoadStatisticsTest(value, [context, callback] {
    374375        callback(context);
    375376    });
    … …  
    382383{
    383384#if ENABLE(RESOURCE_LOAD_STATISTICS)
    384     WebKit::toImpl(dataStoreRef)->websiteDataStore().setShouldClassifyResourcesBeforeDataRecordsRemoval(value, []() { });
     385    WebKit::toImpl(dataStoreRef)->setShouldClassifyResourcesBeforeDataRecordsRemoval(value, []() { });
    385386#endif
    386387}
    … …  
    389390{
    390391#if ENABLE(RESOURCE_LOAD_STATISTICS)
    391     WebKit::toImpl(dataStoreRef)->websiteDataStore().setNotifyPagesWhenTelemetryWasCaptured(value, []() { });
     392    WebKit::toImpl(dataStoreRef)->setNotifyPagesWhenTelemetryWasCaptured(value, []() { });
    392393#endif
    393394}
    … …  
    396397{
    397398#if ENABLE(RESOURCE_LOAD_STATISTICS)
    398     WebKit::toImpl(dataStoreRef)->websiteDataStore().setMinimumTimeBetweenDataRecordsRemoval(Seconds { seconds }, []() { });
     399    WebKit::toImpl(dataStoreRef)->setMinimumTimeBetweenDataRecordsRemoval(Seconds { seconds }, []() { });
    399400#endif
    400401}
    … …  
    403404{
    404405#if ENABLE(RESOURCE_LOAD_STATISTICS)
    405     WebKit::toImpl(dataStoreRef)->websiteDataStore().setGrandfatheringTime(Seconds { seconds }, []() { });
     406    WebKit::toImpl(dataStoreRef)->setGrandfatheringTime(Seconds { seconds }, []() { });
    406407#endif
    407408}
    … …  
    410411{
    411412#if ENABLE(RESOURCE_LOAD_STATISTICS)
    412     WebKit::toImpl(dataStoreRef)->websiteDataStore().setMaxStatisticsEntries(entries, []() { });
     413    WebKit::toImpl(dataStoreRef)->setMaxStatisticsEntries(entries, []() { });
    413414#endif
    414415}
    … …  
    417418{
    418419#if ENABLE(RESOURCE_LOAD_STATISTICS)
    419     WebKit::toImpl(dataStoreRef)->websiteDataStore().setPruneEntriesDownTo(entries, []() { });
     420    WebKit::toImpl(dataStoreRef)->setPruneEntriesDownTo(entries, []() { });
    420421#endif
    421422}
    … …  
    424425{
    425426#if ENABLE(RESOURCE_LOAD_STATISTICS)
    426     WebKit::toImpl(dataStoreRef)->websiteDataStore().scheduleClearInMemoryAndPersistent(WebKit::ShouldGrandfatherStatistics::Yes, [context, callback]() {
     427    WebKit::toImpl(dataStoreRef)->scheduleClearInMemoryAndPersistent(WebKit::ShouldGrandfatherStatistics::Yes, [context, callback]() {
    427428        callback(context);
    428429    });
    … …  
    435436{
    436437#if ENABLE(RESOURCE_LOAD_STATISTICS)
    437     WebKit::toImpl(dataStoreRef)->websiteDataStore().scheduleClearInMemoryAndPersistent(WallTime::now() - Seconds::fromHours(hours), WebKit::ShouldGrandfatherStatistics::Yes, [context, callback]() {
     438    WebKit::toImpl(dataStoreRef)->scheduleClearInMemoryAndPersistent(WallTime::now() - Seconds::fromHours(hours), WebKit::ShouldGrandfatherStatistics::Yes, [context, callback]() {
    438439        callback(context);
    439440    });
    … …  
    446447{
    447448    OptionSet<WebKit::WebsiteDataType> dataTypes = WebKit::WebsiteDataType::ResourceLoadStatistics;
    448     WebKit::toImpl(dataStoreRef)->websiteDataStore().removeData(dataTypes, WallTime::fromRawSeconds(0), [context, callback] {
     449    WebKit::toImpl(dataStoreRef)->removeData(dataTypes, WallTime::fromRawSeconds(0), [context, callback] {
    449450        callback(context);
    450451    });
    … …  
    454455{
    455456#if ENABLE(RESOURCE_LOAD_STATISTICS)
    456     WebKit::toImpl(dataStoreRef)->websiteDataStore().deleteCookiesForTesting(URL(URL(), WebKit::toImpl(host)->string()), includeHttpOnlyCookies, [context, callback] {
     457    WebKit::toImpl(dataStoreRef)->deleteCookiesForTesting(URL(URL(), WebKit::toImpl(host)->string()), includeHttpOnlyCookies, [context, callback] {
    457458        callback(context);
    458459    });
    … …  
    465466{
    466467#if ENABLE(RESOURCE_LOAD_STATISTICS)
    467     WebKit::toImpl(dataStoreRef)->websiteDataStore().hasLocalStorageForTesting(URL(URL(), WebKit::toImpl(host)->string()), [context, callback](bool hasLocalStorage) {
     468    WebKit::toImpl(dataStoreRef)->hasLocalStorageForTesting(URL(URL(), WebKit::toImpl(host)->string()), [context, callback](bool hasLocalStorage) {
    468469        callback(hasLocalStorage, context);
    469470    });
    … …  
    476477{
    477478#if ENABLE(RESOURCE_LOAD_STATISTICS)
    478     WebKit::toImpl(dataStoreRef)->websiteDataStore().setCacheMaxAgeCapForPrevalentResources(Seconds { seconds }, [context, callback] {
     479    WebKit::toImpl(dataStoreRef)->setCacheMaxAgeCapForPrevalentResources(Seconds { seconds }, [context, callback] {
    479480        callback(context);
    480481    });
    … …  
    487488{
    488489#if ENABLE(RESOURCE_LOAD_STATISTICS)
    489     WebKit::toImpl(dataStoreRef)->websiteDataStore().hasIsolatedSessionForTesting(URL(URL(), WebKit::toImpl(host)->string()), [context, callback](bool hasIsolatedSession) {
     490    WebKit::toImpl(dataStoreRef)->hasIsolatedSessionForTesting(URL(URL(), WebKit::toImpl(host)->string()), [context, callback](bool hasIsolatedSession) {
    490491        callback(hasIsolatedSession, context);
    491492    });
    … …  
    502503    });
    503504
    504     auto& store = WebKit::toImpl(dataStoreRef)->websiteDataStore();
     505    auto& store = *WebKit::toImpl(dataStoreRef);
    505506    store.clearResourceLoadStatisticsInWebProcesses([callbackAggregator = callbackAggregator.copyRef()] { });
    506507    store.resetCacheMaxAgeCapForPrevalentResources([callbackAggregator = callbackAggregator.copyRef()] { });
    … …  
    517518{
    518519    OptionSet<WebKit::WebsiteDataType> dataTypes = WebKit::WebsiteDataType::DOMCache;
    519     WebKit::toImpl(dataStoreRef)->websiteDataStore().removeData(dataTypes, -WallTime::infinity(), [context, callback] {
     520    WebKit::toImpl(dataStoreRef)->removeData(dataTypes, -WallTime::infinity(), [context, callback] {
    520521        callback(context);
    521522    });
    … …  
    529530
    530531    OptionSet<WebKit::WebsiteDataType> dataTypes = WebKit::WebsiteDataType::DOMCache;
    531     WebKit::toImpl(dataStoreRef)->websiteDataStore().removeData(dataTypes, dataRecords, [context, callback] {
     532    WebKit::toImpl(dataStoreRef)->removeData(dataTypes, dataRecords, [context, callback] {
    532533        callback(context);
    533534    });
    … …  
    537538{
    538539    OptionSet<WebKit::WebsiteDataType> dataTypes = WebKit::WebsiteDataType::IndexedDBDatabases;
    539     WebKit::toImpl(dataStoreRef)->websiteDataStore().removeData(dataTypes, -WallTime::infinity(), [context, callback] {
     540    WebKit::toImpl(dataStoreRef)->removeData(dataTypes, -WallTime::infinity(), [context, callback] {
    540541    if (callback)
    541542        callback(context);
    … …  
    546547{
    547548    OptionSet<WebKit::WebsiteDataType> dataTypes = WebKit::WebsiteDataType::LocalStorage;
    548     WebKit::toImpl(dataStoreRef)->websiteDataStore().removeData(dataTypes, -WallTime::infinity(), [context, callback] {
     549    WebKit::toImpl(dataStoreRef)->removeData(dataTypes, -WallTime::infinity(), [context, callback] {
    549550        if (callback)
    550551            callback(context);
    … …  
    556557#if ENABLE(SERVICE_WORKER)
    557558    OptionSet<WebKit::WebsiteDataType> dataTypes = WebKit::WebsiteDataType::ServiceWorkerRegistrations;
    558     WebKit::toImpl(dataStoreRef)->websiteDataStore().removeData(dataTypes, -WallTime::infinity(), [context, callback] {
     559    WebKit::toImpl(dataStoreRef)->removeData(dataTypes, -WallTime::infinity(), [context, callback] {
    559560        callback(context);
    560561    });
    … …  
    567568void WKWebsiteDataStoreGetFetchCacheOrigins(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreGetFetchCacheOriginsFunction callback)
    568569{
    569     WebKit::toImpl(dataStoreRef)->websiteDataStore().fetchData(WebKit::WebsiteDataType::DOMCache, { }, [context, callback] (auto dataRecords) {
     570    WebKit::toImpl(dataStoreRef)->fetchData(WebKit::WebsiteDataType::DOMCache, { }, [context, callback] (auto dataRecords) {
    570571        Vector<RefPtr<API::Object>> securityOrigins;
    571572        for (const auto& dataRecord : dataRecords) {
    … …  
    581582    OptionSet<WebKit::WebsiteDataFetchOption> fetchOptions = WebKit::WebsiteDataFetchOption::ComputeSizes;
    582583
    583     WebKit::toImpl(dataStoreRef)->websiteDataStore().fetchData(WebKit::WebsiteDataType::DOMCache, fetchOptions, [origin, context, callback] (auto dataRecords) {
     584    WebKit::toImpl(dataStoreRef)->fetchData(WebKit::WebsiteDataType::DOMCache, fetchOptions, [origin, context, callback] (auto dataRecords) {
    584585        auto originData = WebCore::SecurityOrigin::createFromString(WebKit::toImpl(origin)->string())->data();
    585586        for (auto& dataRecord : dataRecords) {
    … …  
    598599WKStringRef WKWebsiteDataStoreCopyServiceWorkerRegistrationDirectory(WKWebsiteDataStoreRef dataStoreRef)
    599600{
    600     return WebKit::toCopiedAPI(WebKit::toImpl(dataStoreRef)->websiteDataStore().serviceWorkerRegistrationDirectory());
     601    return WebKit::toCopiedAPI(WebKit::toImpl(dataStoreRef)->serviceWorkerRegistrationDirectory());
    601602}
    602603
    603604void WKWebsiteDataStoreSetServiceWorkerRegistrationDirectory(WKWebsiteDataStoreRef dataStoreRef, WKStringRef serviceWorkerRegistrationDirectory)
    604605{
    605     WebKit::toImpl(dataStoreRef)->websiteDataStore().setServiceWorkerRegistrationDirectory(WebKit::toImpl(serviceWorkerRegistrationDirectory)->string());
     606    WebKit::toImpl(dataStoreRef)->setServiceWorkerRegistrationDirectory(WebKit::toImpl(serviceWorkerRegistrationDirectory)->string());
    606607}
    607608
    … …  
    613614{
    614615#if ENABLE(DEVICE_ORIENTATION)
    615     WebKit::toImpl(dataStoreRef)->websiteDataStore().deviceOrientationAndMotionAccessController().clearPermissions();
     616    WebKit::toImpl(dataStoreRef)->deviceOrientationAndMotionAccessController().clearPermissions();
    616617#endif
    617618}
    … …  
    713714    }
    714715
    715     WebKit::toImpl(dataStoreRef)->websiteDataStore().setMockWebAuthenticationConfiguration(WTFMove(configuration));
     716    WebKit::toImpl(dataStoreRef)->setMockWebAuthenticationConfiguration(WTFMove(configuration));
    716717#endif
    717718}
    … …  
    720721{
    721722    OptionSet<WebKit::WebsiteDataType> dataTypes = WebKit::WebsiteDataType::AdClickAttributions;
    722     WebKit::toImpl(dataStoreRef)->websiteDataStore().removeData(dataTypes, WallTime::fromRawSeconds(0), [context, callback] {
    723         callback(context);
    724     });
    725 }
    726 
     723    WebKit::toImpl(dataStoreRef)->removeData(dataTypes, WallTime::fromRawSeconds(0), [context, callback] {
     724        callback(context);
     725    });
     726}
     727

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

    r249778 r250169  
    2828
    2929#include "APIDictionary.h"
    30 #include "APIWebsiteDataStore.h"
    3130#include "APIWebsitePolicies.h"
    3231#include "WKAPICast.h"
    … …  
    3433#include "WKDictionary.h"
    3534#include "WKRetainPtr.h"
     35#include "WebsiteDataStore.h"
    3636
    3737using namespace WebKit;

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

    r250150 r250169  
    106106+ (WKWebsiteDataStore *)defaultDataStore
    107107{
    108     return wrapper(API::WebsiteDataStore::defaultDataStore());
     108    return wrapper(WebKit::WebsiteDataStore::defaultDataStore());
    109109}
    110110
    111111+ (WKWebsiteDataStore *)nonPersistentDataStore
    112112{
    113     return wrapper(API::WebsiteDataStore::createNonPersistentDataStore());
     113    return wrapper(WebKit::WebsiteDataStore::createNonPersistent());
    114114}
    115115
    116116- (void)dealloc
    117117{
    118     _websiteDataStore->API::WebsiteDataStore::~WebsiteDataStore();
     118    _websiteDataStore->WebKit::WebsiteDataStore::~WebsiteDataStore();
    119119
    120120    [super dealloc];
    … …  
    128128- (instancetype)initWithCoder:(NSCoder *)coder
    129129{
    130     if (!(self = [super init]))
    131         return nil;
    132 
    133     RetainPtr<WKWebsiteDataStore> dataStore;
    134130    if ([coder decodeBoolForKey:@"isDefaultDataStore"])
    135         dataStore = [WKWebsiteDataStore defaultDataStore];
    136     else
    137         dataStore = [WKWebsiteDataStore nonPersistentDataStore];
    138 
    139     [self release];
    140 
    141     return dataStore.leakRef();
     131        return [[WKWebsiteDataStore defaultDataStore] retain];
     132    return [[WKWebsiteDataStore nonPersistentDataStore] retain];
    142133}
    143134
    … …  
    170161- (WKHTTPCookieStore *)httpCookieStore
    171162{
    172     return wrapper(_websiteDataStore->httpCookieStore());
     163    return wrapper(_websiteDataStore->cookieStore());
    173164}
    174165
    … …  
    187178{
    188179    auto completionHandlerCopy = makeBlockPtr(completionHandler);
    189     _websiteDataStore->websiteDataStore().removeData(WebKit::toWebsiteDataTypes(dataTypes), toSystemClockTime(date ? date : [NSDate distantPast]), [completionHandlerCopy] {
     180    _websiteDataStore->removeData(WebKit::toWebsiteDataTypes(dataTypes), toSystemClockTime(date ? date : [NSDate distantPast]), [completionHandlerCopy] {
    190181        completionHandlerCopy();
    191182    });
    … …  
    206197    auto completionHandlerCopy = makeBlockPtr(completionHandler);
    207198
    208     _websiteDataStore->websiteDataStore().removeData(WebKit::toWebsiteDataTypes(dataTypes), toWebsiteDataRecords(dataRecords), [completionHandlerCopy] {
     199    _websiteDataStore->removeData(WebKit::toWebsiteDataTypes(dataTypes), toWebsiteDataRecords(dataRecords), [completionHandlerCopy] {
    209200        completionHandlerCopy();
    210201    });
    … …  
    241232+ (BOOL)_defaultDataStoreExists
    242233{
    243     return API::WebsiteDataStore::defaultDataStoreExists();
     234    return WebKit::WebsiteDataStore::defaultDataStoreExists();
    244235}
    245236
    246237+ (void)_deleteDefaultDataStoreForTesting
    247238{
    248     return API::WebsiteDataStore::deleteDefaultDataStoreForTesting();
     239    return WebKit::WebsiteDataStore::deleteDefaultDataStoreForTesting();
    249240}
    250241
    … …  
    254245        return nil;
    255246
    256     auto config = configuration.isPersistent ? API::WebsiteDataStore::defaultDataStoreConfiguration() : WebKit::WebsiteDataStoreConfiguration::create();
     247    auto config = configuration.isPersistent ? WebKit::WebsiteDataStore::defaultDataStoreConfiguration() : WebKit::WebsiteDataStoreConfiguration::create();
    257248
    258249    RELEASE_ASSERT(config->isPersistent() == configuration.isPersistent);
    … …  
    318309    auto sessionID = configuration.isPersistent ? PAL::SessionID::generatePersistentSessionID() : PAL::SessionID::generateEphemeralSessionID();
    319310
    320     API::Object::constructInWrapper<API::WebsiteDataStore>(self, WTFMove(config), sessionID);
     311    API::Object::constructInWrapper<WebKit::WebsiteDataStore>(self, WTFMove(config), sessionID);
    321312
    322313    return self;
    … …  
    331322        fetchOptions.add(WebKit::WebsiteDataFetchOption::ComputeSizes);
    332323
    333     _websiteDataStore->websiteDataStore().fetchData(WebKit::toWebsiteDataTypes(dataTypes), fetchOptions, [completionHandlerCopy = WTFMove(completionHandlerCopy)](auto websiteDataRecords) {
     324    _websiteDataStore->fetchData(WebKit::toWebsiteDataTypes(dataTypes), fetchOptions, [completionHandlerCopy = WTFMove(completionHandlerCopy)](auto websiteDataRecords) {
    334325        Vector<RefPtr<API::Object>> elements;
    335326        elements.reserveInitialCapacity(websiteDataRecords.size());
    … …  
    344335- (BOOL)_resourceLoadStatisticsEnabled
    345336{
    346     return _websiteDataStore->websiteDataStore().resourceLoadStatisticsEnabled();
     337    return _websiteDataStore->resourceLoadStatisticsEnabled();
    347338}
    348339
    349340- (void)_setResourceLoadStatisticsEnabled:(BOOL)enabled
    350341{
    351     _websiteDataStore->websiteDataStore().setResourceLoadStatisticsEnabled(enabled);
     342    _websiteDataStore->setResourceLoadStatisticsEnabled(enabled);
    352343}
    353344
    … …  
    355346{
    356347#if ENABLE(RESOURCE_LOAD_STATISTICS)
    357     return _websiteDataStore->websiteDataStore().resourceLoadStatisticsDebugMode();
     348    return _websiteDataStore->resourceLoadStatisticsDebugMode();
    358349#else
    359350    return NO;
    … …  
    364355{
    365356#if ENABLE(RESOURCE_LOAD_STATISTICS)
    366     _websiteDataStore->websiteDataStore().setResourceLoadStatisticsDebugMode(enabled);
     357    _websiteDataStore->setResourceLoadStatisticsDebugMode(enabled);
    367358#else
    368359    UNUSED_PARAM(enabled);
    … …  
    381372- (NSString *)_cacheStorageDirectory
    382373{
    383     return _websiteDataStore->websiteDataStore().cacheStorageDirectory();
     374    return _websiteDataStore->cacheStorageDirectory();
    384375}
    385376
    386377- (void)_setCacheStorageDirectory:(NSString *)directory
    387378{
    388     _websiteDataStore->websiteDataStore().setCacheStorageDirectory(directory);
     379    _websiteDataStore->setCacheStorageDirectory(directory);
    389380}
    390381
    391382- (NSString *)_serviceWorkerRegistrationDirectory
    392383{
    393     return _websiteDataStore->websiteDataStore().serviceWorkerRegistrationDirectory();
     384    return _websiteDataStore->serviceWorkerRegistrationDirectory();
    394385}
    395386
    396387- (void)_setServiceWorkerRegistrationDirectory:(NSString *)directory
    397388{
    398     _websiteDataStore->websiteDataStore().setServiceWorkerRegistrationDirectory(directory);
     389    _websiteDataStore->setServiceWorkerRegistrationDirectory(directory);
    399390}
    400391
    401392- (void)_setBoundInterfaceIdentifier:(NSString *)identifier
    402393{
    403     _websiteDataStore->websiteDataStore().setBoundInterfaceIdentifier(identifier);
     394    _websiteDataStore->setBoundInterfaceIdentifier(identifier);
    404395}
    405396
    406397- (NSString *)_boundInterfaceIdentifier
    407398{
    408     return _websiteDataStore->websiteDataStore().boundInterfaceIdentifier();
     399    return _websiteDataStore->boundInterfaceIdentifier();
    409400}
    410401
    411402- (void)_setAllowsCellularAccess:(BOOL)allows
    412403{
    413     _websiteDataStore->websiteDataStore().setAllowsCellularAccess(allows ? WebKit::AllowsCellularAccess::Yes : WebKit::AllowsCellularAccess::No);
     404    _websiteDataStore->setAllowsCellularAccess(allows ? WebKit::AllowsCellularAccess::Yes : WebKit::AllowsCellularAccess::No);
    414405}
    415406
    416407- (BOOL)_allowsCellularAccess
    417408{
    418     return _websiteDataStore->websiteDataStore().allowsCellularAccess() == WebKit::AllowsCellularAccess::Yes;
     409    return _websiteDataStore->allowsCellularAccess() == WebKit::AllowsCellularAccess::Yes;
    419410}
    420411
    421412- (void)_setProxyConfiguration:(NSDictionary *)configuration
    422413{
    423     _websiteDataStore->websiteDataStore().setProxyConfiguration((__bridge CFDictionaryRef)configuration);
     414    _websiteDataStore->setProxyConfiguration((__bridge CFDictionaryRef)configuration);
    424415}
    425416
    426417- (NSString *)_sourceApplicationBundleIdentifier
    427418{
    428     return _websiteDataStore->websiteDataStore().sourceApplicationBundleIdentifier();
     419    return _websiteDataStore->sourceApplicationBundleIdentifier();
    429420}
    430421
    431422- (void)_setSourceApplicationBundleIdentifier:(NSString *)identifier
    432423{
    433     if (!_websiteDataStore->websiteDataStore().setSourceApplicationBundleIdentifier(identifier))
     424    if (!_websiteDataStore->setSourceApplicationBundleIdentifier(identifier))
    434425        [NSException raise:NSGenericException format:@"_setSourceApplicationBundleIdentifier cannot be called after networking has begun"];
    435426}
    … …  
    437428- (NSString *)_sourceApplicationSecondaryIdentifier
    438429{
    439     return _websiteDataStore->websiteDataStore().sourceApplicationSecondaryIdentifier();
     430    return _websiteDataStore->sourceApplicationSecondaryIdentifier();
    440431}
    441432
    442433- (void)_setSourceApplicationSecondaryIdentifier:(NSString *)identifier
    443434{
    444     if (!_websiteDataStore->websiteDataStore().setSourceApplicationSecondaryIdentifier(identifier))
     435    if (!_websiteDataStore->setSourceApplicationSecondaryIdentifier(identifier))
    445436        [NSException raise:NSGenericException format:@"_setSourceApplicationSecondaryIdentifier cannot be called after networking has begun"];
    446437}
    … …  
    457448- (NSDictionary *)_proxyConfiguration
    458449{
    459     return (__bridge NSDictionary *)_websiteDataStore->websiteDataStore().proxyConfiguration();
     450    return (__bridge NSDictionary *)_websiteDataStore->proxyConfiguration();
    460451}
    461452
    462453- (NSURL *)_indexedDBDatabaseDirectory
    463454{
    464     return [NSURL fileURLWithPath:_websiteDataStore->indexedDBDatabaseDirectory() isDirectory:YES];
     455    return [NSURL fileURLWithPath:_websiteDataStore->configuration().indexedDBDatabaseDirectory() isDirectory:YES];
    465456}
    466457
    … …  
    468459{
    469460#if ENABLE(RESOURCE_LOAD_STATISTICS)
    470     auto* store = _websiteDataStore->websiteDataStore().resourceLoadStatistics();
     461    auto* store = _websiteDataStore->resourceLoadStatistics();
    471462    if (!store)
    472463        return;
    … …  
    483474
    484475    if (callback) {
    485         _websiteDataStore->websiteDataStore().setStatisticsTestingCallback([callback = makeBlockPtr(callback), self](const String& event) {
     476        _websiteDataStore->setStatisticsTestingCallback([callback = makeBlockPtr(callback), self](const String& event) {
    486477            callback(self, event);
    487478        });
    … …  
    489480    }
    490481
    491     _websiteDataStore->websiteDataStore().setStatisticsTestingCallback(nullptr);
     482    _websiteDataStore->setStatisticsTestingCallback(nullptr);
    492483#endif
    493484}
    … …  
    512503
    513504#if ENABLE(RESOURCE_LOAD_STATISTICS)
    514     _websiteDataStore->websiteDataStore().getAllStorageAccessEntries(webPageProxy->identifier(), [completionHandler = makeBlockPtr(completionHandler)](auto domains) {
     505    _websiteDataStore->getAllStorageAccessEntries(webPageProxy->identifier(), [completionHandler = makeBlockPtr(completionHandler)](auto domains) {
    515506        Vector<RefPtr<API::Object>> apiDomains;
    516507        apiDomains.reserveInitialCapacity(domains.size());
    … …  
    527518{
    528519#if ENABLE(RESOURCE_LOAD_STATISTICS)
    529     _websiteDataStore->websiteDataStore().scheduleCookieBlockingUpdate([completionHandler = makeBlockPtr(completionHandler)]() {
     520    _websiteDataStore->scheduleCookieBlockingUpdate([completionHandler = makeBlockPtr(completionHandler)]() {
    530521        completionHandler();
    531522    });
    … …  
    538529{
    539530#if ENABLE(RESOURCE_LOAD_STATISTICS)
    540     _websiteDataStore->websiteDataStore().setPrevalentResource(URL(domain), [completionHandler = makeBlockPtr(completionHandler)]() {
     531    _websiteDataStore->setPrevalentResource(URL(domain), [completionHandler = makeBlockPtr(completionHandler)]() {
    541532        completionHandler();
    542533    });
    … …  
    549540{
    550541#if ENABLE(RESOURCE_LOAD_STATISTICS)
    551     _websiteDataStore->websiteDataStore().isPrevalentResource(URL(domain), [completionHandler = makeBlockPtr(completionHandler)](bool enabled) {
     542    _websiteDataStore->isPrevalentResource(URL(domain), [completionHandler = makeBlockPtr(completionHandler)](bool enabled) {
    552543        completionHandler(enabled);
    553544    });
    … …  
    560551{
    561552#if ENABLE(RESOURCE_LOAD_STATISTICS)
    562     _websiteDataStore->websiteDataStore().clearPrevalentResource(URL(domain), [completionHandler = makeBlockPtr(completionHandler)]() {
     553    _websiteDataStore->clearPrevalentResource(URL(domain), [completionHandler = makeBlockPtr(completionHandler)]() {
    563554        completionHandler();
    564555    });
    … …  
    571562{
    572563#if ENABLE(RESOURCE_LOAD_STATISTICS)
    573     _websiteDataStore->websiteDataStore().scheduleStatisticsAndDataRecordsProcessing([completionHandler = makeBlockPtr(completionHandler)]() {
     564    _websiteDataStore->scheduleStatisticsAndDataRecordsProcessing([completionHandler = makeBlockPtr(completionHandler)]() {
    574565        completionHandler();
    575566    });
    … …  
    581572- (bool)_hasRegisteredServiceWorker
    582573{
    583     return FileSystem::fileExists(WebCore::serviceWorkerRegistrationDatabaseFilename(_websiteDataStore->websiteDataStore().serviceWorkerRegistrationDirectory()));
     574    return FileSystem::fileExists(WebCore::serviceWorkerRegistrationDatabaseFilename(_websiteDataStore->serviceWorkerRegistrationDirectory()));
    584575}
    585576
    586577- (id <_WKWebsiteDataStoreDelegate>)_delegate
    587578{
    588     return _delegate.get();
     579    return _delegate.get().get();
    589580}
    590581
    … …  
    592583{
    593584    _delegate = delegate;
    594     _websiteDataStore->websiteDataStore().setClient(makeUniqueRef<WebsiteDataStoreClient>(delegate));
     585    _websiteDataStore->setClient(makeUniqueRef<WebsiteDataStoreClient>(delegate));
    595586}
    596587

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStoreInternal.h

    r249778 r250169  
    2626#import "WKWebsiteDataStorePrivate.h"
    2727
    28 #import "APIWebsiteDataStore.h"
    2928#import "WKObject.h"
     29#import "WebsiteDataStore.h"
     30#import <wtf/WeakObjCPtr.h>
    3031
    3132namespace WebKit {
    3233
    33 template<> struct WrapperTraits<API::WebsiteDataStore> {
     34template<> struct WrapperTraits<WebsiteDataStore> {
    3435    using WrapperClass = WKWebsiteDataStore;
    3536};
    … …  
    3940@interface WKWebsiteDataStore () <WKObject> {
    4041@package
    41     API::ObjectStorage<API::WebsiteDataStore> _websiteDataStore;
    42     RetainPtr<id <_WKWebsiteDataStoreDelegate> > _delegate;
     42    API::ObjectStorage<WebKit::WebsiteDataStore> _websiteDataStore;
     43    WeakObjCPtr<id <_WKWebsiteDataStoreDelegate> > _delegate;
    4344}
    4445@end

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

    r249778 r250169  
    5959    {
    6060        ASSERT(dataManager);
    61         return webkitWebsiteDataManagerGetDataStore(dataManager).websiteDataStore().sessionID();
     61        return webkitWebsiteDataManagerGetDataStore(dataManager).sessionID();
    6262    }
    6363

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

    r250148 r250169  
    756756    websiteDataTypes.add(WebsiteDataType::MemoryCache);
    757757    websiteDataTypes.add(WebsiteDataType::DiskCache);
    758     auto& websiteDataStore = webkitWebsiteDataManagerGetDataStore(context->priv->websiteDataManager.get()).websiteDataStore();
     758    auto& websiteDataStore = webkitWebsiteDataManagerGetDataStore(context->priv->websiteDataManager.get());
    759759    websiteDataStore.removeData(websiteDataTypes, -WallTime::infinity(), [] { });
    760760}

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

    r249778 r250169  
    2121#include "WebKitWebsiteDataManager.h"
    2222
    23 #include "APIWebsiteDataStore.h"
    2423#include "WebKitCookieManagerPrivate.h"
    2524#include "WebKitPrivate.h"
    … …  
    2726#include "WebKitWebsiteDataPrivate.h"
    2827#include "WebsiteDataFetchOption.h"
     28#include "WebsiteDataStore.h"
    2929#include <glib/gi18n-lib.h>
    3030#include <pal/SessionID.h>
    … …  
    9696    }
    9797
    98     RefPtr<API::WebsiteDataStore> websiteDataStore;
     98    RefPtr<WebKit::WebsiteDataStore> websiteDataStore;
    9999    GUniquePtr<char> baseDataDirectory;
    100100    GUniquePtr<char> baseCacheDirectory;
    … …  
    182182    case PROP_IS_EPHEMERAL:
    183183        if (g_value_get_boolean(value))
    184             manager->priv->websiteDataStore = API::WebsiteDataStore::createNonPersistentDataStore();
     184            manager->priv->websiteDataStore = WebKit::WebsiteDataStore::createNonPersistent();
    185185        break;
    186186    default:
    … …  
    382382}
    383383
    384 WebKitWebsiteDataManager* webkitWebsiteDataManagerCreate(Ref<WebsiteDataStoreConfiguration>&& configuration)
    385 {
    386     WebKitWebsiteDataManager* manager = WEBKIT_WEBSITE_DATA_MANAGER(g_object_new(WEBKIT_TYPE_WEBSITE_DATA_MANAGER, nullptr));
    387     manager->priv->websiteDataStore = API::WebsiteDataStore::create(WTFMove(configuration), PAL::SessionID::defaultSessionID());
    388 
    389     return manager;
    390 }
    391 
    392 API::WebsiteDataStore& webkitWebsiteDataManagerGetDataStore(WebKitWebsiteDataManager* manager)
     384WebKit::WebsiteDataStore& webkitWebsiteDataManagerGetDataStore(WebKitWebsiteDataManager* manager)
    393385{
    394386    WebKitWebsiteDataManagerPrivate* priv = manager->priv;
    … …  
    396388        auto configuration = WebsiteDataStoreConfiguration::create();
    397389        configuration->setLocalStorageDirectory(!priv->localStorageDirectory ?
    398             API::WebsiteDataStore::defaultLocalStorageDirectory() : FileSystem::stringFromFileSystemRepresentation(priv->localStorageDirectory.get()));
     390            WebKit::WebsiteDataStore::defaultLocalStorageDirectory() : FileSystem::stringFromFileSystemRepresentation(priv->localStorageDirectory.get()));
    399391        configuration->setNetworkCacheDirectory(!priv->diskCacheDirectory ?
    400             API::WebsiteDataStore::defaultNetworkCacheDirectory() : FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(priv->diskCacheDirectory.get()), networkCacheSubdirectory));
     392            WebKit::WebsiteDataStore::defaultNetworkCacheDirectory() : FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(priv->diskCacheDirectory.get()), networkCacheSubdirectory));
    401393        configuration->setApplicationCacheDirectory(!priv->applicationCacheDirectory ?
    402             API::WebsiteDataStore::defaultApplicationCacheDirectory() : FileSystem::stringFromFileSystemRepresentation(priv->applicationCacheDirectory.get()));
     394            WebKit::WebsiteDataStore::defaultApplicationCacheDirectory() : FileSystem::stringFromFileSystemRepresentation(priv->applicationCacheDirectory.get()));
    403395        configuration->setWebSQLDatabaseDirectory(!priv->webSQLDirectory ?
    404             API::WebsiteDataStore::defaultWebSQLDatabaseDirectory() : FileSystem::stringFromFileSystemRepresentation(priv->webSQLDirectory.get()));
     396            WebKit::WebsiteDataStore::defaultWebSQLDatabaseDirectory() : FileSystem::stringFromFileSystemRepresentation(priv->webSQLDirectory.get()));
    405397        configuration->setHSTSStorageDirectory(!priv->hstsCacheDirectory ?
    406             API::WebsiteDataStore::defaultHSTSDirectory() : FileSystem::stringFromFileSystemRepresentation(priv->hstsCacheDirectory.get()));
    407         configuration->setMediaKeysStorageDirectory(API::WebsiteDataStore::defaultMediaKeysStorageDirectory());
    408         priv->websiteDataStore = API::WebsiteDataStore::create(WTFMove(configuration), PAL::SessionID::defaultSessionID());
     398            WebKit::WebsiteDataStore::defaultHSTSDirectory() : FileSystem::stringFromFileSystemRepresentation(priv->hstsCacheDirectory.get()));
     399        configuration->setMediaKeysStorageDirectory(WebKit::WebsiteDataStore::defaultMediaKeysStorageDirectory());
     400        priv->websiteDataStore = WebKit::WebsiteDataStore::create(WTFMove(configuration), PAL::SessionID::defaultSessionID());
    409401    }
    410402
    … …  
    543535
    544536    if (!priv->localStorageDirectory)
    545         priv->localStorageDirectory.reset(g_strdup(API::WebsiteDataStore::defaultLocalStorageDirectory().utf8().data()));
     537        priv->localStorageDirectory.reset(g_strdup(WebKit::WebsiteDataStore::defaultLocalStorageDirectory().utf8().data()));
    546538    return priv->localStorageDirectory.get();
    547539}
    … …  
    567559    if (!priv->diskCacheDirectory) {
    568560        // The default directory already has the subdirectory.
    569         priv->diskCacheDirectory.reset(g_strdup(FileSystem::directoryName(API::WebsiteDataStore::defaultNetworkCacheDirectory()).utf8().data()));
     561        priv->diskCacheDirectory.reset(g_strdup(FileSystem::directoryName(WebKit::WebsiteDataStore::defaultNetworkCacheDirectory()).utf8().data()));
    570562    }
    571563    return priv->diskCacheDirectory.get();
    … …  
    591583
    592584    if (!priv->applicationCacheDirectory)
    593         priv->applicationCacheDirectory.reset(g_strdup(API::WebsiteDataStore::defaultApplicationCacheDirectory().utf8().data()));
     585        priv->applicationCacheDirectory.reset(g_strdup(WebKit::WebsiteDataStore::defaultApplicationCacheDirectory().utf8().data()));
    594586    return priv->applicationCacheDirectory.get();
    595587}
    … …  
    614606
    615607    if (!priv->indexedDBDirectory)
    616         priv->indexedDBDirectory.reset(g_strdup(API::WebsiteDataStore::defaultIndexedDBDatabaseDirectory().utf8().data()));
     608        priv->indexedDBDirectory.reset(g_strdup(WebKit::WebsiteDataStore::defaultIndexedDBDatabaseDirectory().utf8().data()));
    617609    return priv->indexedDBDirectory.get();
    618610}
    … …  
    639631
    640632    if (!priv->webSQLDirectory)
    641         priv->webSQLDirectory.reset(g_strdup(API::WebsiteDataStore::defaultWebSQLDatabaseDirectory().utf8().data()));
     633        priv->webSQLDirectory.reset(g_strdup(WebKit::WebsiteDataStore::defaultWebSQLDatabaseDirectory().utf8().data()));
    642634    return priv->webSQLDirectory.get();
    643635}
    … …  
    662654
    663655    if (!priv->hstsCacheDirectory)
    664         priv->hstsCacheDirectory.reset(g_strdup(API::WebsiteDataStore::defaultHSTSDirectory().utf8().data()));
     656        priv->hstsCacheDirectory.reset(g_strdup(WebKit::WebsiteDataStore::defaultHSTSDirectory().utf8().data()));
    665657    return priv->hstsCacheDirectory.get();
    666658}
    … …  
    736728
    737729    GRefPtr<GTask> task = adoptGRef(g_task_new(manager, cancellable, callback, userData));
    738     manager->priv->websiteDataStore->websiteDataStore().fetchData(toWebsiteDataTypes(types), WebsiteDataFetchOption::ComputeSizes, [task = WTFMove(task)] (Vector<WebsiteDataRecord> records) {
     730    manager->priv->websiteDataStore->fetchData(toWebsiteDataTypes(types), WebsiteDataFetchOption::ComputeSizes, [task = WTFMove(task)] (Vector<WebsiteDataRecord> records) {
    739731        GList* dataList = nullptr;
    740732        while (!records.isEmpty()) {
    … …  
    810802    }
    811803
    812     manager->priv->websiteDataStore->websiteDataStore().removeData(toWebsiteDataTypes(types), records, [task = WTFMove(task)] {
     804    manager->priv->websiteDataStore->removeData(toWebsiteDataTypes(types), records, [task = WTFMove(task)] {
    813805        g_task_return_boolean(task.get(), TRUE);
    814806    });
    … …  
    862854    WallTime timePoint = timeSpan ? WallTime::now() - Seconds::fromMicroseconds(timeSpan) : WallTime::fromRawSeconds(0);
    863855    GRefPtr<GTask> task = adoptGRef(g_task_new(manager, cancellable, callback, userData));
    864     manager->priv->websiteDataStore->websiteDataStore().removeData(toWebsiteDataTypes(types), timePoint, [task = WTFMove(task)] {
     856    manager->priv->websiteDataStore->removeData(toWebsiteDataTypes(types), timePoint, [task = WTFMove(task)] {
    865857        g_task_return_boolean(task.get(), TRUE);
    866858    });

  • trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataManagerPrivate.h

    r249778 r250169  
    2020#pragma once
    2121
    22 #include "APIWebsiteDataStore.h"
    2322#include "WebProcessPool.h"
    2423#include "WebsiteDataStore.h"
    2524
    26 WebKitWebsiteDataManager* webkitWebsiteDataManagerCreate(Ref<WebKit::WebsiteDataStoreConfiguration>&&);
    27 API::WebsiteDataStore& webkitWebsiteDataManagerGetDataStore(WebKitWebsiteDataManager*);
     25WebKit::WebsiteDataStore& webkitWebsiteDataManagerGetDataStore(WebKitWebsiteDataManager*);
    2826void webkitWebsiteDataManagerAddProcessPool(WebKitWebsiteDataManager*, WebKit::WebProcessPool&);
    2927void webkitWebsiteDataManagerRemoveProcessPool(WebKitWebsiteDataManager*, WebKit::WebProcessPool&);

  • trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm

    r249778 r250169  
    3434#import "APIString.h"
    3535#import "APIURL.h"
    36 #import "APIWebsiteDataStore.h"
    3736#import "AuthenticationChallengeDisposition.h"
    3837#import "AuthenticationChallengeDispositionCocoa.h"
    … …  
    6564#import "WebProcessProxy.h"
    6665#import "WebProtectionSpace.h"
     66#import "WebsiteDataStore.h"
    6767#import "_WKContentRuleListActionInternal.h"
    6868#import "_WKErrorRecoveryAttempting.h"

  • trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

    r249942 r250169  
    8888
    8989    if (auto* websiteDataStore = m_processPool.websiteDataStore())
    90         m_websiteDataStores.set(websiteDataStore->websiteDataStore().sessionID(), makeRef(websiteDataStore->websiteDataStore()));
     90        m_websiteDataStores.set(websiteDataStore->sessionID(), makeRef(*websiteDataStore));
    9191}
    9292
    … …  
    11261126
    11271127    if (auto* websiteDataStore = m_processPool.websiteDataStore()) {
    1128         if (sessionID == websiteDataStore->websiteDataStore().sessionID())
    1129             return &websiteDataStore->websiteDataStore();
     1128        if (sessionID == websiteDataStore->sessionID())
     1129            return websiteDataStore;
    11301130    }
    11311131
    … …  
    11331133        return nullptr;
    11341134
    1135     return &API::WebsiteDataStore::defaultDataStore()->websiteDataStore();
     1135    return WebKit::WebsiteDataStore::defaultDataStore().ptr();
    11361136}
    11371137

  • trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h

    r249832 r250169  
    2626#pragma once
    2727
    28 #include "APIWebsiteDataStore.h"
    2928#include "AuxiliaryProcessProxy.h"
    3029#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
    … …  
    3736#include "UserContentControllerIdentifier.h"
    3837#include "WebProcessProxyMessages.h"
     38#include "WebsiteDataStore.h"
    3939#include <WebCore/CrossSiteNavigationDataTransfer.h>
    4040#include <WebCore/RegistrableDomain.h>

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

    r249778 r250169  
    2828
    2929#include "APINavigation.h"
    30 #include "APIWebsiteDataStore.h"
    3130#include "APIWebsitePolicies.h"
    3231#include "SafeBrowsingWarning.h"

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

    r250157 r250169  
    417417    , m_userContentController(*m_configuration->userContentController())
    418418    , m_visitedLinkStore(*m_configuration->visitedLinkStore())
    419     , m_websiteDataStore(m_configuration->websiteDataStore()->websiteDataStore())
     419    , m_websiteDataStore(*m_configuration->websiteDataStore())
    420420    , m_userAgent(standardUserAgent())
    421421    , m_overrideContentSecurityPolicy { m_configuration->overrideContentSecurityPolicy() }
    … …  
    28662866    if (policies) {
    28672867        data = policies->data();
    2868         if (policies->websiteDataStore() && &policies->websiteDataStore()->websiteDataStore() != websiteDataStore.ptr()) {
    2869             websiteDataStore = policies->websiteDataStore()->websiteDataStore();
     2868        if (policies->websiteDataStore() && policies->websiteDataStore() != websiteDataStore.ptr()) {
     2869            websiteDataStore = *policies->websiteDataStore();
    28702870            processSwapRequestedByClient = ProcessSwapRequestedByClient::Yes;
    28712871        }

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

    r250148 r250169  
    245245    });
    246246
    247     if (!m_websiteDataStore && API::WebsiteDataStore::defaultDataStoreExists())
    248         m_websiteDataStore = API::WebsiteDataStore::defaultDataStore();
     247    if (!m_websiteDataStore && WebKit::WebsiteDataStore::defaultDataStoreExists())
     248        m_websiteDataStore = WebKit::WebsiteDataStore::defaultDataStore();
    249249
    250250    for (auto& scheme : m_configuration->alwaysRevalidatedURLSchemes())
    … …  
    484484
    485485    if (m_websiteDataStore) {
    486         parameters.defaultDataStoreParameters.pendingCookies = copyToVector(m_websiteDataStore->websiteDataStore().pendingCookies());
    487         m_websiteDataStore->websiteDataStore().clearPendingCookies();
     486        parameters.defaultDataStoreParameters.pendingCookies = copyToVector(m_websiteDataStore->pendingCookies());
     487        m_websiteDataStore->clearPendingCookies();
    488488#if PLATFORM(COCOA)
    489         parameters.defaultDataStoreParameters.networkSessionParameters.sourceApplicationBundleIdentifier = m_websiteDataStore->websiteDataStore().sourceApplicationBundleIdentifier();
    490         parameters.defaultDataStoreParameters.networkSessionParameters.sourceApplicationSecondaryIdentifier = m_websiteDataStore->websiteDataStore().sourceApplicationSecondaryIdentifier();
    491 #endif
    492         m_websiteDataStore->websiteDataStore().networkingHasBegun();
     489        parameters.defaultDataStoreParameters.networkSessionParameters.sourceApplicationBundleIdentifier = m_websiteDataStore->sourceApplicationBundleIdentifier();
     490        parameters.defaultDataStoreParameters.networkSessionParameters.sourceApplicationSecondaryIdentifier = m_websiteDataStore->sourceApplicationSecondaryIdentifier();
     491#endif
     492        m_websiteDataStore->networkingHasBegun();
    493493    }
    494494
    … …  
    542542    // IMPORTANT: Do not change the directory structure for indexed databases on disk without first consulting a reviewer from Apple (<rdar://problem/17454712>)
    543543    // *********
    544     if (API::WebsiteDataStore::defaultDataStoreExists())
    545         parameters.defaultDataStoreParameters.indexedDatabaseDirectory = API::WebsiteDataStore::defaultDataStore()->websiteDataStore().parameters().indexedDatabaseDirectory;
     544    if (WebKit::WebsiteDataStore::defaultDataStoreExists())
     545        parameters.defaultDataStoreParameters.indexedDatabaseDirectory = WebKit::WebsiteDataStore::defaultDataStore()->parameters().indexedDatabaseDirectory;
    546546   
    547547    if (!parameters.defaultDataStoreParameters.indexedDatabaseDirectory.isEmpty()) {
    … …  
    553553#if ENABLE(SERVICE_WORKER)
    554554    if (m_websiteDataStore)
    555         parameters.serviceWorkerRegistrationDirectory = m_websiteDataStore->websiteDataStore().resolvedServiceWorkerRegistrationDirectory();
     555        parameters.serviceWorkerRegistrationDirectory = m_websiteDataStore->resolvedServiceWorkerRegistrationDirectory();
    556556    if (!parameters.serviceWorkerRegistrationDirectory)
    557         parameters.serviceWorkerRegistrationDirectory =  API::WebsiteDataStore::defaultServiceWorkerRegistrationDirectory();
     557        parameters.serviceWorkerRegistrationDirectory =  WebKit::WebsiteDataStore::defaultServiceWorkerRegistrationDirectory();
    558558    SandboxExtension::createHandleForReadWriteDirectory(parameters.serviceWorkerRegistrationDirectory, parameters.serviceWorkerRegistrationDirectoryExtensionHandle);
    559559
    … …  
    564564#endif
    565565
    566     auto localStorageDirectory = m_websiteDataStore ? m_websiteDataStore->websiteDataStore().resolvedLocalStorageDirectory() : nullString();
     566    auto localStorageDirectory = m_websiteDataStore ? m_websiteDataStore->resolvedLocalStorageDirectory() : nullString();
    567567    if (!localStorageDirectory)
    568         localStorageDirectory = API::WebsiteDataStore::defaultLocalStorageDirectory();
     568        localStorageDirectory = WebKit::WebsiteDataStore::defaultLocalStorageDirectory();
    569569    parameters.defaultDataStoreParameters.localStorageDirectory = localStorageDirectory;
    570570    SandboxExtension::createHandleForReadWriteDirectory(localStorageDirectory, parameters.defaultDataStoreParameters.localStorageDirectoryExtensionHandle);
    571571
    572572    if (m_websiteDataStore)
    573         parameters.defaultDataStoreParameters.networkSessionParameters.resourceLoadStatisticsDirectory = m_websiteDataStore->websiteDataStore().resolvedResourceLoadStatisticsDirectory();
     573        parameters.defaultDataStoreParameters.networkSessionParameters.resourceLoadStatisticsDirectory = m_websiteDataStore->resolvedResourceLoadStatisticsDirectory();
    574574    if (parameters.defaultDataStoreParameters.networkSessionParameters.resourceLoadStatisticsDirectory.isEmpty())
    575         parameters.defaultDataStoreParameters.networkSessionParameters.resourceLoadStatisticsDirectory = API::WebsiteDataStore::defaultResourceLoadStatisticsDirectory();
     575        parameters.defaultDataStoreParameters.networkSessionParameters.resourceLoadStatisticsDirectory = WebKit::WebsiteDataStore::defaultResourceLoadStatisticsDirectory();
    576576
    577577    SandboxExtension::createHandleForReadWriteDirectory(parameters.defaultDataStoreParameters.networkSessionParameters.resourceLoadStatisticsDirectory, parameters.defaultDataStoreParameters.networkSessionParameters.resourceLoadStatisticsDirectoryExtensionHandle);
    … …  
    599599        enableResourceLoadStatistics = m_websiteDataStore->resourceLoadStatisticsEnabled();
    600600#if ENABLE(RESOURCE_LOAD_STATISTICS)
    601         enableResourceLoadStatisticsLogTestingEvent = m_websiteDataStore->websiteDataStore().hasStatisticsTestingCallback();
     601        enableResourceLoadStatisticsLogTestingEvent = m_websiteDataStore->hasStatisticsTestingCallback();
    602602#endif
    603603        if (enableResourceLoadStatistics) {
    604             auto networkSessionParameters = m_websiteDataStore->websiteDataStore().parameters().networkSessionParameters;
     604            auto networkSessionParameters = m_websiteDataStore->parameters().networkSessionParameters;
    605605            shouldIncludeLocalhost = networkSessionParameters.shouldIncludeLocalhostInResourceLoadStatistics;
    606606            enableResourceLoadStatisticsDebugMode = networkSessionParameters.enableResourceLoadStatisticsDebugMode;
    … …  
    608608        }
    609609
    610         parameters.defaultDataStoreParameters.perOriginStorageQuota = m_websiteDataStore->websiteDataStore().perOriginStorageQuota();
    611         parameters.defaultDataStoreParameters.perThirdPartyOriginStorageQuota = m_websiteDataStore->websiteDataStore().perThirdPartyOriginStorageQuota();
     610        parameters.defaultDataStoreParameters.perOriginStorageQuota = m_websiteDataStore->perOriginStorageQuota();
     611        parameters.defaultDataStoreParameters.perThirdPartyOriginStorageQuota = m_websiteDataStore->perThirdPartyOriginStorageQuota();
    612612    }
    613613
    … …  
    692692    if (!websiteDataStore) {
    693693        if (!m_websiteDataStore)
    694             m_websiteDataStore = API::WebsiteDataStore::defaultDataStore().ptr();
    695         websiteDataStore = &m_websiteDataStore->websiteDataStore();
     694            m_websiteDataStore = WebKit::WebsiteDataStore::defaultDataStore().ptr();
     695        websiteDataStore = m_websiteDataStore.get();
    696696    }
    697697
    … …  
    804804    // In platforms using Bubblewrap for sandboxing, prewarmed process is launched using the WebProcessPool primary WebsiteDataStore,
    805805    // so we don't use it in case of using a different WebsiteDataStore.
    806     if (m_sandboxEnabled && m_websiteDataStore && &m_websiteDataStore->websiteDataStore() != &websiteDataStore)
     806    if (m_sandboxEnabled && m_websiteDataStore && m_websiteDataStore.get() != &websiteDataStore)
    807807        return nullptr;
    808808#endif
    … …  
    10811081
    10821082    if (m_websiteDataStore)
    1083         m_websiteDataStore->websiteDataStore().didCreateNetworkProcess();
     1083        m_websiteDataStore->didCreateNetworkProcess();
    10841084}
    10851085
    … …  
    11601160
    11611161#if PLATFORM(COCOA)
    1162     bool mustMatchDataStore = API::WebsiteDataStore::defaultDataStoreExists() && &websiteDataStore != &API::WebsiteDataStore::defaultDataStore()->websiteDataStore();
     1162    bool mustMatchDataStore = WebKit::WebsiteDataStore::defaultDataStoreExists() && &websiteDataStore != WebKit::WebsiteDataStore::defaultDataStore().ptr();
    11631163#else
    11641164    bool mustMatchDataStore = false;
    … …  
    11941194        // But if there is an attempt to create a web page without any specified data store, then we have to create it.
    11951195        if (!m_websiteDataStore)
    1196             m_websiteDataStore = API::WebsiteDataStore::defaultDataStore().ptr();
     1196            m_websiteDataStore = WebKit::WebsiteDataStore::defaultDataStore().ptr();
    11971197
    11981198        pageConfiguration->setWebsiteDataStore(m_websiteDataStore.get());
    … …  
    12051205        process = &pageConfiguration->relatedPage()->ensureRunningProcess();
    12061206        // We do not support several WebsiteDataStores sharing a single process.
    1207         ASSERT(process.get() == m_dummyProcessProxy || &pageConfiguration->websiteDataStore()->websiteDataStore() == &process->websiteDataStore());
    1208         ASSERT(&pageConfiguration->relatedPage()->websiteDataStore() == &pageConfiguration->websiteDataStore()->websiteDataStore());
     1207        ASSERT(process.get() == m_dummyProcessProxy || pageConfiguration->websiteDataStore() == &process->websiteDataStore());
     1208        ASSERT(&pageConfiguration->relatedPage()->websiteDataStore() == pageConfiguration->websiteDataStore());
    12091209    } else if (!m_isDelayedWebProcessLaunchDisabled) {
    12101210        // In the common case, we delay process launch until something is actually loaded in the page.
    … …  
    12161216        process = m_dummyProcessProxy;
    12171217    } else
    1218         process = &processForRegistrableDomain(pageConfiguration->websiteDataStore()->websiteDataStore(), nullptr, { });
     1218        process = &processForRegistrableDomain(*pageConfiguration->websiteDataStore(), nullptr, { });
    12191219
    12201220    ASSERT(process);
    … …  
    12661266    String serviceWorkerRegistrationDirectory = store.resolvedServiceWorkerRegistrationDirectory();
    12671267    if (serviceWorkerRegistrationDirectory.isEmpty())
    1268         serviceWorkerRegistrationDirectory = API::WebsiteDataStore::defaultDataStoreConfiguration()->serviceWorkerRegistrationDirectory();
     1268        serviceWorkerRegistrationDirectory = WebKit::WebsiteDataStore::defaultDataStoreConfiguration()->serviceWorkerRegistrationDirectory();
    12691269
    12701270    return m_mayHaveRegisteredServiceWorkers.ensure(serviceWorkerRegistrationDirectory, [&] {

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

    r250148 r250169  
    2929#include "APIObject.h"
    3030#include "APIProcessPoolConfiguration.h"
    31 #include "APIWebsiteDataStore.h"
    3231#include "DownloadProxyMap.h"
    3332#include "GenericCallback.h"
    … …  
    4544#include "WebPreferencesStore.h"
    4645#include "WebProcessProxy.h"
     46#include "WebsiteDataStore.h"
    4747#include <WebCore/CrossSiteNavigationDataTransfer.h>
    4848#include <WebCore/ProcessIdentifier.h>
    … …  
    205205    void disconnectProcess(WebProcessProxy*);
    206206
    207     API::WebsiteDataStore* websiteDataStore() const { return m_websiteDataStore.get(); }
    208     void setPrimaryDataStore(API::WebsiteDataStore& dataStore) { m_websiteDataStore = &dataStore; }
     207    WebKit::WebsiteDataStore* websiteDataStore() const { return m_websiteDataStore.get(); }
     208    void setPrimaryDataStore(WebKit::WebsiteDataStore& dataStore) { m_websiteDataStore = &dataStore; }
    209209
    210210    Ref<WebPageProxy> createWebPage(PageClient&, Ref<API::PageConfiguration>&&);
    … …  
    678678    double m_memorySamplerInterval { 1400.0 };
    679679
    680     RefPtr<API::WebsiteDataStore> m_websiteDataStore;
     680    RefPtr<WebKit::WebsiteDataStore> m_websiteDataStore;
    681681
    682682    typedef HashMap<const char*, RefPtr<WebContextSupplement>, PtrHash<const char*>> WebContextSupplementMap;

  • trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm

    r250150 r250169  
    2828
    2929#import "CookieStorageUtilsCF.h"
     30#import "SandboxUtilities.h"
    3031#import "StorageManager.h"
    3132#import "WebResourceLoadStatisticsStore.h"
    … …  
    230231}
    231232
    232 }
     233NSString *WebDatabaseDirectoryDefaultsKey = @"WebDatabaseDirectory";
     234NSString *WebStorageDirectoryDefaultsKey = @"WebKitLocalStorageDatabasePathPreferenceKey";
     235NSString *WebKitMediaCacheDirectoryDefaultsKey = @"WebKitMediaCacheDirectory";
     236NSString *WebKitMediaKeysStorageDirectoryDefaultsKey = @"WebKitMediaKeysStorageDirectory";
     237
     238WTF::String WebsiteDataStore::defaultApplicationCacheDirectory()
     239{
     240#if PLATFORM(IOS_FAMILY)
     241    // This quirk used to make these apps share application cache storage, but doesn't accomplish that any more.
     242    // Preserving it avoids the need to migrate data when upgrading.
     243    // FIXME: Ideally we should just have Safari, WebApp, and webbookmarksd create a data store with
     244    // this application cache path, but that's not supported as of right now.
     245    if (WebCore::IOSApplication::isMobileSafari() || WebCore::IOSApplication::isWebApp() || WebCore::IOSApplication::isWebBookmarksD()) {
     246        NSString *cachePath = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches/com.apple.WebAppCache"];
     247
     248        return WebKit::stringByResolvingSymlinksInPath(cachePath.stringByStandardizingPath);
     249    }
     250#endif
     251
     252    return cacheDirectoryFileSystemRepresentation("OfflineWebApplicationCache");
     253}
     254
     255WTF::String WebsiteDataStore::defaultCacheStorageDirectory()
     256{
     257    return cacheDirectoryFileSystemRepresentation("CacheStorage");
     258}
     259
     260WTF::String WebsiteDataStore::defaultNetworkCacheDirectory()
     261{
     262    return cacheDirectoryFileSystemRepresentation("NetworkCache");
     263}
     264
     265WTF::String WebsiteDataStore::defaultMediaCacheDirectory()
     266{
     267    return tempDirectoryFileSystemRepresentation("MediaCache");
     268}
     269
     270WTF::String WebsiteDataStore::defaultIndexedDBDatabaseDirectory()
     271{
     272    return websiteDataDirectoryFileSystemRepresentation("IndexedDB");
     273}
     274
     275WTF::String WebsiteDataStore::defaultServiceWorkerRegistrationDirectory()
     276{
     277    return cacheDirectoryFileSystemRepresentation("ServiceWorkers");
     278}
     279
     280WTF::String WebsiteDataStore::defaultLocalStorageDirectory()
     281{
     282    return websiteDataDirectoryFileSystemRepresentation("LocalStorage");
     283}
     284
     285WTF::String WebsiteDataStore::defaultMediaKeysStorageDirectory()
     286{
     287    return websiteDataDirectoryFileSystemRepresentation("MediaKeys");
     288}
     289
     290WTF::String WebsiteDataStore::defaultWebSQLDatabaseDirectory()
     291{
     292    return websiteDataDirectoryFileSystemRepresentation("WebSQL");
     293}
     294
     295WTF::String WebsiteDataStore::defaultResourceLoadStatisticsDirectory()
     296{
     297    return websiteDataDirectoryFileSystemRepresentation("ResourceLoadStatistics");
     298}
     299
     300WTF::String WebsiteDataStore::defaultJavaScriptConfigurationDirectory()
     301{
     302    return tempDirectoryFileSystemRepresentation("JavaScriptCoreDebug", ShouldCreateDirectory::No);
     303}
     304
     305WTF::String WebsiteDataStore::tempDirectoryFileSystemRepresentation(const WTF::String& directoryName, ShouldCreateDirectory shouldCreateDirectory)
     306{
     307    static dispatch_once_t onceToken;
     308    static NSURL *tempURL;
     309   
     310    dispatch_once(&onceToken, ^{
     311        NSURL *url = [NSURL fileURLWithPath:NSTemporaryDirectory() isDirectory:YES];
     312        if (!url)
     313            RELEASE_ASSERT_NOT_REACHED();
     314       
     315        if (!WebKit::processHasContainer()) {
     316            NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
     317            if (!bundleIdentifier)
     318                bundleIdentifier = [NSProcessInfo processInfo].processName;
     319            url = [url URLByAppendingPathComponent:bundleIdentifier isDirectory:YES];
     320        }
     321       
     322        tempURL = [[url URLByAppendingPathComponent:@"WebKit" isDirectory:YES] retain];
     323    });
     324   
     325    NSURL *url = [tempURL URLByAppendingPathComponent:directoryName isDirectory:YES];
     326
     327    if (shouldCreateDirectory == ShouldCreateDirectory::Yes
     328        && (![[NSFileManager defaultManager] createDirectoryAtURL:url withIntermediateDirectories:YES attributes:nil error:nullptr]))
     329        LOG_ERROR("Failed to create directory %@", url);
     330   
     331    return url.absoluteURL.path.fileSystemRepresentation;
     332}
     333
     334WTF::String WebsiteDataStore::cacheDirectoryFileSystemRepresentation(const WTF::String& directoryName)
     335{
     336    static dispatch_once_t onceToken;
     337    static NSURL *cacheURL;
     338
     339    dispatch_once(&onceToken, ^{
     340        NSURL *url = [[NSFileManager defaultManager] URLForDirectory:NSCachesDirectory inDomain:NSUserDomainMask appropriateForURL:nullptr create:NO error:nullptr];
     341        if (!url)
     342            RELEASE_ASSERT_NOT_REACHED();
     343
     344        if (!WebKit::processHasContainer()) {
     345            NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
     346            if (!bundleIdentifier)
     347                bundleIdentifier = [NSProcessInfo processInfo].processName;
     348            url = [url URLByAppendingPathComponent:bundleIdentifier isDirectory:YES];
     349        }
     350
     351        cacheURL = [[url URLByAppendingPathComponent:@"WebKit" isDirectory:YES] retain];
     352    });
     353
     354    NSURL *url = [cacheURL URLByAppendingPathComponent:directoryName isDirectory:YES];
     355    if (![[NSFileManager defaultManager] createDirectoryAtURL:url withIntermediateDirectories:YES attributes:nil error:nullptr])
     356        LOG_ERROR("Failed to create directory %@", url);
     357
     358    return url.absoluteURL.path.fileSystemRepresentation;
     359}
     360
     361WTF::String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const WTF::String& directoryName)
     362{
     363    static dispatch_once_t onceToken;
     364    static NSURL *websiteDataURL;
     365
     366    dispatch_once(&onceToken, ^{
     367        NSURL *url = [[NSFileManager defaultManager] URLForDirectory:NSLibraryDirectory inDomain:NSUserDomainMask appropriateForURL:nullptr create:NO error:nullptr];
     368        if (!url)
     369            RELEASE_ASSERT_NOT_REACHED();
     370
     371        url = [url URLByAppendingPathComponent:@"WebKit" isDirectory:YES];
     372
     373        if (!WebKit::processHasContainer()) {
     374            NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
     375            if (!bundleIdentifier)
     376                bundleIdentifier = [NSProcessInfo processInfo].processName;
     377            url = [url URLByAppendingPathComponent:bundleIdentifier isDirectory:YES];
     378        }
     379
     380        websiteDataURL = [[url URLByAppendingPathComponent:@"WebsiteData" isDirectory:YES] retain];
     381    });
     382
     383    NSURL *url = [websiteDataURL URLByAppendingPathComponent:directoryName isDirectory:YES];
     384    if (![[NSFileManager defaultManager] createDirectoryAtURL:url withIntermediateDirectories:YES attributes:nil error:nullptr])
     385        LOG_ERROR("Failed to create directory %@", url);
     386
     387    return url.absoluteURL.path.fileSystemRepresentation;
     388}
     389
     390}

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

    r250150 r250169  
    2727#include "WebsiteDataStore.h"
    2828
     29#include "APIHTTPCookieStore.h"
    2930#include "APIProcessPoolConfiguration.h"
    3031#include "APIWebsiteDataRecord.h"
    31 #include "APIWebsiteDataStore.h"
    3232#include "AuthenticatorManager.h"
    3333#include "DeviceIdHashSaltStorage.h"
    … …  
    3636#include "ShouldGrandfatherStatistics.h"
    3737#include "StorageAccessStatus.h"
     38#include "WebKit2Initialize.h"
    3839#include "WebPageProxy.h"
    3940#include "WebProcessCache.h"
    … …  
    154155}
    155156
     157static RefPtr<WebsiteDataStore>& globalDefaultDataStore()
     158{
     159    static NeverDestroyed<RefPtr<WebsiteDataStore>> globalDefaultDataStore;
     160    return globalDefaultDataStore.get();
     161}
     162
     163Ref<WebsiteDataStore> WebsiteDataStore::defaultDataStore()
     164{
     165    InitializeWebKit2();
     166
     167    auto& store = globalDefaultDataStore();
     168    if (!store)
     169        store = adoptRef(new WebsiteDataStore(defaultDataStoreConfiguration(), PAL::SessionID::defaultSessionID()));
     170
     171    return *store;
     172}
     173
     174void WebsiteDataStore::deleteDefaultDataStoreForTesting()
     175{
     176    globalDefaultDataStore() = nullptr;
     177}
     178
     179bool WebsiteDataStore::defaultDataStoreExists()
     180{
     181    return !!globalDefaultDataStore();
     182}
     183
     184Ref<WebKit::WebsiteDataStoreConfiguration> WebsiteDataStore::defaultDataStoreConfiguration()
     185{
     186    auto configuration = WebsiteDataStoreConfiguration::create();
     187
     188    configuration->setPersistent(true);
     189
     190    configuration->setApplicationCacheDirectory(defaultApplicationCacheDirectory());
     191    configuration->setCacheStorageDirectory(defaultCacheStorageDirectory());
     192    configuration->setNetworkCacheDirectory(defaultNetworkCacheDirectory());
     193    configuration->setMediaCacheDirectory(defaultMediaCacheDirectory());
     194
     195    configuration->setIndexedDBDatabaseDirectory(defaultIndexedDBDatabaseDirectory());
     196    configuration->setServiceWorkerRegistrationDirectory(defaultServiceWorkerRegistrationDirectory());
     197    configuration->setWebSQLDatabaseDirectory(defaultWebSQLDatabaseDirectory());
     198    configuration->setLocalStorageDirectory(defaultLocalStorageDirectory());
     199    configuration->setMediaKeysStorageDirectory(defaultMediaKeysStorageDirectory());
     200    configuration->setResourceLoadStatisticsDirectory(defaultResourceLoadStatisticsDirectory());
     201    configuration->setDeviceIdHashSaltsStorageDirectory(defaultDeviceIdHashSaltsStorageDirectory());
     202
     203    configuration->setJavaScriptConfigurationDirectory(defaultJavaScriptConfigurationDirectory());
     204
     205    return configuration;
     206}
     207
    156208void WebsiteDataStore::maybeRegisterWithSessionIDMap()
    157209{
    … …  
    17271779{
    17281780    if (auto* processPoolDataStore = processPool.websiteDataStore())
    1729         return &processPoolDataStore->websiteDataStore() == this;
     1781        return processPoolDataStore == this;
    17301782    return false;
    17311783}
    … …  
    20572109}
    20582110
    2059 }
     2111#if !PLATFORM(COCOA)
     2112WTF::String WebsiteDataStore::defaultMediaCacheDirectory()
     2113{
     2114    // FIXME: Implement. https://bugs.webkit.org/show_bug.cgi?id=156369 and https://bugs.webkit.org/show_bug.cgi?id=156370
     2115    return WTF::String();
     2116}
     2117
     2118WTF::String WebsiteDataStore::defaultJavaScriptConfigurationDirectory()
     2119{
     2120    // FIXME: Implement.
     2121    return WTF::String();
     2122}
     2123#endif
     2124
     2125#if !USE(GLIB)
     2126WTF::String WebsiteDataStore::defaultDeviceIdHashSaltsStorageDirectory()
     2127{
     2128    // Not implemented.
     2129    return WTF::String();
     2130}
     2131#endif
     2132
     2133}

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

    r250150 r250169  
    9393#endif
    9494
    95 class WebsiteDataStore : public RefCounted<WebsiteDataStore>, public Identified<WebsiteDataStore>, public CanMakeWeakPtr<WebsiteDataStore>  {
     95class WebsiteDataStore : public API::ObjectImpl<API::Object::Type::WebsiteDataStore>, public Identified<WebsiteDataStore>, public CanMakeWeakPtr<WebsiteDataStore>  {
    9696public:
     97    static Ref<WebsiteDataStore> defaultDataStore();
     98    static bool defaultDataStoreExists();
     99    static void deleteDefaultDataStoreForTesting();
     100    static Ref<WebsiteDataStoreConfiguration> defaultDataStoreConfiguration();
     101   
    97102    static Ref<WebsiteDataStore> createNonPersistent();
    98103    static Ref<WebsiteDataStore> create(Ref<WebsiteDataStoreConfiguration>&&, PAL::SessionID);
    99     virtual ~WebsiteDataStore();
     104
     105    WebsiteDataStore(PAL::SessionID);
     106    WebsiteDataStore(Ref<WebsiteDataStoreConfiguration>&&, PAL::SessionID);
     107    ~WebsiteDataStore();
    100108
    101109    static WebsiteDataStore* existingNonDefaultDataStoreForSessionID(PAL::SessionID);
    … …  
    262270#endif
    263271
     272    static WTF::String defaultServiceWorkerRegistrationDirectory();
     273    static WTF::String defaultLocalStorageDirectory();
     274    static WTF::String defaultResourceLoadStatisticsDirectory();
     275    static WTF::String defaultNetworkCacheDirectory();
     276    static WTF::String defaultApplicationCacheDirectory();
     277    static WTF::String defaultWebSQLDatabaseDirectory();
     278#if USE(GLIB)
     279    static WTF::String defaultHSTSDirectory();
     280#endif
     281    static WTF::String defaultIndexedDBDatabaseDirectory();
     282    static WTF::String defaultCacheStorageDirectory();
     283    static WTF::String defaultMediaCacheDirectory();
     284    static WTF::String defaultMediaKeysStorageDirectory();
     285    static WTF::String defaultDeviceIdHashSaltsStorageDirectory();
     286    static WTF::String defaultJavaScriptConfigurationDirectory();
     287   
    264288private:
    265     explicit WebsiteDataStore(PAL::SessionID);
    266     explicit WebsiteDataStore(Ref<WebsiteDataStoreConfiguration>&&, PAL::SessionID);
    267 
    268289    void fetchDataAndApply(OptionSet<WebsiteDataType>, OptionSet<WebsiteDataFetchOption>, RefPtr<WorkQueue>&&, Function<void(Vector<WebsiteDataRecord>)>&& apply);
    269290
    … …  
    275296    void platformSetNetworkParameters(WebsiteDataStoreParameters&);
    276297#endif
     298
     299    WebsiteDataStore();
     300
     301    enum class ShouldCreateDirectory { No, Yes };
     302    static WTF::String tempDirectoryFileSystemRepresentation(const WTF::String& directoryName, ShouldCreateDirectory = ShouldCreateDirectory::Yes);
     303    static WTF::String cacheDirectoryFileSystemRepresentation(const WTF::String& directoryName);
     304    static WTF::String websiteDataDirectoryFileSystemRepresentation(const WTF::String& directoryName);
    277305
    278306    HashSet<RefPtr<WebProcessPool>> processPools(size_t count = std::numeric_limits<size_t>::max(), bool ensureAPoolExists = true) const;

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp

    r250150 r250169  
    2727#include "WebsiteDataStoreConfiguration.h"
    2828
    29 #include "APIWebsiteDataStore.h"
     29#include "WebsiteDataStore.h"
    3030
    3131namespace WebKit {

  • trunk/Source/WebKit/UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp

    r249778 r250169  
    2828
    2929#include <WebCore/NotImplemented.h>
     30#include <wtf/FileSystem.h>
    3031
    3132namespace WebKit {
    … …  
    4647}
    4748
     49String WebsiteDataStore::defaultApplicationCacheDirectory()
     50{
     51    return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "ApplicationCache");
     52}
     53
     54String WebsiteDataStore::defaultCacheStorageDirectory()
     55{
     56    return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "CacheStorage");
     57}
     58
     59String WebsiteDataStore::defaultNetworkCacheDirectory()
     60{
     61    return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "NetworkCache");
     62}
     63
     64String WebsiteDataStore::defaultIndexedDBDatabaseDirectory()
     65{
     66    return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "IndexedDB");
     67}
     68
     69String WebsiteDataStore::defaultServiceWorkerRegistrationDirectory()
     70{
     71    return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "ServiceWorkers");
     72}
     73
     74String WebsiteDataStore::defaultLocalStorageDirectory()
     75{
     76    return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "LocalStorage");
     77}
     78
     79String WebsiteDataStore::defaultMediaKeysStorageDirectory()
     80{
     81    return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "MediaKeyStorage");
     82}
     83
     84String WebsiteDataStore::defaultWebSQLDatabaseDirectory()
     85{
     86    return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "WebSQL");
     87}
     88
     89String WebsiteDataStore::defaultResourceLoadStatisticsDirectory()
     90{
     91    return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), "ResourceLoadStatistics");
     92}
     93
     94String WebsiteDataStore::cacheDirectoryFileSystemRepresentation(const String& directoryName)
     95{
     96    return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), directoryName);
     97}
     98
     99String WebsiteDataStore::websiteDataDirectoryFileSystemRepresentation(const String& directoryName)
     100{
     101    return FileSystem::pathByAppendingComponent(FileSystem::localUserSpecificStorageDirectory(), directoryName);
     102}
     103
    48104} // namespace WebKit

  • trunk/Source/WebKit/UIProcess/glib/WebProcessProxyGLib.cpp

    r249778 r250169  
    4444            // Prewarmed processes don't have a WebsiteDataStore yet, so use the primary WebsiteDataStore from the WebProcessPool.
    4545            // The process won't be used if current WebsiteDataStore is different than the WebProcessPool primary one.
    46             if (auto* apiDataStore = m_processPool->websiteDataStore())
    47                 dataStore = &apiDataStore->websiteDataStore();
     46            dataStore = m_processPool->websiteDataStore();
    4847        }
    4948

  • trunk/Source/WebKit/UIProcess/glib/WebsiteDataStoreGLib.cpp

    r250168 r250169  
    2525
    2626#include "config.h"
    27 #include "APIWebsiteDataStore.h"
     27#include "WebsiteDataStore.h"
    2828
    2929#include <wtf/FileSystem.h>
    … …  
    3636#endif
    3737
    38 namespace API {
     38namespace WebKit {
    3939
    4040WTF::String WebsiteDataStore::defaultApplicationCacheDirectory()

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r250148 r250169  
    179179                1A334DED16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */; };
    180180                1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */; };
    181                 1A3635AA1A3144A300ED6197 /* APIWebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */; };
    182181                1A3C888018A5ABAE00C4C962 /* WKPreferencesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */; };
    183182                1A3CC16718906ACF001E6ED8 /* WKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16518906ACF001E6ED8 /* WKWebView.h */; settings = {ATTRIBUTES = (Public, ); }; };
    … …  
    21242123                1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StorageAreaMapMessageReceiver.cpp; path = DerivedSources/WebKit2/StorageAreaMapMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    21252124                1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StorageAreaMapMessages.h; path = DerivedSources/WebKit2/StorageAreaMapMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
    2126                 1A3635A71A3144A300ED6197 /* APIWebsiteDataStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIWebsiteDataStore.cpp; sourceTree = "<group>"; };
    2127                 1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIWebsiteDataStore.h; sourceTree = "<group>"; };
    2128                 1A3635AB1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = APIWebsiteDataStoreCocoa.mm; sourceTree = "<group>"; };
    21292125                1A3A73CB1A48C6D4007231B3 /* APIPageGroupHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIPageGroupHandle.cpp; sourceTree = "<group>"; };
    21302126                1A3A73CC1A48C6D4007231B3 /* APIPageGroupHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIPageGroupHandle.h; sourceTree = "<group>"; };
    … …  
    63726368                                5CA46E7A21F1A23900CE86B4 /* APIHTTPCookieStoreCocoa.mm */,
    63736369                                FED3C1DA1B447AE800E0EB7F /* APISerializedScriptValueCocoa.mm */,
    6374                                 1A3635AB1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm */,
    63756370                                1AFDE64319510B5500C48FFA /* LegacyBundleForClass.mm */,
    63766371                                1C20935E22318CB000026A39 /* NSAttributedString.h */,
    … …  
    79847979                                1AE286811C7F93860069AC4F /* APIWebsiteDataRecord.cpp */,
    79857980                                1AE286821C7F93860069AC4F /* APIWebsiteDataRecord.h */,
    7986                                 1A3635A71A3144A300ED6197 /* APIWebsiteDataStore.cpp */,
    7987                                 1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */,
    79887981                                5C8DD37D1FE4501100F2A556 /* APIWebsitePolicies.cpp */,
    79897982                                5C8DD37C1FE4501100F2A556 /* APIWebsitePolicies.h */,
    … …  
    93899382                                C5E1AFEF16B21029006CC1F2 /* APIWebArchiveResource.h in Headers */,
    93909383                                1AE286841C7F93860069AC4F /* APIWebsiteDataRecord.h in Headers */,
    9391                                 1A3635AA1A3144A300ED6197 /* APIWebsiteDataStore.h in Headers */,
    93929384                                1A6563E51B7A8C50009CF787 /* APIWindowFeatures.h in Headers */,
    93939385                                F48D2A8521583A7E00C6752B /* AppKitSPI.h in Headers */,

  • trunk/Source/WebKit/WebProcess/MediaCache/WebMediaKeyStorageManager.cpp

    r249778 r250169  
    3838void WebMediaKeyStorageManager::setWebsiteDataStore(const WebProcessDataStoreParameters& parameters)
    3939{
    40     ASSERT(!parameters.mediaKeyStorageDirectory.isEmpty());
    4140    m_mediaKeyStorageDirectory = parameters.mediaKeyStorageDirectory;
    4241}
Note: See TracChangeset for help on using the changeset viewer.