Part 2 of: Rename DatabaseProcess to StorageProcess.
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Aug 2017 18:18:03 +0000 (18:18 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Aug 2017 18:18:03 +0000 (18:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=174880

Reviewed by Andy Estes.

Source/WebKit:

Rename some more variables, classes, etc. to reflect the change.

* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles):

* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::grantSandboxExtensionsToStorageProcessForBlobs):
(WebKit::NetworkProcess::didGrantSandboxExtensionsToStorageProcessForBlobs):
(WebKit::NetworkProcess::grantSandboxExtensionsToDatabaseProcessForBlobs): Deleted.
(WebKit::NetworkProcess::didGrantSandboxExtensionsToDatabaseProcessForBlobs): Deleted.
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in:

* Shared/ProcessExecutablePath.h:
* Shared/gtk/ProcessExecutablePathGtk.cpp:
(WebKit::executablePathOfStorageProcess):
(WebKit::executablePathOfDatabaseProcess): Deleted.
* Shared/wpe/ProcessExecutablePathWPE.cpp:
(WebKit::executablePathOfStorageProcess):
(WebKit::executablePathOfDatabaseProcess): Deleted.

* StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp:
(WebKit::WebIDBConnectionToClient::putOrAdd):

* StorageProcess/StorageProcess.cpp:
(WebKit::StorageProcess::initializeWebsiteDataStore):
(WebKit::StorageProcess::postStorageTask):
(WebKit::StorageProcess::performNextStorageTask):
(WebKit::StorageProcess::createStorageToWebProcessConnection):
(WebKit::StorageProcess::fetchWebsiteData):
(WebKit::StorageProcess::postDatabaseTask): Deleted.
(WebKit::StorageProcess::performNextDatabaseTask): Deleted.
(WebKit::StorageProcess::createDatabaseToWebProcessConnection): Deleted.
* StorageProcess/StorageProcess.h:
* StorageProcess/StorageProcess.messages.in:
* StorageProcess/mac/StorageProcessMac.mm:
(WebKit::StorageProcess::initializeProcessName):

* UIProcess/API/C/WKContext.cpp:
(WKContextGetDatabaseProcessIdentifier):

* UIProcess/API/Cocoa/WKProcessPool.mm:
(-[WKProcessPool _terminateStorageProcess]):
(-[WKProcessPool _storageProcessIdentifier]):
(-[WKProcessPool _terminateDatabaseProcess]): Deleted.
(-[WKProcessPool _databaseProcessIdentifier]): Deleted.
* UIProcess/API/Cocoa/WKProcessPoolPrivate.h:

* UIProcess/ChildProcessProxy.cpp:
(WebKit::ChildProcessProxy::getLaunchOptions):

* UIProcess/Launcher/ProcessLauncher.h:
* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
(WebKit::ProcessLauncher::launchProcess):
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::serviceName):
* UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp:
(WebKit::ProcessLauncher::launchProcess):

* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::grantSandboxExtensionsToStorageProcessForBlobs):
(WebKit::NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs): Deleted.
* UIProcess/Network/NetworkProcessProxy.h:
* UIProcess/Network/NetworkProcessProxy.messages.in:

* UIProcess/Storage/StorageProcessProxy.cpp:
(WebKit::StorageProcessProxy::getLaunchOptions):
(WebKit::StorageProcessProxy::getStorageProcessConnection):
(WebKit::StorageProcessProxy::didClose):
(WebKit::StorageProcessProxy::didCreateStorageToWebProcessConnection):
(WebKit::StorageProcessProxy::didFinishLaunching):
(WebKit::StorageProcessProxy::getDatabaseProcessConnection): Deleted.
(WebKit::StorageProcessProxy::didCreateDatabaseToWebProcessConnection): Deleted.
* UIProcess/Storage/StorageProcessProxy.h:
* UIProcess/Storage/StorageProcessProxy.messages.in:

* UIProcess/WebContextClient.cpp:
(WebKit::WebContextClient::storageProcessDidCrash):
(WebKit::WebContextClient::databaseProcessDidCrash): Deleted.
* UIProcess/WebContextClient.h:

* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::ensureStorageProcessAndWebsiteDataStore):
(WebKit::WebProcessPool::getStorageProcessConnection):
(WebKit::WebProcessPool::storageProcessCrashed):
(WebKit::WebProcessPool::pageAddedToProcess):
(WebKit::WebProcessPool::storageProcessIdentifier):
(WebKit::WebProcessPool::terminateStorageProcess):
(WebKit::WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore): Deleted.
(WebKit::WebProcessPool::getDatabaseProcessConnection): Deleted.
(WebKit::WebProcessPool::databaseProcessCrashed): Deleted.
(WebKit::WebProcessPool::databaseProcessIdentifier): Deleted.
(WebKit::WebProcessPool::terminateDatabaseProcess): Deleted.
* UIProcess/WebProcessPool.h:
(WebKit::WebProcessPool::sendToStorageProcessRelaunchingIfNecessary):
(WebKit::WebProcessPool::sendToDatabaseProcessRelaunchingIfNecessary): Deleted.

* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::getStorageProcessConnection):
(WebKit::WebProcessProxy::getDatabaseProcessConnection): Deleted.
* UIProcess/WebProcessProxy.h:
* UIProcess/WebProcessProxy.messages.in:

* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::fetchDataAndApply):
(WebKit::WebsiteDataStore::removeData):
(WebKit::WebsiteDataStore::storageProcessParameters):
(WebKit::WebsiteDataStore::databaseProcessParameters): Deleted.
* UIProcess/WebsiteData/WebsiteDataStore.h:

* WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:
(WebKit::WebIDBConnectionToServer::messageSenderConnection):
* WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:

* WebProcess/Databases/WebDatabaseProvider.cpp:
(WebKit::WebDatabaseProvider::idbConnectionToServerForSession):

* WebProcess/Storage/WebToStorageProcessConnection.cpp:
(WebKit::WebToStorageProcessConnection::WebToStorageProcessConnection):
(WebKit::WebToStorageProcessConnection::~WebToStorageProcessConnection):
(WebKit::WebToStorageProcessConnection::didReceiveMessage):
(WebKit::WebToStorageProcessConnection::didClose):
(WebKit::WebToStorageProcessConnection::didReceiveInvalidMessage):
(WebKit::WebToStorageProcessConnection::idbConnectionToServerForSession):
(WebKit::WebToDatabaseProcessConnection::WebToDatabaseProcessConnection): Deleted.
(WebKit::WebToDatabaseProcessConnection::~WebToDatabaseProcessConnection): Deleted.
(WebKit::WebToDatabaseProcessConnection::didReceiveMessage): Deleted.
(WebKit::WebToDatabaseProcessConnection::didClose): Deleted.
(WebKit::WebToDatabaseProcessConnection::didReceiveInvalidMessage): Deleted.
(WebKit::WebToDatabaseProcessConnection::idbConnectionToServerForSession): Deleted.
* WebProcess/Storage/WebToStorageProcessConnection.h:
(WebKit::WebToStorageProcessConnection::create):
(WebKit::WebToDatabaseProcessConnection::create): Deleted.
(WebKit::WebToDatabaseProcessConnection::connection): Deleted.

* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::webToStorageProcessConnectionClosed):
(WebKit::WebProcess::webToStorageProcessConnection):
(WebKit::WebProcess::ensureWebToStorageProcessConnection):
(WebKit::WebProcess::webToDatabaseProcessConnectionClosed): Deleted.
(WebKit::WebProcess::webToDatabaseProcessConnection): Deleted.
(WebKit::WebProcess::ensureWebToDatabaseProcessConnection): Deleted.
* WebProcess/WebProcess.h:

Tools:

* TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.mm:
* TestWebKitAPI/Tests/WebKit2Cocoa/IDBIndexUpgradeToV2.mm:
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBDatabaseProcessKill.mm:
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm:
* TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBPersistence.mm:
* TestWebKitAPI/Tests/WebKit2Cocoa/ResourceLoadStatistics.mm:
* TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm:
* TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@220105 268f45cc-cd09-0410-ab3c-d52691b4dbfc

52 files changed:
Source/WebKit/ChangeLog
Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
Source/WebKit/NetworkProcess/NetworkProcess.cpp
Source/WebKit/NetworkProcess/NetworkProcess.h
Source/WebKit/NetworkProcess/NetworkProcess.messages.in
Source/WebKit/Shared/ProcessExecutablePath.h
Source/WebKit/Shared/gtk/ProcessExecutablePathGtk.cpp
Source/WebKit/Shared/wpe/ProcessExecutablePathWPE.cpp
Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp
Source/WebKit/StorageProcess/StorageProcess.cpp
Source/WebKit/StorageProcess/StorageProcess.h
Source/WebKit/StorageProcess/StorageProcess.messages.in
Source/WebKit/StorageProcess/mac/StorageProcessMac.mm
Source/WebKit/UIProcess/API/C/WKContext.cpp
Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h
Source/WebKit/UIProcess/ChildProcessProxy.cpp
Source/WebKit/UIProcess/Launcher/ProcessLauncher.h
Source/WebKit/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm
Source/WebKit/UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp
Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
Source/WebKit/UIProcess/Network/NetworkProcessProxy.h
Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in
Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp
Source/WebKit/UIProcess/Storage/StorageProcessProxy.h
Source/WebKit/UIProcess/Storage/StorageProcessProxy.messages.in
Source/WebKit/UIProcess/WebContextClient.cpp
Source/WebKit/UIProcess/WebContextClient.h
Source/WebKit/UIProcess/WebProcessPool.cpp
Source/WebKit/UIProcess/WebProcessPool.h
Source/WebKit/UIProcess/WebProcessProxy.cpp
Source/WebKit/UIProcess/WebProcessProxy.h
Source/WebKit/UIProcess/WebProcessProxy.messages.in
Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp
Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h
Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp
Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.cpp
Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.h
Source/WebKit/WebProcess/WebProcess.cpp
Source/WebKit/WebProcess/WebProcess.h
Tools/ChangeLog
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.mm
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IDBIndexUpgradeToV2.mm
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBDatabaseProcessKill.mm
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBPersistence.mm
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ResourceLoadStatistics.mm
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm

index 7152a84..c95c7bf 100644 (file)
@@ -1,5 +1,156 @@
 2017-08-01  Brady Eidson  <beidson@apple.com>
 
+        Part 2 of: Rename DatabaseProcess to StorageProcess.
+        https://bugs.webkit.org/show_bug.cgi?id=174880
+
+        Reviewed by Andy Estes.
+
+        Rename some more variables, classes, etc. to reflect the change.
+
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        (WebKit::NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles):
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::grantSandboxExtensionsToStorageProcessForBlobs):
+        (WebKit::NetworkProcess::didGrantSandboxExtensionsToStorageProcessForBlobs):
+        (WebKit::NetworkProcess::grantSandboxExtensionsToDatabaseProcessForBlobs): Deleted.
+        (WebKit::NetworkProcess::didGrantSandboxExtensionsToDatabaseProcessForBlobs): Deleted.
+        * NetworkProcess/NetworkProcess.h:
+        * NetworkProcess/NetworkProcess.messages.in:
+
+        * Shared/ProcessExecutablePath.h:
+        * Shared/gtk/ProcessExecutablePathGtk.cpp:
+        (WebKit::executablePathOfStorageProcess):
+        (WebKit::executablePathOfDatabaseProcess): Deleted.
+        * Shared/wpe/ProcessExecutablePathWPE.cpp:
+        (WebKit::executablePathOfStorageProcess):
+        (WebKit::executablePathOfDatabaseProcess): Deleted.
+
+        * StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp:
+        (WebKit::WebIDBConnectionToClient::putOrAdd):
+
+        * StorageProcess/StorageProcess.cpp:
+        (WebKit::StorageProcess::initializeWebsiteDataStore):
+        (WebKit::StorageProcess::postStorageTask):
+        (WebKit::StorageProcess::performNextStorageTask):
+        (WebKit::StorageProcess::createStorageToWebProcessConnection):
+        (WebKit::StorageProcess::fetchWebsiteData):
+        (WebKit::StorageProcess::postDatabaseTask): Deleted.
+        (WebKit::StorageProcess::performNextDatabaseTask): Deleted.
+        (WebKit::StorageProcess::createDatabaseToWebProcessConnection): Deleted.
+        * StorageProcess/StorageProcess.h:
+        * StorageProcess/StorageProcess.messages.in:
+        * StorageProcess/mac/StorageProcessMac.mm:
+        (WebKit::StorageProcess::initializeProcessName):
+
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextGetDatabaseProcessIdentifier):
+
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        (-[WKProcessPool _terminateStorageProcess]):
+        (-[WKProcessPool _storageProcessIdentifier]):
+        (-[WKProcessPool _terminateDatabaseProcess]): Deleted.
+        (-[WKProcessPool _databaseProcessIdentifier]): Deleted.
+        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
+
+        * UIProcess/ChildProcessProxy.cpp:
+        (WebKit::ChildProcessProxy::getLaunchOptions):
+
+        * UIProcess/Launcher/ProcessLauncher.h:
+        * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+        (WebKit::ProcessLauncher::launchProcess):
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        (WebKit::serviceName):
+        * UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp:
+        (WebKit::ProcessLauncher::launchProcess):
+
+        * UIProcess/Network/NetworkProcessProxy.cpp:
+        (WebKit::NetworkProcessProxy::grantSandboxExtensionsToStorageProcessForBlobs):
+        (WebKit::NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs): Deleted.
+        * UIProcess/Network/NetworkProcessProxy.h:
+        * UIProcess/Network/NetworkProcessProxy.messages.in:
+
+        * UIProcess/Storage/StorageProcessProxy.cpp:
+        (WebKit::StorageProcessProxy::getLaunchOptions):
+        (WebKit::StorageProcessProxy::getStorageProcessConnection):
+        (WebKit::StorageProcessProxy::didClose):
+        (WebKit::StorageProcessProxy::didCreateStorageToWebProcessConnection):
+        (WebKit::StorageProcessProxy::didFinishLaunching):
+        (WebKit::StorageProcessProxy::getDatabaseProcessConnection): Deleted.
+        (WebKit::StorageProcessProxy::didCreateDatabaseToWebProcessConnection): Deleted.
+        * UIProcess/Storage/StorageProcessProxy.h:
+        * UIProcess/Storage/StorageProcessProxy.messages.in:
+
+        * UIProcess/WebContextClient.cpp:
+        (WebKit::WebContextClient::storageProcessDidCrash):
+        (WebKit::WebContextClient::databaseProcessDidCrash): Deleted.
+        * UIProcess/WebContextClient.h:
+
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::ensureStorageProcessAndWebsiteDataStore):
+        (WebKit::WebProcessPool::getStorageProcessConnection):
+        (WebKit::WebProcessPool::storageProcessCrashed):
+        (WebKit::WebProcessPool::pageAddedToProcess):
+        (WebKit::WebProcessPool::storageProcessIdentifier):
+        (WebKit::WebProcessPool::terminateStorageProcess):
+        (WebKit::WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore): Deleted.
+        (WebKit::WebProcessPool::getDatabaseProcessConnection): Deleted.
+        (WebKit::WebProcessPool::databaseProcessCrashed): Deleted.
+        (WebKit::WebProcessPool::databaseProcessIdentifier): Deleted.
+        (WebKit::WebProcessPool::terminateDatabaseProcess): Deleted.
+        * UIProcess/WebProcessPool.h:
+        (WebKit::WebProcessPool::sendToStorageProcessRelaunchingIfNecessary):
+        (WebKit::WebProcessPool::sendToDatabaseProcessRelaunchingIfNecessary): Deleted.
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::getStorageProcessConnection):
+        (WebKit::WebProcessProxy::getDatabaseProcessConnection): Deleted.
+        * UIProcess/WebProcessProxy.h:
+        * UIProcess/WebProcessProxy.messages.in:
+
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::fetchDataAndApply):
+        (WebKit::WebsiteDataStore::removeData):
+        (WebKit::WebsiteDataStore::storageProcessParameters):
+        (WebKit::WebsiteDataStore::databaseProcessParameters): Deleted.
+        * UIProcess/WebsiteData/WebsiteDataStore.h:
+
+        * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:
+        (WebKit::WebIDBConnectionToServer::messageSenderConnection):
+        * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
+
+        * WebProcess/Databases/WebDatabaseProvider.cpp:
+        (WebKit::WebDatabaseProvider::idbConnectionToServerForSession):
+
+        * WebProcess/Storage/WebToStorageProcessConnection.cpp:
+        (WebKit::WebToStorageProcessConnection::WebToStorageProcessConnection):
+        (WebKit::WebToStorageProcessConnection::~WebToStorageProcessConnection):
+        (WebKit::WebToStorageProcessConnection::didReceiveMessage):
+        (WebKit::WebToStorageProcessConnection::didClose):
+        (WebKit::WebToStorageProcessConnection::didReceiveInvalidMessage):
+        (WebKit::WebToStorageProcessConnection::idbConnectionToServerForSession):
+        (WebKit::WebToDatabaseProcessConnection::WebToDatabaseProcessConnection): Deleted.
+        (WebKit::WebToDatabaseProcessConnection::~WebToDatabaseProcessConnection): Deleted.
+        (WebKit::WebToDatabaseProcessConnection::didReceiveMessage): Deleted.
+        (WebKit::WebToDatabaseProcessConnection::didClose): Deleted.
+        (WebKit::WebToDatabaseProcessConnection::didReceiveInvalidMessage): Deleted.
+        (WebKit::WebToDatabaseProcessConnection::idbConnectionToServerForSession): Deleted.
+        * WebProcess/Storage/WebToStorageProcessConnection.h:
+        (WebKit::WebToStorageProcessConnection::create):
+        (WebKit::WebToDatabaseProcessConnection::create): Deleted.
+        (WebKit::WebToDatabaseProcessConnection::connection): Deleted.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::webToStorageProcessConnectionClosed):
+        (WebKit::WebProcess::webToStorageProcessConnection):
+        (WebKit::WebProcess::ensureWebToStorageProcessConnection):
+        (WebKit::WebProcess::webToDatabaseProcessConnectionClosed): Deleted.
+        (WebKit::WebProcess::webToDatabaseProcessConnection): Deleted.
+        (WebKit::WebProcess::ensureWebToDatabaseProcessConnection): Deleted.
+        * WebProcess/WebProcess.h:
+
+2017-08-01  Brady Eidson  <beidson@apple.com>
+
         Part 1 of: Rename DatabaseProcess to StorageProcess.
         https://bugs.webkit.org/show_bug.cgi?id=174879
 
index 349bc47..5f82992 100644 (file)
@@ -398,7 +398,7 @@ void NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles(const Vector<Stri
         for (auto& file : fileReferences)
             file->revokeFileAccess();
 
-        NetworkProcess::singleton().grantSandboxExtensionsToDatabaseProcessForBlobs(fileNames, [this, protectedThis = WTFMove(protectedThis), requestIdentifier, fileNames]() {
+        NetworkProcess::singleton().grantSandboxExtensionsToStorageProcessForBlobs(fileNames, [this, protectedThis = WTFMove(protectedThis), requestIdentifier, fileNames]() {
             if (!m_connection->isValid())
                 return;
 
index 80a4e51..8a061cd 100644 (file)
@@ -303,16 +303,16 @@ void NetworkProcess::destroySession(SessionID sessionID)
     SessionTracker::destroySession(sessionID);
 }
 
-void NetworkProcess::grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler)
+void NetworkProcess::grantSandboxExtensionsToStorageProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler)
 {
     static uint64_t lastRequestID;
 
     uint64_t requestID = ++lastRequestID;
     m_sandboxExtensionForBlobsCompletionHandlers.set(requestID, WTFMove(completionHandler));
-    parentProcessConnection()->send(Messages::NetworkProcessProxy::GrantSandboxExtensionsToDatabaseProcessForBlobs(requestID, filenames), 0);
+    parentProcessConnection()->send(Messages::NetworkProcessProxy::GrantSandboxExtensionsToStorageProcessForBlobs(requestID, filenames), 0);
 }
 
-void NetworkProcess::didGrantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID)
+void NetworkProcess::didGrantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID)
 {
     if (auto handler = m_sandboxExtensionForBlobsCompletionHandlers.take(requestID))
         handler();
index bd2188b..6746be9 100644 (file)
@@ -115,7 +115,7 @@ public:
 
     void ensurePrivateBrowsingSession(WebsiteDataStoreParameters&&);
 
-    void grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler);
+    void grantSandboxExtensionsToStorageProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler);
 
 #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
     void updateCookiePartitioningForTopPrivatelyOwnedDomains(const Vector<String>& domainsToRemove, const Vector<String>& domainsToAdd, bool shouldClearFirst);
@@ -197,7 +197,7 @@ private:
     void setAllowsAnySSLCertificateForWebSocket(bool);
     void syncAllCookies();
 
-    void didGrantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID);
+    void didGrantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID);
 
 #if USE(SOUP)
     void setIgnoreTLSErrors(bool);
index 20ce64b..36e4777 100644 (file)
@@ -80,7 +80,7 @@ messages -> NetworkProcess LegacyReceiver {
     CancelPrepareToSuspend()
     ProcessDidResume()
 
-    DidGrantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID)
+    DidGrantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID)
 
 #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
     UpdateCookiePartitioningForTopPrivatelyOwnedDomains(Vector<String> domainsToRemove, Vector<String> domainsToAdd, bool shouldClearFirst)
index a58a907..b5159fb 100644 (file)
@@ -32,6 +32,6 @@ namespace WebKit {
 String executablePathOfWebProcess();
 String executablePathOfPluginProcess();
 String executablePathOfNetworkProcess();
-String executablePathOfDatabaseProcess();
+String executablePathOfStorageProcess();
 
 }
index f38e1ce..8b38333 100644 (file)
@@ -84,9 +84,9 @@ String executablePathOfNetworkProcess()
     return findWebKitProcess("WebKitNetworkProcess");
 }
 
-String executablePathOfDatabaseProcess()
+String executablePathOfStorageProcess()
 {
-    return findWebKitProcess("WebKitDatabaseProcess");
+    return findWebKitProcess("WebKitStorageProcess");
 }
 
 } // namespace WebKit
index 9ef4629..22d45cb 100644 (file)
@@ -77,9 +77,9 @@ String executablePathOfNetworkProcess()
     return findWebKitProcess("WPENetworkProcess");
 }
 
-String executablePathOfDatabaseProcess()
+String executablePathOfStorageProcess()
 {
-    return findWebKitProcess("WPEDatabaseProcess");
+    return findWebKitProcess("WPEStorageProcess");
 }
 
 } // namespace WebKit
index ade69b2..1ff7be8 100644 (file)
@@ -287,7 +287,7 @@ void WebIDBConnectionToClient::putOrAdd(const IDBRequestData& request, const IDB
         && overwriteMode != static_cast<unsigned>(IndexedDB::ObjectStoreOverwriteMode::Overwrite)
         && overwriteMode != static_cast<unsigned>(IndexedDB::ObjectStoreOverwriteMode::OverwriteForCursor)) {
         // FIXME: This message from the WebProcess is corrupt.
-        // The DatabaseProcess should return early at this point, but can we also kill the bad WebProcess?
+        // The StorageProcess should return early at this point, but can we also kill the bad WebProcess?
         return;
     }
 
index f4d94bc..1cc7a6b 100644 (file)
@@ -121,7 +121,7 @@ void StorageProcess::initializeWebsiteDataStore(const StorageProcessCreationPara
     addResult.iterator->value = parameters.indexedDatabaseDirectory;
     SandboxExtension::consumePermanently(parameters.indexedDatabaseDirectoryExtensionHandle);
 
-    postDatabaseTask(createCrossThreadTask(*this, &StorageProcess::ensurePathExists, parameters.indexedDatabaseDirectory));
+    postStorageTask(createCrossThreadTask(*this, &StorageProcess::ensurePathExists, parameters.indexedDatabaseDirectory));
 #endif
 }
 
@@ -133,39 +133,39 @@ void StorageProcess::ensurePathExists(const String& path)
         LOG_ERROR("Failed to make all directories for path '%s'", path.utf8().data());
 }
 
-void StorageProcess::postDatabaseTask(CrossThreadTask&& task)
+void StorageProcess::postStorageTask(CrossThreadTask&& task)
 {
     ASSERT(RunLoop::isMain());
 
-    LockHolder locker(m_databaseTaskMutex);
+    LockHolder locker(m_storageTaskMutex);
 
-    m_databaseTasks.append(WTFMove(task));
+    m_storageTasks.append(WTFMove(task));
 
     m_queue->dispatch([this] {
-        performNextDatabaseTask();
+        performNextStorageTask();
     });
 }
 
-void StorageProcess::performNextDatabaseTask()
+void StorageProcess::performNextStorageTask()
 {
     ASSERT(!RunLoop::isMain());
 
     CrossThreadTask task;
     {
-        LockHolder locker(m_databaseTaskMutex);
-        ASSERT(!m_databaseTasks.isEmpty());
-        task = m_databaseTasks.takeFirst();
+        LockHolder locker(m_storageTaskMutex);
+        ASSERT(!m_storageTasks.isEmpty());
+        task = m_storageTasks.takeFirst();
     }
 
     task.performTask();
 }
 
-void StorageProcess::createDatabaseToWebProcessConnection()
+void StorageProcess::createStorageToWebProcessConnection()
 {
 #if USE(UNIX_DOMAIN_SOCKETS)
     IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
     m_databaseToWebProcessConnections.append(StorageToWebProcessConnection::create(socketPair.server));
-    parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateDatabaseToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);
+    parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateStorageToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);
 #elif OS(DARWIN)
     // Create the listening port.
     mach_port_t listeningPort;
@@ -175,7 +175,7 @@ void StorageProcess::createDatabaseToWebProcessConnection()
     m_databaseToWebProcessConnections.append(StorageToWebProcessConnection::create(IPC::Connection::Identifier(listeningPort)));
 
     IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
-    parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateDatabaseToWebProcessConnection(clientPort), 0);
+    parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateStorageToWebProcessConnection(clientPort), 0);
 #else
     notImplemented();
 #endif
@@ -196,7 +196,7 @@ void StorageProcess::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteData
 
     if (websiteDataTypes.contains(WebsiteDataType::IndexedDBDatabases)) {
         // FIXME: Pick the right database store based on the session ID.
-        postDatabaseTask(CrossThreadTask([this, completionHandler = WTFMove(completionHandler), path = WTFMove(path)]() mutable {
+        postStorageTask(CrossThreadTask([this, completionHandler = WTFMove(completionHandler), path = WTFMove(path)]() mutable {
             RunLoop::main().dispatch([completionHandler = WTFMove(completionHandler), securityOrigins = indexedDatabaseOrigins(path)] {
                 WebsiteData websiteData;
                 for (const auto& securityOrigin : securityOrigins)
index a67c43e..3bc72e2 100644 (file)
@@ -61,7 +61,7 @@ public:
 
     WorkQueue& queue() { return m_queue.get(); }
 
-    void postDatabaseTask(CrossThreadTask&&);
+    void postStorageTask(CrossThreadTask&&);
 
 #if ENABLE(INDEXED_DATABASE)
     // WebCore::IDBServer::IDBBackingStoreFileHandler
@@ -90,7 +90,7 @@ private:
 
     // Message Handlers
     void initializeWebsiteDataStore(const StorageProcessCreationParameters&);
-    void createDatabaseToWebProcessConnection();
+    void createStorageToWebProcessConnection();
 
     void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID);
     void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
@@ -105,7 +105,7 @@ private:
 #endif
 
     // For execution on work queue thread only
-    void performNextDatabaseTask();
+    void performNextStorageTask();
     void ensurePathExists(const String&);
 
     Vector<RefPtr<StorageToWebProcessConnection>> m_databaseToWebProcessConnections;
@@ -119,8 +119,8 @@ private:
     HashMap<String, RefPtr<SandboxExtension>> m_blobTemporaryFileSandboxExtensions;
     HashMap<uint64_t, WTF::Function<void (SandboxExtension::HandleArray&&)>> m_sandboxExtensionForBlobsCompletionHandlers;
 
-    Deque<CrossThreadTask> m_databaseTasks;
-    Lock m_databaseTaskMutex;
+    Deque<CrossThreadTask> m_storageTasks;
+    Lock m_storageTaskMutex;
 };
 
 } // namespace WebKit
index 0558737..4bdec73 100644 (file)
@@ -25,7 +25,7 @@ messages -> StorageProcess LegacyReceiver {
     InitializeWebsiteDataStore(struct WebKit::StorageProcessCreationParameters processCreationParameters)
 
     # Creates a connection for communication with a WebProcess
-    CreateDatabaseToWebProcessConnection()
+    CreateStorageToWebProcessConnection()
 
     FetchWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, uint64_t callbackID)
     DeleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
index d6af169..c038860 100644 (file)
@@ -46,7 +46,7 @@ void StorageProcess::initializeProcess(const ChildProcessInitializationParameter
 
 void StorageProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
 {
-    NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Database Storage", "visible name of the database process. The argument is the application name."), (NSString *)parameters.uiProcessName];
+    NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Storage", "visible name of the storage process. The argument is the application name."), (NSString *)parameters.uiProcessName];
     WKSetVisibleApplicationName((CFStringRef)applicationName);
 }
 
index a5019b2..db4704a 100644 (file)
@@ -590,5 +590,5 @@ pid_t WKContextGetNetworkProcessIdentifier(WKContextRef contextRef)
 
 pid_t WKContextGetDatabaseProcessIdentifier(WKContextRef contextRef)
 {
-    return toImpl(contextRef)->databaseProcessIdentifier();
+    return toImpl(contextRef)->storageProcessIdentifier();
 }
index 250f716..0779a20 100644 (file)
@@ -385,9 +385,9 @@ static NSDictionary *policiesHashMapToDictionary(const HashMap<String, HashMap<S
     _processPool->setAutomationSession(automationSession ? automationSession->_session.get() : nullptr);
 }
 
-- (void)_terminateDatabaseProcess
+- (void)_terminateStorageProcess
 {
-    _processPool->terminateDatabaseProcess();
+    _processPool->terminateStorageProcess();
 }
 
 - (void)_terminateNetworkProcess
@@ -400,9 +400,9 @@ static NSDictionary *policiesHashMapToDictionary(const HashMap<String, HashMap<S
     return _processPool->networkProcessIdentifier();
 }
 
-- (pid_t)_databaseProcessIdentifier
+- (pid_t)_storageProcessIdentifier
 {
-    return _processPool->databaseProcessIdentifier();
+    return _processPool->storageProcessIdentifier();
 }
 
 - (void)_syncNetworkProcessCookies
index 1a6c6cc..da31969 100644 (file)
 - (void)_setAutomationSession:(_WKAutomationSession *)automationSession WK_API_AVAILABLE(macosx(10.12), ios(10.0));
 
 // Test only. Should be called only while no web content processes are running.
-- (void)_terminateDatabaseProcess;
+- (void)_terminateStorageProcess;
 - (void)_terminateNetworkProcess;
 
 // Test only.
 - (pid_t)_networkProcessIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
-- (pid_t)_databaseProcessIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+- (pid_t)_storageProcessIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 // Test only.
 - (size_t)_webProcessCount WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
index fef7680..a6e4d8a 100644 (file)
@@ -70,8 +70,8 @@ void ChildProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchO
     case ProcessLauncher::ProcessType::Network:
         varname = "NETWORK_PROCESS_CMD_PREFIX";
         break;
-    case ProcessLauncher::ProcessType::Database:
-        varname = "DATABASE_PROCESS_CMD_PREFIX";
+    case ProcessLauncher::ProcessType::Storage:
+        varname = "STORAGE_PROCESS_CMD_PREFIX";
         break;
     }
     const char* processCmdPrefix = getenv(varname);
index 8a56246..6798fc9 100644 (file)
@@ -51,7 +51,7 @@ public:
         Plugin64,
 #endif
         Network,
-        Database,
+        Storage,
     };
 
     struct LaunchOptions {
index 6ed4950..256bff3 100644 (file)
@@ -81,8 +81,8 @@ void ProcessLauncher::launchProcess()
     case ProcessLauncher::ProcessType::Network:
         executablePath = executablePathOfNetworkProcess();
         break;
-    case ProcessLauncher::ProcessType::Database:
-        executablePath = executablePathOfDatabaseProcess();
+    case ProcessLauncher::ProcessType::Storage:
+        executablePath = executablePathOfStorageProcess();
         break;
     default:
         ASSERT_NOT_REACHED();
index b9efc04..30a692c 100644 (file)
@@ -55,7 +55,7 @@ static const char* serviceName(const ProcessLauncher::LaunchOptions& launchOptio
         return "com.apple.WebKit.WebContent";
     case ProcessLauncher::ProcessType::Network:
         return "com.apple.WebKit.Networking";
-    case ProcessLauncher::ProcessType::Database:
+    case ProcessLauncher::ProcessType::Storage:
         return "com.apple.WebKit.Databases";
 #if ENABLE(NETSCAPE_PLUGIN_API)
     case ProcessLauncher::ProcessType::Plugin32:
index 5958ab0..2c62384 100644 (file)
@@ -67,8 +67,8 @@ void ProcessLauncher::launchProcess()
     case ProcessLauncher::ProcessType::Network:
         executablePath = executablePathOfNetworkProcess();
         break;
-    case ProcessLauncher::ProcessType::Database:
-        executablePath = executablePathOfDatabaseProcess();
+    case ProcessLauncher::ProcessType::Storage:
+        executablePath = executablePathOfStorageProcess();
         break;
     default:
         ASSERT_NOT_REACHED();
index 0e9c078..cf396f4 100644 (file)
@@ -289,19 +289,19 @@ void NetworkProcessProxy::didDeleteWebsiteDataForOrigins(uint64_t callbackID)
     callback();
 }
 
-void NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID, const Vector<String>& paths)
+void NetworkProcessProxy::grantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID, const Vector<String>& paths)
 {
 #if ENABLE(SANDBOX_EXTENSIONS)
     SandboxExtension::HandleArray extensions;
     extensions.allocate(paths.size());
     for (size_t i = 0; i < paths.size(); ++i) {
-        // ReadWrite is required for creating hard links as well as deleting the temporary file, which the DatabaseProcess will do.
+        // ReadWrite is required for creating hard links as well as deleting the temporary file, which the StorageProcess will do.
         SandboxExtension::createHandle(paths[i], SandboxExtension::ReadWrite, extensions[i]);
     }
 
-    m_processPool.sendToDatabaseProcessRelaunchingIfNecessary(Messages::StorageProcess::GrantSandboxExtensionsForBlobs(paths, extensions));
+    m_processPool.sendToStorageProcessRelaunchingIfNecessary(Messages::StorageProcess::GrantSandboxExtensionsForBlobs(paths, extensions));
 #endif
-    connection()->send(Messages::NetworkProcess::DidGrantSandboxExtensionsToDatabaseProcessForBlobs(requestID), 0);
+    connection()->send(Messages::NetworkProcess::DidGrantSandboxExtensionsToStorageProcessForBlobs(requestID), 0);
 }
 
 void NetworkProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
index e9bdc63..923dd2a 100644 (file)
@@ -111,7 +111,7 @@ private:
     void didFetchWebsiteData(uint64_t callbackID, const WebsiteData&);
     void didDeleteWebsiteData(uint64_t callbackID);
     void didDeleteWebsiteDataForOrigins(uint64_t callbackID);
-    void grantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID, const Vector<String>& paths);
+    void grantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID, const Vector<String>& paths);
     void logDiagnosticMessage(uint64_t pageID, const String& message, const String& description, WebCore::ShouldSample);
     void logDiagnosticMessageWithResult(uint64_t pageID, const String& message, const String& description, uint32_t result, WebCore::ShouldSample);
     void logDiagnosticMessageWithValue(uint64_t pageID, const String& message, const String& description, double value, unsigned significantFigures, WebCore::ShouldSample);
index 0c902ed..208d85f 100644 (file)
@@ -29,7 +29,7 @@ messages -> NetworkProcessProxy LegacyReceiver {
     DidDeleteWebsiteData(uint64_t callbackID)
     DidDeleteWebsiteDataForOrigins(uint64_t callbackID)
 
-    GrantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID, Vector<String> paths)
+    GrantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID, Vector<String> paths)
 
     ProcessReadyToSuspend()
     SetIsHoldingLockedFiles(bool isHoldingLockedFiles)
index 5e78c7d..20d20e0 100644 (file)
@@ -66,7 +66,7 @@ StorageProcessProxy::~StorageProcessProxy()
 
 void StorageProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
 {
-    launchOptions.processType = ProcessLauncher::ProcessType::Database;
+    launchOptions.processType = ProcessLauncher::ProcessType::Storage;
     ChildProcessProxy::getLaunchOptions(launchOptions);
 }
 
@@ -111,7 +111,7 @@ void StorageProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, Optio
     send(Messages::StorageProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, origins, callbackID), 0);
 }
 
-void StorageProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
+void StorageProcessProxy::getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&& reply)
 {
     m_pendingConnectionReplies.append(WTFMove(reply));
 
@@ -120,12 +120,12 @@ void StorageProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessP
         return;
     }
 
-    send(Messages::StorageProcess::CreateDatabaseToWebProcessConnection(), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
+    send(Messages::StorageProcess::CreateStorageToWebProcessConnection(), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
 }
 
 void StorageProcessProxy::didClose(IPC::Connection&)
 {
-    // The database process must have crashed or exited, so send any pending sync replies we might have.
+    // The storage process must have crashed or exited, so send any pending sync replies we might have.
     while (!m_pendingConnectionReplies.isEmpty()) {
         auto reply = m_pendingConnectionReplies.takeFirst();
 
@@ -150,19 +150,19 @@ void StorageProcessProxy::didClose(IPC::Connection&)
         callback();
     m_pendingDeleteWebsiteDataForOriginsCallbacks.clear();
 
-    // Tell ProcessPool to forget about this database process. This may cause us to be deleted.
-    m_processPool->databaseProcessCrashed(this);
+    // Tell ProcessPool to forget about this storage process. This may cause us to be deleted.
+    m_processPool->storageProcessCrashed(this);
 }
 
 void StorageProcessProxy::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
 {
 }
 
-void StorageProcessProxy::didCreateDatabaseToWebProcessConnection(const IPC::Attachment& connectionIdentifier)
+void StorageProcessProxy::didCreateStorageToWebProcessConnection(const IPC::Attachment& connectionIdentifier)
 {
     ASSERT(!m_pendingConnectionReplies.isEmpty());
 
-    RefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
+    RefPtr<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
 
 #if USE(UNIX_DOMAIN_SOCKETS)
     reply->send(connectionIdentifier);
@@ -215,7 +215,7 @@ void StorageProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Con
     }
 
     for (unsigned i = 0; i < m_numPendingConnectionRequests; ++i)
-        send(Messages::StorageProcess::CreateDatabaseToWebProcessConnection(), 0);
+        send(Messages::StorageProcess::CreateStorageToWebProcessConnection(), 0);
     
     m_numPendingConnectionRequests = 0;
 }
index bbca70e..5c1106d 100644 (file)
@@ -52,7 +52,7 @@ public:
     void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, WTF::Function<void()>&& completionHandler);
     void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>&, WTF::Function<void()>&& completionHandler);
 
-    void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
+    void getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&&);
 
 private:
     StorageProcessProxy(WebProcessPool*);
@@ -69,7 +69,7 @@ private:
     void didReceiveStorageProcessProxyMessage(IPC::Connection&, IPC::Decoder&);
 
     // Message handlers
-    void didCreateDatabaseToWebProcessConnection(const IPC::Attachment&);
+    void didCreateStorageToWebProcessConnection(const IPC::Attachment&);
     void didFetchWebsiteData(uint64_t callbackID, const WebsiteData&);
     void didDeleteWebsiteData(uint64_t callbackID);
     void didDeleteWebsiteDataForOrigins(uint64_t callbackID);
@@ -83,7 +83,7 @@ private:
     WebProcessPool* m_processPool;
 
     unsigned m_numPendingConnectionRequests;
-    Deque<Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>> m_pendingConnectionReplies;
+    Deque<Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>> m_pendingConnectionReplies;
 
     HashMap<uint64_t, WTF::Function<void (WebsiteData)>> m_pendingFetchWebsiteDataCallbacks;
     HashMap<uint64_t, WTF::Function<void ()>> m_pendingDeleteWebsiteDataCallbacks;
index fe17693..2a78a6b 100644 (file)
@@ -21,7 +21,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 messages -> StorageProcessProxy LegacyReceiver {
-    DidCreateDatabaseToWebProcessConnection(IPC::Attachment connectionIdentifier)
+    DidCreateStorageToWebProcessConnection(IPC::Attachment connectionIdentifier)
 
     DidFetchWebsiteData(uint64_t callbackID, struct WebKit::WebsiteData websiteData)
     DidDeleteWebsiteData(uint64_t callbackID)
index 64dbdef..41c0c25 100644 (file)
@@ -46,7 +46,7 @@ void WebContextClient::networkProcessDidCrash(WebProcessPool* processPool)
     m_client.networkProcessDidCrash(toAPI(processPool), m_client.base.clientInfo);
 }
 
-void WebContextClient::databaseProcessDidCrash(WebProcessPool* processPool)
+void WebContextClient::storageProcessDidCrash(WebProcessPool* processPool)
 {
     if (!m_client.databaseProcessDidCrash)
         return;
index b25c4d3..038f63a 100644 (file)
@@ -45,7 +45,7 @@ class WebContextClient : public API::Client<WKContextClientBase> {
 public:
     void plugInAutoStartOriginHashesChanged(WebProcessPool*);
     void networkProcessDidCrash(WebProcessPool*);
-    void databaseProcessDidCrash(WebProcessPool*);
+    void storageProcessDidCrash(WebProcessPool*);
 };
 
 } // namespace WebKit
index f28f099..83f3a67 100644 (file)
@@ -514,14 +514,14 @@ void WebProcessPool::getNetworkProcessConnection(Ref<Messages::WebProcessProxy::
     m_networkProcess->getNetworkProcessConnection(WTFMove(reply));
 }
 
-void WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore)
+void WebProcessPool::ensureStorageProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore)
 {
     // *********
     // IMPORTANT: Do not change the directory structure for indexed databases on disk without first consulting a reviewer from Apple (<rdar://problem/17454712>)
     // *********
 
-    if (!m_databaseProcess) {
-        m_databaseProcess = StorageProcessProxy::create(this);
+    if (!m_storageProcess) {
+        m_storageProcess = StorageProcessProxy::create(this);
 
         StorageProcessCreationParameters parameters;
 #if ENABLE(INDEXED_DATABASE)
@@ -533,32 +533,32 @@ void WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore*
 #endif
 
         ASSERT(!parameters.indexedDatabaseDirectory.isEmpty());
-        m_databaseProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(parameters), 0);
+        m_storageProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(parameters), 0);
     }
 
     if (!relevantDataStore || relevantDataStore == &websiteDataStore().websiteDataStore())
         return;
 
-    m_databaseProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(relevantDataStore->databaseProcessParameters()), 0);
+    m_storageProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(relevantDataStore->storageProcessParameters()), 0);
 }
 
-void WebProcessPool::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
+void WebProcessPool::getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&& reply)
 {
-    ensureDatabaseProcessAndWebsiteDataStore(nullptr);
+    ensureStorageProcessAndWebsiteDataStore(nullptr);
 
-    m_databaseProcess->getDatabaseProcessConnection(WTFMove(reply));
+    m_storageProcess->getStorageProcessConnection(WTFMove(reply));
 }
 
-void WebProcessPool::databaseProcessCrashed(StorageProcessProxy* databaseProcessProxy)
+void WebProcessPool::storageProcessCrashed(StorageProcessProxy* storageProcessProxy)
 {
-    ASSERT(m_databaseProcess);
-    ASSERT(databaseProcessProxy == m_databaseProcess.get());
+    ASSERT(m_storageProcess);
+    ASSERT(storageProcessProxy == m_storageProcess.get());
 
     for (auto& supplement : m_supplements.values())
-        supplement->processDidClose(databaseProcessProxy);
+        supplement->processDidClose(storageProcessProxy);
 
-    m_client.databaseProcessDidCrash(this);
-    m_databaseProcess = nullptr;
+    m_client.storageProcessDidCrash(this);
+    m_storageProcess = nullptr;
 }
 
 void WebProcessPool::willStartUsingPrivateBrowsing()
@@ -959,9 +959,9 @@ void WebProcessPool::pageAddedToProcess(WebPageProxy& page)
         page.process().send(Messages::WebProcess::AddWebsiteDataStore(page.websiteDataStore().parameters()), 0);
 
 #if ENABLE(INDEXED_DATABASE)
-        auto databaseParameters = page.websiteDataStore().databaseProcessParameters();
-        if (!databaseParameters.indexedDatabaseDirectory.isEmpty())
-            sendToDatabaseProcessRelaunchingIfNecessary(Messages::StorageProcess::InitializeWebsiteDataStore(databaseParameters));
+        auto storageParameters = page.websiteDataStore().storageProcessParameters();
+        if (!storageParameters.indexedDatabaseDirectory.isEmpty())
+            sendToStorageProcessRelaunchingIfNecessary(Messages::StorageProcess::InitializeWebsiteDataStore(storageParameters));
 #endif
     }
 }
@@ -1073,12 +1073,12 @@ pid_t WebProcessPool::networkProcessIdentifier()
     return m_networkProcess->processIdentifier();
 }
 
-pid_t WebProcessPool::databaseProcessIdentifier()
+pid_t WebProcessPool::storageProcessIdentifier()
 {
-    if (!m_databaseProcess)
+    if (!m_storageProcess)
         return 0;
 
-    return m_databaseProcess->processIdentifier();
+    return m_storageProcess->processIdentifier();
 }
 
 void WebProcessPool::setAlwaysUsesComplexTextCodePath(bool alwaysUseComplexText)
@@ -1302,13 +1302,13 @@ void WebProcessPool::clearCachedCredentials()
         m_networkProcess->send(Messages::NetworkProcess::ClearCachedCredentials(), 0);
 }
 
-void WebProcessPool::terminateDatabaseProcess()
+void WebProcessPool::terminateStorageProcess()
 {
-    if (!m_databaseProcess)
+    if (!m_storageProcess)
         return;
 
-    m_databaseProcess->terminate();
-    m_databaseProcess = nullptr;
+    m_storageProcess->terminate();
+    m_storageProcess = nullptr;
 }
 
 void WebProcessPool::terminateNetworkProcess()
index df9ee2a..d8ca634 100644 (file)
@@ -160,8 +160,8 @@ public:
     template<typename T, typename U> void sendSyncToNetworkingProcess(T&& message, U&& reply);
     template<typename T> void sendToNetworkingProcessRelaunchingIfNecessary(T&& message);
 
-    // Sends the message to WebProcess or DatabaseProcess as approporiate for current process model.
-    template<typename T> void sendToDatabaseProcessRelaunchingIfNecessary(T&& message);
+    // Sends the message to WebProcess or StorageProcess as approporiate for current process model.
+    template<typename T> void sendToStorageProcessRelaunchingIfNecessary(T&& message);
 
     void processDidFinishLaunching(WebProcessProxy*);
 
@@ -199,7 +199,7 @@ public:
 #endif
 
     pid_t networkProcessIdentifier();
-    pid_t databaseProcessIdentifier();
+    pid_t storageProcessIdentifier();
 
     void setAlwaysUsesComplexTextCodePath(bool);
     void setShouldUseFontSmoothing(bool);
@@ -255,7 +255,7 @@ public:
     void setAllowsAnySSLCertificateForWebSocket(bool);
 
     void clearCachedCredentials();
-    void terminateDatabaseProcess();
+    void terminateStorageProcess();
     void terminateNetworkProcess();
 
     void syncNetworkProcessCookies();
@@ -312,10 +312,10 @@ public:
 
     void getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
 
-    void ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore);
-    StorageProcessProxy* databaseProcess() { return m_databaseProcess.get(); }
-    void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
-    void databaseProcessCrashed(StorageProcessProxy*);
+    void ensureStorageProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore);
+    StorageProcessProxy* storageProcess() { return m_storageProcess.get(); }
+    void getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&&);
+    void storageProcessCrashed(StorageProcessProxy*);
 
 #if PLATFORM(COCOA)
     bool processSuppressionEnabled() const;
@@ -549,7 +549,7 @@ private:
     bool m_canHandleHTTPSServerTrustEvaluation;
     bool m_didNetworkProcessCrash;
     RefPtr<NetworkProcessProxy> m_networkProcess;
-    RefPtr<StorageProcessProxy> m_databaseProcess;
+    RefPtr<StorageProcessProxy> m_storageProcess;
 
     HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks;
     HashMap<uint64_t, RefPtr<StatisticsRequest>> m_statisticsRequests;
@@ -627,10 +627,10 @@ void WebProcessPool::sendToNetworkingProcessRelaunchingIfNecessary(T&& message)
 }
 
 template<typename T>
-void WebProcessPool::sendToDatabaseProcessRelaunchingIfNecessary(T&& message)
+void WebProcessPool::sendToStorageProcessRelaunchingIfNecessary(T&& message)
 {
-    ensureDatabaseProcessAndWebsiteDataStore(nullptr);
-    m_databaseProcess->send(std::forward<T>(message), 0);
+    ensureStorageProcessAndWebsiteDataStore(nullptr);
+    m_storageProcess->send(std::forward<T>(message), 0);
 }
 
 template<typename T>
index 3168384..7085ce9 100644 (file)
@@ -573,9 +573,9 @@ void WebProcessProxy::getNetworkProcessConnection(Ref<Messages::WebProcessProxy:
     m_processPool->getNetworkProcessConnection(WTFMove(reply));
 }
 
-void WebProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
+void WebProcessProxy::getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&& reply)
 {
-    m_processPool->getDatabaseProcessConnection(WTFMove(reply));
+    m_processPool->getStorageProcessConnection(WTFMove(reply));
 }
 
 #if !PLATFORM(COCOA)
index 8afebf3..1ee48f7 100644 (file)
@@ -214,7 +214,7 @@ private:
     void getPluginProcessConnection(uint64_t pluginProcessToken, Ref<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>&&);
 #endif
     void getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
-    void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
+    void getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&&);
 
     bool platformIsBeingDebugged() const;
 
index 1ff7657..ad69c52 100644 (file)
@@ -37,7 +37,7 @@ messages -> WebProcessProxy LegacyReceiver {
     GetPluginProcessConnection(uint64_t pluginProcessToken) -> (IPC::Attachment connectionHandle, bool supportsAsynchronousInitialization) Delayed
 #endif
     GetNetworkProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
-    GetDatabaseProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
+    GetStorageProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
     ProcessReadyToSuspend()
     DidCancelProcessSuspension()
 
index 300b5bf..91c03e6 100644 (file)
@@ -433,10 +433,10 @@ void WebsiteDataStore::fetchDataAndApply(OptionSet<WebsiteDataType> dataTypes, O
 
     if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
         for (auto& processPool : processPools()) {
-            processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
+            processPool->ensureStorageProcessAndWebsiteDataStore(this);
 
             callbackAggregator->addPendingCallback();
-            processPool->databaseProcess()->fetchWebsiteData(m_sessionID, dataTypes, [callbackAggregator, processPool](WebsiteData websiteData) {
+            processPool->storageProcess()->fetchWebsiteData(m_sessionID, dataTypes, [callbackAggregator, processPool](WebsiteData websiteData) {
                 callbackAggregator->removePendingCallback(WTFMove(websiteData));
             });
         }
@@ -727,10 +727,10 @@ void WebsiteDataStore::removeData(OptionSet<WebsiteDataType> dataTypes, std::chr
 
     if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
         for (auto& processPool : processPools()) {
-            processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
+            processPool->ensureStorageProcessAndWebsiteDataStore(this);
 
             callbackAggregator->addPendingCallback();
-            processPool->databaseProcess()->deleteWebsiteData(m_sessionID, dataTypes, modifiedSince, [callbackAggregator, processPool] {
+            processPool->storageProcess()->deleteWebsiteData(m_sessionID, dataTypes, modifiedSince, [callbackAggregator, processPool] {
                 callbackAggregator->removePendingCallback();
             });
         }
@@ -1004,10 +1004,10 @@ void WebsiteDataStore::removeData(OptionSet<WebsiteDataType> dataTypes, const Ve
 
     if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
         for (auto& processPool : processPools()) {
-            processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
+            processPool->ensureStorageProcessAndWebsiteDataStore(this);
 
             callbackAggregator->addPendingCallback();
-            processPool->databaseProcess()->deleteWebsiteDataForOrigins(m_sessionID, dataTypes, origins, [callbackAggregator, processPool] {
+            processPool->storageProcess()->deleteWebsiteDataForOrigins(m_sessionID, dataTypes, origins, [callbackAggregator, processPool] {
                 callbackAggregator->removePendingCallback();
             });
         }
@@ -1315,7 +1315,7 @@ void WebsiteDataStore::enableResourceLoadStatisticsAndSetTestingCallback(Functio
         processPool->setResourceLoadStatisticsEnabled(true);
 }
 
-StorageProcessCreationParameters WebsiteDataStore::databaseProcessParameters()
+StorageProcessCreationParameters WebsiteDataStore::storageProcessParameters()
 {
     resolveDirectoriesIfNecessary();
 
index b54922c..4297407 100644 (file)
@@ -121,7 +121,7 @@ public:
     bool isAssociatedProcessPool(WebProcessPool&) const;
 
     WebsiteDataStoreParameters parameters();
-    StorageProcessCreationParameters databaseProcessParameters();
+    StorageProcessCreationParameters storageProcessParameters();
 
     Vector<WebCore::Cookie> pendingCookies() const;
     void addPendingCookie(const WebCore::Cookie&);
index 54c2d28..4d76fbb 100644 (file)
@@ -77,7 +77,7 @@ WebIDBConnectionToServer::~WebIDBConnectionToServer()
 
 IPC::Connection* WebIDBConnectionToServer::messageSenderConnection()
 {
-    return &WebProcess::singleton().webToDatabaseProcessConnection()->connection();
+    return &WebProcess::singleton().webToStorageProcessConnection()->connection();
 }
 
 IDBClient::IDBConnectionToServer& WebIDBConnectionToServer::coreConnectionToServer()
index d163c09..c79e041 100644 (file)
@@ -79,7 +79,7 @@ public:
     void ref() override { RefCounted<WebIDBConnectionToServer>::ref(); }
     void deref() override { RefCounted<WebIDBConnectionToServer>::deref(); }
 
-    // Messages received from DatabaseProcess
+    // Messages received from StorageProcess
     void didDeleteDatabase(const WebCore::IDBResultData&);
     void didOpenDatabase(const WebCore::IDBResultData&);
     void didAbortTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&);
index 5cf7fd2..2b87baf 100644 (file)
@@ -79,8 +79,8 @@ WebCore::IDBClient::IDBConnectionToServer& WebDatabaseProvider::idbConnectionToS
         return result.iterator->value->connectionToServer();
     }
 
-    ASSERT(WebProcess::singleton().webToDatabaseProcessConnection());
-    return WebProcess::singleton().webToDatabaseProcessConnection()->idbConnectionToServerForSession(sessionID).coreConnectionToServer();
+    ASSERT(WebProcess::singleton().webToStorageProcessConnection());
+    return WebProcess::singleton().webToStorageProcessConnection()->idbConnectionToServerForSession(sessionID).coreConnectionToServer();
 }
 
 #endif
index 0012185..6b27d78 100644 (file)
@@ -35,17 +35,17 @@ using namespace WebCore;
 
 namespace WebKit {
 
-WebToDatabaseProcessConnection::WebToDatabaseProcessConnection(IPC::Connection::Identifier connectionIdentifier)
+WebToStorageProcessConnection::WebToStorageProcessConnection(IPC::Connection::Identifier connectionIdentifier)
     : m_connection(IPC::Connection::createClientConnection(connectionIdentifier, *this))
 {
     m_connection->open();
 }
 
-WebToDatabaseProcessConnection::~WebToDatabaseProcessConnection()
+WebToStorageProcessConnection::~WebToStorageProcessConnection()
 {
 }
 
-void WebToDatabaseProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
+void WebToStorageProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
 {
 #if ENABLE(INDEXED_DATABASE)
     if (decoder.messageReceiverName() == Messages::WebIDBConnectionToServer::messageReceiverName()) {
@@ -59,7 +59,7 @@ void WebToDatabaseProcessConnection::didReceiveMessage(IPC::Connection& connecti
     ASSERT_NOT_REACHED();
 }
 
-void WebToDatabaseProcessConnection::didClose(IPC::Connection& connection)
+void WebToStorageProcessConnection::didClose(IPC::Connection& connection)
 {
 #if ENABLE(INDEXED_DATABASE)
     for (auto& connection : m_webIDBConnectionsByIdentifier.values())
@@ -69,15 +69,15 @@ void WebToDatabaseProcessConnection::didClose(IPC::Connection& connection)
     m_webIDBConnectionsBySession.clear();
 #endif
 
-    WebProcess::singleton().webToDatabaseProcessConnectionClosed(this);
+    WebProcess::singleton().webToStorageProcessConnectionClosed(this);
 }
 
-void WebToDatabaseProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
+void WebToStorageProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
 {
 }
 
 #if ENABLE(INDEXED_DATABASE)
-WebIDBConnectionToServer& WebToDatabaseProcessConnection::idbConnectionToServerForSession(const SessionID& sessionID)
+WebIDBConnectionToServer& WebToStorageProcessConnection::idbConnectionToServerForSession(const SessionID& sessionID)
 {
     auto result = m_webIDBConnectionsBySession.add(sessionID, nullptr);
     if (result.isNewEntry) {
index 0f1ca92..2426e6c 100644 (file)
@@ -38,13 +38,13 @@ class SessionID;
 
 namespace WebKit {
 
-class WebToDatabaseProcessConnection : public RefCounted<WebToDatabaseProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender {
+class WebToStorageProcessConnection : public RefCounted<WebToStorageProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender {
 public:
-    static Ref<WebToDatabaseProcessConnection> create(IPC::Connection::Identifier connectionIdentifier)
+    static Ref<WebToStorageProcessConnection> create(IPC::Connection::Identifier connectionIdentifier)
     {
-        return adoptRef(*new WebToDatabaseProcessConnection(connectionIdentifier));
+        return adoptRef(*new WebToStorageProcessConnection(connectionIdentifier));
     }
-    ~WebToDatabaseProcessConnection();
+    ~WebToStorageProcessConnection();
     
     IPC::Connection& connection() { return m_connection.get(); }
 
@@ -53,7 +53,7 @@ public:
 #endif
 
 private:
-    WebToDatabaseProcessConnection(IPC::Connection::Identifier);
+    WebToStorageProcessConnection(IPC::Connection::Identifier);
 
     // IPC::Connection::Client
     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
index c648105..6bab545 100644 (file)
@@ -1139,31 +1139,30 @@ WebLoaderStrategy& WebProcess::webLoaderStrategy()
     return m_webLoaderStrategy;
 }
 
-void WebProcess::webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection* connection)
+void WebProcess::webToStorageProcessConnectionClosed(WebToStorageProcessConnection* connection)
 {
-    ASSERT(m_webToDatabaseProcessConnection);
-    ASSERT(m_webToDatabaseProcessConnection == connection);
+    ASSERT(m_webToStorageProcessConnection);
+    ASSERT(m_webToStorageProcessConnection == connection);
 
-    m_webToDatabaseProcessConnection = nullptr;
+    m_webToStorageProcessConnection = nullptr;
 }
 
-WebToDatabaseProcessConnection* WebProcess::webToDatabaseProcessConnection()
+WebToStorageProcessConnection* WebProcess::webToStorageProcessConnection()
 {
-    if (!m_webToDatabaseProcessConnection)
-        ensureWebToDatabaseProcessConnection();
+    if (!m_webToStorageProcessConnection)
+        ensureWebToStorageProcessConnection();
 
-    return m_webToDatabaseProcessConnection.get();
+    return m_webToStorageProcessConnection.get();
 }
 
-void WebProcess::ensureWebToDatabaseProcessConnection()
+void WebProcess::ensureWebToStorageProcessConnection()
 {
-    if (m_webToDatabaseProcessConnection)
+    if (m_webToStorageProcessConnection)
         return;
 
     IPC::Attachment encodedConnectionIdentifier;
 
-    if (!parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetDatabaseProcessConnection(),
-        Messages::WebProcessProxy::GetDatabaseProcessConnection::Reply(encodedConnectionIdentifier), 0))
+    if (!parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetStorageProcessConnection(), Messages::WebProcessProxy::GetStorageProcessConnection::Reply(encodedConnectionIdentifier), 0))
         return;
 
 #if USE(UNIX_DOMAIN_SOCKETS)
@@ -1175,7 +1174,7 @@ void WebProcess::ensureWebToDatabaseProcessConnection()
 #endif
     if (IPC::Connection::identifierIsNull(connectionIdentifier))
         return;
-    m_webToDatabaseProcessConnection = WebToDatabaseProcessConnection::create(connectionIdentifier);
+    m_webToStorageProcessConnection = WebToStorageProcessConnection::create(connectionIdentifier);
 }
 
 void WebProcess::setEnhancedAccessibility(bool flag)
index 60d3ed4..e0bf86a 100644 (file)
@@ -86,7 +86,7 @@ class WebLoaderStrategy;
 class WebPage;
 class WebPageGroupProxy;
 class WebProcessSupplement;
-class WebToDatabaseProcessConnection;
+class WebToStorageProcessConnection;
 enum class WebsiteDataType;
 struct WebPageCreationParameters;
 struct WebPageGroupData;
@@ -164,8 +164,8 @@ public:
     LibWebRTCNetwork& libWebRTCNetwork();
 #endif
 
-    void webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection*);
-    WebToDatabaseProcessConnection* webToDatabaseProcessConnection();
+    void webToStorageProcessConnectionClosed(WebToStorageProcessConnection*);
+    WebToStorageProcessConnection* webToStorageProcessConnection();
 
     void setCacheModel(uint32_t);
 
@@ -383,8 +383,8 @@ private:
 
     std::unique_ptr<WebAutomationSessionProxy> m_automationSessionProxy;
 
-    void ensureWebToDatabaseProcessConnection();
-    RefPtr<WebToDatabaseProcessConnection> m_webToDatabaseProcessConnection;
+    void ensureWebToStorageProcessConnection();
+    RefPtr<WebToStorageProcessConnection> m_webToStorageProcessConnection;
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
     RefPtr<PluginProcessConnectionManager> m_pluginProcessConnectionManager;
index fde2e12..f76b0c8 100644 (file)
@@ -1,3 +1,19 @@
+2017-08-01  Brady Eidson  <beidson@apple.com>
+
+        Part 2 of: Rename DatabaseProcess to StorageProcess.
+        https://bugs.webkit.org/show_bug.cgi?id=174880
+
+        Reviewed by Andy Estes.
+
+        * TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.mm:
+        * TestWebKitAPI/Tests/WebKit2Cocoa/IDBIndexUpgradeToV2.mm:
+        * TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBDatabaseProcessKill.mm:
+        * TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm:
+        * TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBPersistence.mm:
+        * TestWebKitAPI/Tests/WebKit2Cocoa/ResourceLoadStatistics.mm:
+        * TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm:
+        * TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm:
+
 2017-07-31  Csaba Osztrogon√°c  <ossy@webkit.org>
 
         Fix JSCOnly ARM buildbots after r220047
index 59a4465..d1fff2f 100644 (file)
@@ -59,7 +59,7 @@ TEST(IndexedDB, DeleteRecovery)
     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
 
-    [configuration.get().processPool _terminateDatabaseProcess];
+    [configuration.get().processPool _terminateStorageProcess];
 
     // Copy the inconsistent database files to the database directory
     NSURL *url1 = [[NSBundle mainBundle] URLForResource:@"IDBDeleteRecovery" withExtension:@"sqlite3" subdirectory:@"TestWebKitAPI.resources"];
index 36c479d..e085bec 100644 (file)
@@ -59,7 +59,7 @@ TEST(IndexedDB, IndexUpgradeToV2)
     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
 
-    [configuration.get().processPool _terminateDatabaseProcess];
+    [configuration.get().processPool _terminateStorageProcess];
 
     // Copy the inconsistent database files to the database directory
     NSURL *url1 = [[NSBundle mainBundle] URLForResource:@"IndexUpgrade" withExtension:@"sqlite3" subdirectory:@"TestWebKitAPI.resources"];
index 7904fac..391c1c4 100644 (file)
@@ -94,7 +94,7 @@ TEST(IndexedDB, DatabaseProcessKill)
         TestWebKitAPI::Util::run(&receivedScriptMessage);
         if (!killedDBProcess && openRequestUpgradeNeeded) {
             killedDBProcess = true;
-            [configuration.get().processPool _terminateDatabaseProcess];
+            [configuration.get().processPool _terminateStorageProcess];
         }
     }
 
index 480c41d..1f709de 100644 (file)
@@ -71,7 +71,7 @@ TEST(IndexedDB, IndexedDBMultiProcess)
     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
 
-    [configuration.get().processPool _terminateDatabaseProcess];
+    [configuration.get().processPool _terminateStorageProcess];
 
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
 
index cd1bc95..da6f924 100644 (file)
@@ -75,8 +75,8 @@ TEST(IndexedDB, IndexedDBPersistence)
     // Ditch this web view (ditching its web process)
     webView = nil;
 
-    // Terminate the database process
-    [configuration.get().processPool _terminateDatabaseProcess];
+    // Terminate the storage process
+    [configuration.get().processPool _terminateStorageProcess];
 
     // Make a new web view to finish the test
     webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
index 7f72109..c81707b 100644 (file)
@@ -123,7 +123,7 @@ TEST(ResourceLoadStatistics, ChildProcessesNotLaunched)
     // Ensure the shared process pool exists so the data store operations we're about to do work with it.
     WKProcessPool *sharedProcessPool = [WKProcessPool _sharedProcessPool];
 
-    EXPECT_EQ((pid_t)0, [sharedProcessPool _databaseProcessIdentifier]);
+    EXPECT_EQ((pid_t)0, [sharedProcessPool _storageProcessIdentifier]);
     EXPECT_EQ((size_t)0, [sharedProcessPool _pluginProcessCount]);
 
     auto *dataStore = [WKWebsiteDataStore defaultDataStore];
@@ -148,7 +148,7 @@ TEST(ResourceLoadStatistics, ChildProcessesNotLaunched)
 
     EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:targetURL.path]);
 
-    EXPECT_EQ((pid_t)0, [sharedProcessPool _databaseProcessIdentifier]);
+    EXPECT_EQ((pid_t)0, [sharedProcessPool _storageProcessIdentifier]);
     EXPECT_EQ((size_t)0, [sharedProcessPool _pluginProcessCount]);
 }
 
index eb4097f..c5c9c31 100644 (file)
@@ -72,7 +72,7 @@ TEST(IndexedDB, WebProcessKillIDBCleanup)
     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
 
-    [configuration.get().processPool _terminateDatabaseProcess];
+    [configuration.get().processPool _terminateStorageProcess];
 
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
 
index 0b3ce9a..9b1ba1e 100644 (file)
@@ -121,7 +121,7 @@ TEST(WebKit2, WebsiteDataStoreCustomPaths)
     [[[webView configuration] processPool] _syncNetworkProcessCookies];
 
     // Forcibly shut down everything of WebKit that we can.
-    [[[webView configuration] processPool] _terminateDatabaseProcess];
+    [[[webView configuration] processPool] _terminateStorageProcess];
     auto pid = [webView _webProcessIdentifier];
     if (pid)
         kill(pid, SIGKILL);
@@ -159,7 +159,7 @@ TEST(WebKit2, WebsiteDataStoreCustomPaths)
 
     // Data stores can't delete anything unless a WKProcessPool exists, so make sure the shared data store exists.
     auto *processPool = [WKProcessPool _sharedProcessPool];
-    [processPool _terminateDatabaseProcess];
+    [processPool _terminateStorageProcess];
     RetainPtr<WKWebsiteDataStore> dataStore = [[WKWebsiteDataStore alloc] _initWithConfiguration:websiteDataStoreConfiguration.get()];
     RetainPtr<NSSet> types = adoptNS([[NSSet alloc] initWithObjects:WKWebsiteDataTypeIndexedDBDatabases, nil]);