Attachment 316506 Details for Bug 174879 – Next WIP

[patch] Next WIP

patch (text/plain), 133.70 KB, created by Brady Eidson on 2017-07-26 19:36:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brady Eidson

Created: 2017-07-26 19:36:31 PDT

Size: 133.70 KB

patch

obsolete

>diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
>index 445fd1640d5..eab8fa19551 100644
>--- a/Source/WebKit/CMakeLists.txt
>+++ b/Source/WebKit/CMakeLists.txt
>@@ -4,8 +4,6 @@ set_property(DIRECTORY . PROPERTY FOLDER "WebKit2")
> 
> set(WebKit2_INCLUDE_DIRECTORIES
>     "${WEBKIT2_DIR}"
>-    "${WEBKIT2_DIR}/DatabaseProcess"
>-    "${WEBKIT2_DIR}/DatabaseProcess/IndexedDB"
>     "${WEBKIT2_DIR}/NetworkProcess"
>     "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols"
>     "${WEBKIT2_DIR}/NetworkProcess/Downloads"
>@@ -29,6 +27,8 @@ set(WebKit2_INCLUDE_DIRECTORIES
>     "${WEBKIT2_DIR}/Shared/Plugins/Netscape"
>     "${WEBKIT2_DIR}/Shared/Plugins/Netscape/x11"
>     "${WEBKIT2_DIR}/Shared/WebsiteData"
>+    "${WEBKIT2_DIR}/StorageProcess"
>+    "${WEBKIT2_DIR}/StorageProcess/IndexedDB"
>     "${WEBKIT2_DIR}/UIProcess"
>     "${WEBKIT2_DIR}/UIProcess/API"
>     "${WEBKIT2_DIR}/UIProcess/API/C"
>@@ -96,11 +96,6 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
> endif ()
> 
> set(WebKit2_SOURCES
>-    DatabaseProcess/DatabaseProcess.cpp
>-    DatabaseProcess/DatabaseToWebProcessConnection.cpp
>-
>-    DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp
>-
>     NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
> 
>     NetworkProcess/Downloads/BlobDownloadClient.cpp
>@@ -254,8 +249,6 @@ set(WebKit2_SOURCES
> 
>     Shared/Authentication/AuthenticationManager.cpp
> 
>-    Shared/Databases/DatabaseProcessCreationParameters.cpp
>-
>     Shared/Databases/IndexedDB/IDBUtilities.cpp
>     Shared/Databases/IndexedDB/WebIDBResult.cpp
> 
>@@ -272,8 +265,14 @@ set(WebKit2_SOURCES
>     Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp
>     Shared/Plugins/Netscape/PluginInformation.cpp
> 
>+    Shared/Storage/StorageProcessCreationParameters.cpp
>+
>     Shared/WebsiteData/WebsiteData.cpp
> 
>+    StorageProcess/StorageProcess.cpp
>+    StorageProcess/StorageToWebProcessConnection.cpp
>+
>+    StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp
>     UIProcess/BackgroundProcessResponsivenessTimer.cpp
>     UIProcess/ChildProcessProxy.cpp
>     UIProcess/DrawingAreaProxy.cpp
>@@ -405,8 +404,6 @@ set(WebKit2_SOURCES
> 
>     UIProcess/Automation/WebAutomationSession.cpp
> 
>-    UIProcess/Databases/DatabaseProcessProxy.cpp
>-
>     UIProcess/Downloads/DownloadProxy.cpp
>     UIProcess/Downloads/DownloadProxyMap.cpp
> 
>@@ -430,6 +427,8 @@ set(WebKit2_SOURCES
>     UIProcess/Plugins/PluginProcessManager.cpp
>     UIProcess/Plugins/PluginProcessProxy.cpp
> 
>+    UIProcess/Storage/StorageProcessProxy.cpp
>+
>     UIProcess/UserContent/WebScriptMessageHandler.cpp
>     UIProcess/UserContent/WebUserContentControllerProxy.cpp
> 
>@@ -447,7 +446,6 @@ set(WebKit2_SOURCES
>     WebProcess/Cookies/WebCookieManager.cpp
> 
>     WebProcess/Databases/WebDatabaseProvider.cpp
>-    WebProcess/Databases/WebToDatabaseProcessConnection.cpp
> 
>     WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp
> 
>@@ -527,6 +525,8 @@ set(WebKit2_SOURCES
>     WebProcess/Plugins/Netscape/NetscapePluginNone.cpp
>     WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
> 
>+    WebProcess/Storage/WebToStorageProcessConnection.cpp
>+
>     WebProcess/UserContent/WebUserContentController.cpp
> 
>     WebProcess/WebCoreSupport/SessionStateConversion.cpp
>@@ -579,11 +579,6 @@ set(WebKit2_SOURCES
> )
> 
> set(WebKit2_MESSAGES_IN_FILES
>-    DatabaseProcess/DatabaseProcess.messages.in
>-    DatabaseProcess/DatabaseToWebProcessConnection.messages.in
>-
>-    DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in
>-
>     NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in
> 
>     NetworkProcess/NetworkConnectionToWebProcess.messages.in
>@@ -606,6 +601,11 @@ set(WebKit2_MESSAGES_IN_FILES
> 
>     Shared/Plugins/NPObjectMessageReceiver.messages.in
> 
>+    StorageProcess/StorageProcess.messages.in
>+    StorageProcess/StorageToWebProcessConnection.messages.in
>+
>+    StorageProcess/IndexedDB/WebIDBConnectionToClient.messages.in
>+
>     UIProcess/DrawingAreaProxy.messages.in
>     UIProcess/RemoteWebInspectorProxy.messages.in
>     UIProcess/VisitedLinkStore.messages.in
>@@ -621,7 +621,7 @@ set(WebKit2_MESSAGES_IN_FILES
> 
>     UIProcess/Automation/WebAutomationSession.messages.in
> 
>-    UIProcess/Databases/DatabaseProcessProxy.messages.in
>+    UIProcess/Databases/StorageProcessProxy.messages.in
> 
>     UIProcess/Downloads/DownloadProxy.messages.in
> 
>@@ -683,7 +683,7 @@ set(NetworkProcess_LIBRARIES
>     WebKit2
> )
> 
>-set(DatabaseProcess_LIBRARIES
>+set(StorageProcess_LIBRARIES
>     WebKit2
> )
> 
>diff --git a/Source/WebKit/Configurations/DatabaseService.xcconfig b/Source/WebKit/Configurations/DatabaseService.xcconfig
>index c8ccf055bc7..5fca886c874 100644
>--- a/Source/WebKit/Configurations/DatabaseService.xcconfig
>+++ b/Source/WebKit/Configurations/DatabaseService.xcconfig
>@@ -27,4 +27,4 @@ WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Databases-iOS;
> 
> PRODUCT_NAME = com.apple.WebKit.Databases;
> PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
>-INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist;
>+INFOPLIST_FILE = StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist;
>diff --git a/Source/WebKit/DerivedSources.make b/Source/WebKit/DerivedSources.make
>index 0b05508ca96..60c39e68963 100644
>--- a/Source/WebKit/DerivedSources.make
>+++ b/Source/WebKit/DerivedSources.make
>@@ -22,9 +22,6 @@
> 
> VPATH = \
>     $(WebKit2) \
>-    $(WebKit2)/DatabaseProcess \
>-    $(WebKit2)/DatabaseProcess/IndexedDB \
>-    $(WebKit2)/DatabaseProcess/mac \
>     $(WebKit2)/NetworkProcess \
>     $(WebKit2)/NetworkProcess/CustomProtocols \
>     $(WebKit2)/NetworkProcess/mac \
>@@ -36,6 +33,9 @@ VPATH = \
>     $(WebKit2)/Shared/API/Cocoa \
>     $(WebKit2)/Shared/Authentication \
>     $(WebKit2)/Shared/mac \
>+    $(WebKit2)/StorageProcess \
>+    $(WebKit2)/StorageProcess/IndexedDB \
>+    $(WebKit2)/StorageProcess/mac \
>     $(WebKit2)/WebProcess/ApplePay \
>     $(WebKit2)/WebProcess/ApplicationCache \
>     $(WebKit2)/WebProcess/Automation \
>@@ -72,6 +72,7 @@ VPATH = \
>     $(WebKit2)/UIProcess/Network/CustomProtocols \
>     $(WebKit2)/UIProcess/Notifications \
>     $(WebKit2)/UIProcess/Plugins \
>+    $(WebKit2)/UIProcess/Storage \
>     $(WebKit2)/UIProcess/UserContent \
>     $(WebKit2)/UIProcess/WebStorage \
>     $(WebKit2)/UIProcess/mac \
>@@ -91,9 +92,6 @@ endif
> MESSAGE_RECEIVERS = \
>     AuthenticationManager \
>     ChildProcess \
>-    DatabaseProcess \
>-    DatabaseProcessProxy \
>-    DatabaseToWebProcessConnection \
>     DownloadProxy \
>     DrawingArea \
>     DrawingAreaProxy \
>@@ -125,6 +123,9 @@ MESSAGE_RECEIVERS = \
>     SmartMagnificationController \
>     StorageAreaMap \
>     StorageManager \
>+    StorageProcess \
>+    StorageProcessProxy \
>+    StorageToWebProcessConnection \
>     UserMediaCaptureManager \
>     UserMediaCaptureManagerProxy \
>     ViewGestureController \
>diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
>index ee2883b2835..99bfb4be924 100644
>--- a/Source/WebKit/PlatformGTK.cmake
>+++ b/Source/WebKit/PlatformGTK.cmake
>@@ -2,7 +2,7 @@ set(WebKit2_OUTPUT_NAME webkit2gtk-${WEBKITGTK_API_VERSION})
> set(WebKit2_WebProcess_OUTPUT_NAME WebKitWebProcess)
> set(WebKit2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
> set(WebKit2_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
>-set(WebKit2_DatabaseProcess_OUTPUT_NAME WebKitDatabaseProcess)
>+set(WebKit2_StorageProcess_OUTPUT_NAME WebKitStorageProcess)
> 
> file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
> file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR})
>@@ -26,8 +26,6 @@ add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}")
> set(WebKit2_USE_PREFIX_HEADER ON)
> 
> list(APPEND WebKit2_SOURCES
>-    DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp
>-
>     NetworkProcess/CustomProtocols/soup/LegacyCustomProtocolManagerSoup.cpp
> 
>     NetworkProcess/cache/NetworkCacheCodersSoup.cpp
>@@ -102,6 +100,8 @@ list(APPEND WebKit2_SOURCES
> 
>     Shared/unix/ChildProcessMain.cpp
> 
>+    StorageProcess/gtk/StorageProcessMainGtk.cpp
>+
>     UIProcess/AcceleratedDrawingAreaProxy.cpp
>     UIProcess/BackingStore.cpp
>     UIProcess/DefaultUndoController.cpp
>@@ -759,7 +759,6 @@ list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
> 
> list(APPEND WebKit2_INCLUDE_DIRECTORIES
>     "${WEBKIT2_DIR}/PluginProcess/unix"
>-    "${WEBKIT2_DIR}/DatabaseProcess/unix"
>     "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
>     "${WEBKIT2_DIR}/NetworkProcess/Downloads/soup"
>     "${WEBKIT2_DIR}/NetworkProcess/gtk"
>@@ -778,6 +777,7 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
>     "${WEBKIT2_DIR}/Shared/linux"
>     "${WEBKIT2_DIR}/Shared/soup"
>     "${WEBKIT2_DIR}/Shared/unix"
>+    "${WEBKIT2_DIR}/StorageProcess/unix"
>     "${WEBKIT2_DIR}/UIProcess/API/C/cairo"
>     "${WEBKIT2_DIR}/UIProcess/API/C/gtk"
>     "${WEBKIT2_DIR}/UIProcess/API/glib"
>@@ -837,8 +837,8 @@ list(APPEND NetworkProcess_SOURCES
>     NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
> )
> 
>-list(APPEND DatabaseProcess_SOURCES
>-    DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp
>+list(APPEND StorageProcess_SOURCES
>+    StorageProcess/EntryPoint/unix/StorageProcessMain.cpp
> )
> 
> set(SharedWebKit2Libraries
>diff --git a/Source/WebKit/PlatformMac.cmake b/Source/WebKit/PlatformMac.cmake
>index a4111f3cf36..61ade3a292a 100644
>--- a/Source/WebKit/PlatformMac.cmake
>+++ b/Source/WebKit/PlatformMac.cmake
>@@ -19,8 +19,6 @@ if (NOT AVFAUDIO_LIBRARY-NOTFOUND)
> endif ()
> 
> list(APPEND WebKit2_SOURCES
>-    DatabaseProcess/mac/DatabaseProcessMac.mm
>-
>     NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm
> 
>     NetworkProcess/Downloads/PendingDownload.cpp
>@@ -161,6 +159,8 @@ list(APPEND WebKit2_SOURCES
>     Shared/mac/WebHitTestResultData.mm
>     Shared/mac/WebMemorySampler.mac.mm
> 
>+    StorageProcess/mac/StorageProcessMac.mm
>+
>     UIProcess/HighPerformanceGraphicsUsageSampler.cpp
>     UIProcess/PerActivityStateCPUUsageSampler.cpp
>     UIProcess/WebContextMenuListenerProxy.cpp
>@@ -451,8 +451,8 @@ list(APPEND NetworkProcess_SOURCES
>     ${XPCService_SOURCES}
> )
> 
>-list(APPEND DatabaseProcess_SOURCES
>-    DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm
>+list(APPEND StorageProcess_SOURCES
>+    StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm
>     ${XPCService_SOURCES}
> )
> 
>diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake
>index f6ee674fd8e..cb7ac6efcda 100644
>--- a/Source/WebKit/PlatformWPE.cmake
>+++ b/Source/WebKit/PlatformWPE.cmake
>@@ -47,8 +47,8 @@ list(APPEND NetworkProcess_SOURCES
>     NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
> )
> 
>-list(APPEND DatabaseProcess_SOURCES
>-    DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp
>+list(APPEND StorageProcess_SOURCES
>+    StorageProcess/EntryPoint/unix/StorageProcessMain.cpp
> )
> 
> list(APPEND WebKit2_SOURCES
>@@ -261,7 +261,7 @@ list(APPEND WebKit2_SOURCES
>     WebProcess/wpe/WebProcessMainWPE.cpp
> 
>     # FIXME-GWSHARE:
>-    DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp
>+    StorageProcess/gtk/StorageProcessMainGtk.cpp
> )
> 
> list(APPEND WebKit2_MESSAGES_IN_FILES
>@@ -376,7 +376,6 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/graphics/opentype"
>     "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
>     "${WEBCORE_DIR}/platform/network/soup"
>-    "${WEBKIT2_DIR}/DatabaseProcess/unix"
>     "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
>     "${WEBKIT2_DIR}/NetworkProcess/Downloads/soup"
>     "${WEBKIT2_DIR}/NetworkProcess/soup"
>@@ -392,6 +391,7 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
>     "${WEBKIT2_DIR}/Shared/soup"
>     "${WEBKIT2_DIR}/Shared/unix"
>     "${WEBKIT2_DIR}/Shared/wpe"
>+    "${WEBKIT2_DIR}/StorageProcess/unix"
>     "${WEBKIT2_DIR}/UIProcess/API/C/cairo"
>     "${WEBKIT2_DIR}/UIProcess/API/C/wpe"
>     "${WEBKIT2_DIR}/UIProcess/API/glib"
>diff --git a/Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.cpp b/Source/WebKit/Shared/Storage/StorageProcessCreationParameters.cpp
>similarity index 86%
>rename from Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.cpp
>rename to Source/WebKit/Shared/Storage/StorageProcessCreationParameters.cpp
>index cf0f76a2460..4fe34078dcf 100644
>--- a/Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.cpp
>+++ b/Source/WebKit/Shared/Storage/StorageProcessCreationParameters.cpp
>@@ -24,17 +24,17 @@
>  */
> 
> #include "config.h"
>-#include "DatabaseProcessCreationParameters.h"
>+#include "StorageProcessCreationParameters.h"
> 
> #include "ArgumentCoders.h"
> 
> namespace WebKit {
> 
>-DatabaseProcessCreationParameters::DatabaseProcessCreationParameters()
>+StorageProcessCreationParameters::StorageProcessCreationParameters()
> {
> }
> 
>-void DatabaseProcessCreationParameters::encode(IPC::Encoder& encoder) const
>+void StorageProcessCreationParameters::encode(IPC::Encoder& encoder) const
> {
> #if ENABLE(INDEXED_DATABASE)
>     encoder << sessionID;
>@@ -43,7 +43,7 @@ void DatabaseProcessCreationParameters::encode(IPC::Encoder& encoder) const
> #endif
> }
> 
>-bool DatabaseProcessCreationParameters::decode(IPC::Decoder& decoder, DatabaseProcessCreationParameters& result)
>+bool StorageProcessCreationParameters::decode(IPC::Decoder& decoder, StorageProcessCreationParameters& result)
> {
> #if ENABLE(INDEXED_DATABASE)
>     if (!decoder.decode(result.sessionID))
>diff --git a/Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.h b/Source/WebKit/Shared/Storage/StorageProcessCreationParameters.h
>similarity index 91%
>rename from Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.h
>rename to Source/WebKit/Shared/Storage/StorageProcessCreationParameters.h
>index 96f93f8fa08..e0f35364119 100644
>--- a/Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.h
>+++ b/Source/WebKit/Shared/Storage/StorageProcessCreationParameters.h
>@@ -37,11 +37,11 @@ class Encoder;
> 
> namespace WebKit {
> 
>-struct DatabaseProcessCreationParameters {
>-    DatabaseProcessCreationParameters();
>+struct StorageProcessCreationParameters {
>+    StorageProcessCreationParameters();
> 
>     void encode(IPC::Encoder&) const;
>-    static bool decode(IPC::Decoder&, DatabaseProcessCreationParameters&);
>+    static bool decode(IPC::Decoder&, StorageProcessCreationParameters&);
> 
>     WebCore::SessionID sessionID;
>     
>diff --git a/Source/WebKit/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist b/Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist
>similarity index 100%
>rename from Source/WebKit/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist
>rename to Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist
>diff --git a/Source/WebKit/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm b/Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm
>similarity index 76%
>rename from Source/WebKit/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm
>rename to Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm
>index 62e893b8293..12a2e1a434b 100644
>--- a/Source/WebKit/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm
>+++ b/Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm
>@@ -26,15 +26,15 @@
> #import "config.h"
> 
> #import "EnvironmentUtilities.h"
>-#import "DatabaseProcess.h"
>+#import "StorageProcess.h"
> #import "WKBase.h"
> #import "XPCServiceEntryPoint.h"
> 
> using namespace WebKit;
> 
>-extern "C" WK_EXPORT void DatabaseServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage);
>+extern "C" WK_EXPORT void StorageProcessInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage);
> 
>-void DatabaseServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage)
>+void StorageProcessInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage)
> {
>-    XPCServiceInitializer<DatabaseProcess, XPCServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);
>+    XPCServiceInitializer<StorageProcess, XPCServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);
> }
>diff --git a/Source/WebKit/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp b/Source/WebKit/StorageProcess/EntryPoint/unix/StorageProcessMain.cpp
>similarity index 100%
>rename from Source/WebKit/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp
>rename to Source/WebKit/StorageProcess/EntryPoint/unix/StorageProcessMain.cpp
>diff --git a/Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp b/Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp
>similarity index 77%
>rename from Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp
>rename to Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp
>index c01633b8845..38905c1319b 100644
>--- a/Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp
>+++ b/Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp
>@@ -29,7 +29,7 @@
> #if ENABLE(INDEXED_DATABASE)
> 
> #include "DataReference.h"
>-#include "DatabaseProcess.h"
>+#include "StorageProcess.h"
> #include "WebCoreArgumentCoders.h"
> #include "WebIDBConnectionToServerMessages.h"
> #include "WebIDBResult.h"
>@@ -45,19 +45,19 @@ using namespace WebCore;
> 
> namespace WebKit {
> 
>-Ref<WebIDBConnectionToClient> WebIDBConnectionToClient::create(DatabaseToWebProcessConnection& connection, uint64_t serverConnectionIdentifier, WebCore::SessionID sessionID)
>+Ref<WebIDBConnectionToClient> WebIDBConnectionToClient::create(StorageToWebProcessConnection& connection, uint64_t serverConnectionIdentifier, WebCore::SessionID sessionID)
> {
>     return adoptRef(*new WebIDBConnectionToClient(connection, serverConnectionIdentifier, sessionID));
> }
> 
>-WebIDBConnectionToClient::WebIDBConnectionToClient(DatabaseToWebProcessConnection& connection, uint64_t serverConnectionIdentifier, WebCore::SessionID sessionID)
>+WebIDBConnectionToClient::WebIDBConnectionToClient(StorageToWebProcessConnection& connection, uint64_t serverConnectionIdentifier, WebCore::SessionID sessionID)
>     : m_connection(connection)
>     , m_identifier(serverConnectionIdentifier)
>     , m_sessionID(sessionID)
> {
>     relaxAdoptionRequirement();
>     m_connectionToClient = IDBServer::IDBConnectionToClient::create(*this);
>-    DatabaseProcess::singleton().idbServer(m_sessionID).registerConnection(*m_connectionToClient);
>+    StorageProcess::singleton().idbServer(m_sessionID).registerConnection(*m_connectionToClient);
> }
> 
> WebIDBConnectionToClient::~WebIDBConnectionToClient()
>@@ -66,7 +66,7 @@ WebIDBConnectionToClient::~WebIDBConnectionToClient()
> 
> void WebIDBConnectionToClient::disconnectedFromWebProcess()
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).unregisterConnection(*m_connectionToClient);
>+    StorageProcess::singleton().idbServer(m_sessionID).unregisterConnection(*m_connectionToClient);
> }
> 
> IPC::Connection* WebIDBConnectionToClient::messageSenderConnection()
>@@ -159,7 +159,7 @@ template<class MessageType> void WebIDBConnectionToClient::handleGetResult(const
> 
> #if ENABLE(SANDBOX_EXTENSIONS)
>     RefPtr<WebIDBConnectionToClient> protector(this);
>-    DatabaseProcess::singleton().getSandboxExtensionsForBlobFiles(blobFilePaths, [protector, this, resultData](SandboxExtension::HandleArray&& handles) {
>+    StorageProcess::singleton().getSandboxExtensionsForBlobFiles(blobFilePaths, [protector, this, resultData](SandboxExtension::HandleArray&& handles) {
>         send(MessageType({ resultData, WTFMove(handles) }));
>     });
> #else
>@@ -224,62 +224,62 @@ void WebIDBConnectionToClient::didGetAllDatabaseNames(uint64_t callbackID, const
> 
> void WebIDBConnectionToClient::deleteDatabase(const IDBRequestData& request)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).deleteDatabase(request);
>+    StorageProcess::singleton().idbServer(m_sessionID).deleteDatabase(request);
> }
> 
> void WebIDBConnectionToClient::openDatabase(const IDBRequestData& request)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).openDatabase(request);
>+    StorageProcess::singleton().idbServer(m_sessionID).openDatabase(request);
> }
> 
> void WebIDBConnectionToClient::abortTransaction(const IDBResourceIdentifier& transactionIdentifier)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).abortTransaction(transactionIdentifier);
>+    StorageProcess::singleton().idbServer(m_sessionID).abortTransaction(transactionIdentifier);
> }
> 
> void WebIDBConnectionToClient::commitTransaction(const IDBResourceIdentifier& transactionIdentifier)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).commitTransaction(transactionIdentifier);
>+    StorageProcess::singleton().idbServer(m_sessionID).commitTransaction(transactionIdentifier);
> }
> 
> void WebIDBConnectionToClient::didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).didFinishHandlingVersionChangeTransaction(databaseConnectionIdentifier, transactionIdentifier);
>+    StorageProcess::singleton().idbServer(m_sessionID).didFinishHandlingVersionChangeTransaction(databaseConnectionIdentifier, transactionIdentifier);
> }
> 
> void WebIDBConnectionToClient::createObjectStore(const IDBRequestData& request, const IDBObjectStoreInfo& info)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).createObjectStore(request, info);
>+    StorageProcess::singleton().idbServer(m_sessionID).createObjectStore(request, info);
> }
> 
> void WebIDBConnectionToClient::deleteObjectStore(const IDBRequestData& request, const String& name)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).deleteObjectStore(request, name);
>+    StorageProcess::singleton().idbServer(m_sessionID).deleteObjectStore(request, name);
> }
> 
> void WebIDBConnectionToClient::renameObjectStore(const IDBRequestData& request, uint64_t objectStoreIdentifier, const String& newName)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).renameObjectStore(request, objectStoreIdentifier, newName);
>+    StorageProcess::singleton().idbServer(m_sessionID).renameObjectStore(request, objectStoreIdentifier, newName);
> }
> 
> void WebIDBConnectionToClient::clearObjectStore(const IDBRequestData& request, uint64_t objectStoreIdentifier)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).clearObjectStore(request, objectStoreIdentifier);
>+    StorageProcess::singleton().idbServer(m_sessionID).clearObjectStore(request, objectStoreIdentifier);
> }
> 
> void WebIDBConnectionToClient::createIndex(const IDBRequestData& request, const IDBIndexInfo& info)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).createIndex(request, info);
>+    StorageProcess::singleton().idbServer(m_sessionID).createIndex(request, info);
> }
> 
> void WebIDBConnectionToClient::deleteIndex(const IDBRequestData& request, uint64_t objectStoreIdentifier, const String& name)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).deleteIndex(request, objectStoreIdentifier, name);
>+    StorageProcess::singleton().idbServer(m_sessionID).deleteIndex(request, objectStoreIdentifier, name);
> }
> 
> void WebIDBConnectionToClient::renameIndex(const IDBRequestData& request, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const String& newName)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).renameIndex(request, objectStoreIdentifier, indexIdentifier, newName);
>+    StorageProcess::singleton().idbServer(m_sessionID).renameIndex(request, objectStoreIdentifier, indexIdentifier, newName);
> }
> 
> void WebIDBConnectionToClient::putOrAdd(const IDBRequestData& request, const IDBKeyData& key, const IDBValue& value, unsigned overwriteMode)
>@@ -294,77 +294,77 @@ void WebIDBConnectionToClient::putOrAdd(const IDBRequestData& request, const IDB
> 
>     IndexedDB::ObjectStoreOverwriteMode mode = static_cast<IndexedDB::ObjectStoreOverwriteMode>(overwriteMode);
> 
>-    DatabaseProcess::singleton().idbServer(m_sessionID).putOrAdd(request, key, value, mode);
>+    StorageProcess::singleton().idbServer(m_sessionID).putOrAdd(request, key, value, mode);
> }
> 
> void WebIDBConnectionToClient::getRecord(const IDBRequestData& request, const IDBGetRecordData& getRecordData)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).getRecord(request, getRecordData);
>+    StorageProcess::singleton().idbServer(m_sessionID).getRecord(request, getRecordData);
> }
> 
> void WebIDBConnectionToClient::getAllRecords(const IDBRequestData& request, const IDBGetAllRecordsData& getAllRecordsData)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).getAllRecords(request, getAllRecordsData);
>+    StorageProcess::singleton().idbServer(m_sessionID).getAllRecords(request, getAllRecordsData);
> }
> 
> void WebIDBConnectionToClient::getCount(const IDBRequestData& request, const IDBKeyRangeData& range)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).getCount(request, range);
>+    StorageProcess::singleton().idbServer(m_sessionID).getCount(request, range);
> }
> 
> void WebIDBConnectionToClient::deleteRecord(const IDBRequestData& request, const IDBKeyRangeData& range)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).deleteRecord(request, range);
>+    StorageProcess::singleton().idbServer(m_sessionID).deleteRecord(request, range);
> }
> 
> void WebIDBConnectionToClient::openCursor(const IDBRequestData& request, const IDBCursorInfo& info)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).openCursor(request, info);
>+    StorageProcess::singleton().idbServer(m_sessionID).openCursor(request, info);
> }
> 
> void WebIDBConnectionToClient::iterateCursor(const IDBRequestData& request, const IDBIterateCursorData& data)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).iterateCursor(request, data);
>+    StorageProcess::singleton().idbServer(m_sessionID).iterateCursor(request, data);
> }
> 
> void WebIDBConnectionToClient::establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo& info)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).establishTransaction(databaseConnectionIdentifier, info);
>+    StorageProcess::singleton().idbServer(m_sessionID).establishTransaction(databaseConnectionIdentifier, info);
> }
> 
> void WebIDBConnectionToClient::databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).databaseConnectionPendingClose(databaseConnectionIdentifier);
>+    StorageProcess::singleton().idbServer(m_sessionID).databaseConnectionPendingClose(databaseConnectionIdentifier);
> }
> 
> void WebIDBConnectionToClient::databaseConnectionClosed(uint64_t databaseConnectionIdentifier)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).databaseConnectionClosed(databaseConnectionIdentifier);
>+    StorageProcess::singleton().idbServer(m_sessionID).databaseConnectionClosed(databaseConnectionIdentifier);
> }
> 
> void WebIDBConnectionToClient::abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).abortOpenAndUpgradeNeeded(databaseConnectionIdentifier, transactionIdentifier);
>+    StorageProcess::singleton().idbServer(m_sessionID).abortOpenAndUpgradeNeeded(databaseConnectionIdentifier, transactionIdentifier);
> }
> 
> void WebIDBConnectionToClient::didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).didFireVersionChangeEvent(databaseConnectionIdentifier, transactionIdentifier);
>+    StorageProcess::singleton().idbServer(m_sessionID).didFireVersionChangeEvent(databaseConnectionIdentifier, transactionIdentifier);
> }
> 
> void WebIDBConnectionToClient::openDBRequestCancelled(const IDBRequestData& requestData)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).openDBRequestCancelled(requestData);
>+    StorageProcess::singleton().idbServer(m_sessionID).openDBRequestCancelled(requestData);
> }
> 
> void WebIDBConnectionToClient::confirmDidCloseFromServer(uint64_t databaseConnectionIdentifier)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).confirmDidCloseFromServer(databaseConnectionIdentifier);
>+    StorageProcess::singleton().idbServer(m_sessionID).confirmDidCloseFromServer(databaseConnectionIdentifier);
> }
> 
> void WebIDBConnectionToClient::getAllDatabaseNames(uint64_t serverConnectionIdentifier, const WebCore::SecurityOriginData& topOrigin, const WebCore::SecurityOriginData& openingOrigin, uint64_t callbackID)
> {
>-    DatabaseProcess::singleton().idbServer(m_sessionID).getAllDatabaseNames(serverConnectionIdentifier, topOrigin, openingOrigin, callbackID);
>+    StorageProcess::singleton().idbServer(m_sessionID).getAllDatabaseNames(serverConnectionIdentifier, topOrigin, openingOrigin, callbackID);
> }
> 
> } // namespace WebKit
>diff --git a/Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h b/Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.h
>similarity index 95%
>rename from Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h
>rename to Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.h
>index b6f13c8597f..f343e13d1e0 100644
>--- a/Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h
>+++ b/Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.h
>@@ -27,8 +27,8 @@
> 
> #if ENABLE(INDEXED_DATABASE)
> 
>-#include "DatabaseToWebProcessConnection.h"
> #include "MessageSender.h"
>+#include "StorageToWebProcessConnection.h"
> #include <WebCore/IDBConnectionToClient.h>
> #include <WebCore/SessionID.h>
> 
>@@ -52,7 +52,7 @@ namespace WebKit {
> 
> class WebIDBConnectionToClient final : public WebCore::IDBServer::IDBConnectionToClientDelegate, public IPC::MessageSender, public RefCounted<WebIDBConnectionToClient> {
> public:
>-    static Ref<WebIDBConnectionToClient> create(DatabaseToWebProcessConnection&, uint64_t serverConnectionIdentifier, WebCore::SessionID);
>+    static Ref<WebIDBConnectionToClient> create(StorageToWebProcessConnection&, uint64_t serverConnectionIdentifier, WebCore::SessionID);
> 
>     virtual ~WebIDBConnectionToClient();
> 
>@@ -126,13 +126,13 @@ public:
>     void didReceiveMessage(IPC::Connection&, IPC::Decoder&);
> 
> private:
>-    WebIDBConnectionToClient(DatabaseToWebProcessConnection&, uint64_t serverConnectionIdentifier, WebCore::SessionID);
>+    WebIDBConnectionToClient(StorageToWebProcessConnection&, uint64_t serverConnectionIdentifier, WebCore::SessionID);
> 
>     IPC::Connection* messageSenderConnection() final;
> 
>     template<class MessageType> void handleGetResult(const WebCore::IDBResultData&);
> 
>-    Ref<DatabaseToWebProcessConnection> m_connection;
>+    Ref<StorageToWebProcessConnection> m_connection;
> 
>     uint64_t m_identifier;
>     WebCore::SessionID m_sessionID;
>diff --git a/Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in b/Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.messages.in
>similarity index 100%
>rename from Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in
>rename to Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.messages.in
>diff --git a/Source/WebKit/DatabaseProcess/DatabaseProcess.cpp b/Source/WebKit/StorageProcess/StorageProcess.cpp
>similarity index 67%
>rename from Source/WebKit/DatabaseProcess/DatabaseProcess.cpp
>rename to Source/WebKit/StorageProcess/StorageProcess.cpp
>index 6b800ebc02e..ae8e30d9c94 100644
>--- a/Source/WebKit/DatabaseProcess/DatabaseProcess.cpp
>+++ b/Source/WebKit/StorageProcess/StorageProcess.cpp
>@@ -24,12 +24,12 @@
>  */
> 
> #include "config.h"
>-#include "DatabaseProcess.h"
>+#include "StorageProcess.h"
> 
>-#include "DatabaseProcessCreationParameters.h"
>-#include "DatabaseProcessMessages.h"
>-#include "DatabaseProcessProxyMessages.h"
>-#include "DatabaseToWebProcessConnection.h"
>+#include "StorageProcessCreationParameters.h"
>+#include "StorageProcessMessages.h"
>+#include "StorageProcessProxyMessages.h"
>+#include "StorageToWebProcessConnection.h"
> #include "WebCoreArgumentCoders.h"
> #include "WebsiteData.h"
> #include <WebCore/FileSystem.h>
>@@ -44,52 +44,52 @@ using namespace WebCore;
> 
> namespace WebKit {
> 
>-DatabaseProcess& DatabaseProcess::singleton()
>+StorageProcess& StorageProcess::singleton()
> {
>-    static NeverDestroyed<DatabaseProcess> databaseProcess;
>-    return databaseProcess;
>+    static NeverDestroyed<StorageProcess> process;
>+    return process;
> }
> 
>-DatabaseProcess::DatabaseProcess()
>-    : m_queue(WorkQueue::create("com.apple.WebKit.DatabaseProcess"))
>+StorageProcess::StorageProcess()
>+    : m_queue(WorkQueue::create("com.apple.WebKit.StorageProcess"))
> {
>     // Make sure the UTF8Encoding encoding and the text encoding maps have been built on the main thread before a background thread needs it.
>     // FIXME: https://bugs.webkit.org/show_bug.cgi?id=135365 - Need a more explicit way of doing this besides accessing the UTF8Encoding.
>     UTF8Encoding();
> }
> 
>-DatabaseProcess::~DatabaseProcess()
>+StorageProcess::~StorageProcess()
> {
> }
> 
>-void DatabaseProcess::initializeConnection(IPC::Connection* connection)
>+void StorageProcess::initializeConnection(IPC::Connection* connection)
> {
>     ChildProcess::initializeConnection(connection);
> }
> 
>-bool DatabaseProcess::shouldTerminate()
>+bool StorageProcess::shouldTerminate()
> {
>     return true;
> }
> 
>-void DatabaseProcess::didClose(IPC::Connection&)
>+void StorageProcess::didClose(IPC::Connection&)
> {
>     stopRunLoop();
> }
> 
>-void DatabaseProcess::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
>+void StorageProcess::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
> {
>     if (messageReceiverMap().dispatchMessage(connection, decoder))
>         return;
> 
>-    if (decoder.messageReceiverName() == Messages::DatabaseProcess::messageReceiverName()) {
>-        didReceiveDatabaseProcessMessage(connection, decoder);
>+    if (decoder.messageReceiverName() == Messages::StorageProcess::messageReceiverName()) {
>+        didReceiveStorageProcessMessage(connection, decoder);
>         return;
>     }
> }
> 
> #if ENABLE(INDEXED_DATABASE)
>-IDBServer::IDBServer& DatabaseProcess::idbServer(SessionID sessionID)
>+IDBServer::IDBServer& StorageProcess::idbServer(SessionID sessionID)
> {
>     auto addResult = m_idbServers.add(sessionID, nullptr);
>     if (!addResult.isNewEntry) {
>@@ -102,12 +102,12 @@ IDBServer::IDBServer& DatabaseProcess::idbServer(SessionID sessionID)
>     // If there's not, then where did this SessionID come from?
>     ASSERT(!path.isEmpty());
> 
>-    addResult.iterator->value = IDBServer::IDBServer::create(path, DatabaseProcess::singleton());
>+    addResult.iterator->value = IDBServer::IDBServer::create(path, StorageProcess::singleton());
>     return *addResult.iterator->value;
> }
> #endif
> 
>-void DatabaseProcess::initializeWebsiteDataStore(const DatabaseProcessCreationParameters& parameters)
>+void StorageProcess::initializeWebsiteDataStore(const StorageProcessCreationParameters& parameters)
> {
> #if ENABLE(INDEXED_DATABASE)
>     // *********
>@@ -121,11 +121,11 @@ void DatabaseProcess::initializeWebsiteDataStore(const DatabaseProcessCreationPa
>     addResult.iterator->value = parameters.indexedDatabaseDirectory;
>     SandboxExtension::consumePermanently(parameters.indexedDatabaseDirectoryExtensionHandle);
> 
>-    postDatabaseTask(createCrossThreadTask(*this, &DatabaseProcess::ensurePathExists, parameters.indexedDatabaseDirectory));
>+    postDatabaseTask(createCrossThreadTask(*this, &StorageProcess::ensurePathExists, parameters.indexedDatabaseDirectory));
> #endif
> }
> 
>-void DatabaseProcess::ensurePathExists(const String& path)
>+void StorageProcess::ensurePathExists(const String& path)
> {
>     ASSERT(!RunLoop::isMain());
> 
>@@ -133,7 +133,7 @@ void DatabaseProcess::ensurePathExists(const String& path)
>         LOG_ERROR("Failed to make all directories for path '%s'", path.utf8().data());
> }
> 
>-void DatabaseProcess::postDatabaseTask(CrossThreadTask&& task)
>+void StorageProcess::postDatabaseTask(CrossThreadTask&& task)
> {
>     ASSERT(RunLoop::isMain());
> 
>@@ -146,7 +146,7 @@ void DatabaseProcess::postDatabaseTask(CrossThreadTask&& task)
>     });
> }
> 
>-void DatabaseProcess::performNextDatabaseTask()
>+void StorageProcess::performNextDatabaseTask()
> {
>     ASSERT(!RunLoop::isMain());
> 
>@@ -160,33 +160,32 @@ void DatabaseProcess::performNextDatabaseTask()
>     task.performTask();
> }
> 
>-void DatabaseProcess::createDatabaseToWebProcessConnection()
>+void StorageProcess::createDatabaseToWebProcessConnection()
> {
> #if USE(UNIX_DOMAIN_SOCKETS)
>     IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
>     m_databaseToWebProcessConnections.append(DatabaseToWebProcessConnection::create(socketPair.server));
>-    parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidCreateDatabaseToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);
>+    parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateDatabaseToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);
> #elif OS(DARWIN)
>     // Create the listening port.
>     mach_port_t listeningPort;
>     mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
> 
>     // Create a listening connection.
>-    auto connection = DatabaseToWebProcessConnection::create(IPC::Connection::Identifier(listeningPort));
>-    m_databaseToWebProcessConnections.append(WTFMove(connection));
>+    m_databaseToWebProcessConnections.append(StorageToWebProcessConnection::create(IPC::Connection::Identifier(listeningPort)));
> 
>     IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
>-    parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidCreateDatabaseToWebProcessConnection(clientPort), 0);
>+    parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateDatabaseToWebProcessConnection(clientPort), 0);
> #else
>     notImplemented();
> #endif
> }
> 
>-void DatabaseProcess::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID)
>+void StorageProcess::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID)
> {
> #if ENABLE(INDEXED_DATABASE)
>     auto completionHandler = [this, callbackID](const WebsiteData& websiteData) {
>-        parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidFetchWebsiteData(callbackID, websiteData), 0);
>+        parentProcessConnection()->send(Messages::StorageProcessProxy::DidFetchWebsiteData(callbackID, websiteData), 0);
>     };
> 
>     String path = m_idbDatabasePaths.get(sessionID);
>@@ -210,11 +209,11 @@ void DatabaseProcess::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDat
> #endif
> }
> 
>-void DatabaseProcess::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
>+void StorageProcess::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
> {
> #if ENABLE(INDEXED_DATABASE)
>     auto completionHandler = [this, callbackID]() {
>-        parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidDeleteWebsiteData(callbackID), 0);
>+        parentProcessConnection()->send(Messages::StorageProcessProxy::DidDeleteWebsiteData(callbackID), 0);
>     };
> 
>     if (!websiteDataTypes.contains(WebsiteDataType::IndexedDBDatabases)) {
>@@ -226,11 +225,11 @@ void DatabaseProcess::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<
> #endif
> }
> 
>-void DatabaseProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<SecurityOriginData>& securityOriginDatas, uint64_t callbackID)
>+void StorageProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<SecurityOriginData>& securityOriginDatas, uint64_t callbackID)
> {
> #if ENABLE(INDEXED_DATABASE)
>     auto completionHandler = [this, callbackID]() {
>-        parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidDeleteWebsiteDataForOrigins(callbackID), 0);
>+        parentProcessConnection()->send(Messages::StorageProcessProxy::DidDeleteWebsiteDataForOrigins(callbackID), 0);
>     };
> 
>     if (!websiteDataTypes.contains(WebsiteDataType::IndexedDBDatabases)) {
>@@ -243,7 +242,7 @@ void DatabaseProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID,
> }
> 
> #if ENABLE(SANDBOX_EXTENSIONS)
>-void DatabaseProcess::grantSandboxExtensionsForBlobs(const Vector<String>& paths, const SandboxExtension::HandleArray& handles)
>+void StorageProcess::grantSandboxExtensionsForBlobs(const Vector<String>& paths, const SandboxExtension::HandleArray& handles)
> {
>     ASSERT(paths.size() == handles.size());
> 
>@@ -255,13 +254,13 @@ void DatabaseProcess::grantSandboxExtensionsForBlobs(const Vector<String>& paths
> #endif
> 
> #if ENABLE(INDEXED_DATABASE)
>-void DatabaseProcess::prepareForAccessToTemporaryFile(const String& path)
>+void StorageProcess::prepareForAccessToTemporaryFile(const String& path)
> {
>     if (auto extension = m_blobTemporaryFileSandboxExtensions.get(path))
>         extension->consume();
> }
> 
>-void DatabaseProcess::accessToTemporaryFileComplete(const String& path)
>+void StorageProcess::accessToTemporaryFileComplete(const String& path)
> {
>     // We've either hard linked the temporary blob file to the database directory, copied it there,
>     // or the transaction is being aborted.
>@@ -272,7 +271,7 @@ void DatabaseProcess::accessToTemporaryFileComplete(const String& path)
>         extension->revoke();
> }
> 
>-Vector<WebCore::SecurityOriginData> DatabaseProcess::indexedDatabaseOrigins(const String& path)
>+Vector<WebCore::SecurityOriginData> StorageProcess::indexedDatabaseOrigins(const String& path)
> {
>     if (path.isEmpty())
>         return { };
>@@ -291,16 +290,16 @@ Vector<WebCore::SecurityOriginData> DatabaseProcess::indexedDatabaseOrigins(cons
> #endif
> 
> #if ENABLE(SANDBOX_EXTENSIONS)
>-void DatabaseProcess::getSandboxExtensionsForBlobFiles(const Vector<String>& filenames, WTF::Function<void (SandboxExtension::HandleArray&&)>&& completionHandler)
>+void StorageProcess::getSandboxExtensionsForBlobFiles(const Vector<String>& filenames, WTF::Function<void (SandboxExtension::HandleArray&&)>&& completionHandler)
> {
>     static uint64_t lastRequestID;
> 
>     uint64_t requestID = ++lastRequestID;
>     m_sandboxExtensionForBlobsCompletionHandlers.set(requestID, WTFMove(completionHandler));
>-    parentProcessConnection()->send(Messages::DatabaseProcessProxy::GetSandboxExtensionsForBlobFiles(requestID, filenames), 0);
>+    parentProcessConnection()->send(Messages::StorageProcessProxy::GetSandboxExtensionsForBlobFiles(requestID, filenames), 0);
> }
> 
>-void DatabaseProcess::didGetSandboxExtensionsForBlobFiles(uint64_t requestID, SandboxExtension::HandleArray&& handles)
>+void StorageProcess::didGetSandboxExtensionsForBlobFiles(uint64_t requestID, SandboxExtension::HandleArray&& handles)
> {
>     if (auto handler = m_sandboxExtensionForBlobsCompletionHandlers.take(requestID))
>         handler(WTFMove(handles));
>@@ -308,15 +307,15 @@ void DatabaseProcess::didGetSandboxExtensionsForBlobFiles(uint64_t requestID, Sa
> #endif
> 
> #if !PLATFORM(COCOA)
>-void DatabaseProcess::initializeProcess(const ChildProcessInitializationParameters&)
>+void StorageProcess::initializeProcess(const ChildProcessInitializationParameters&)
> {
> }
> 
>-void DatabaseProcess::initializeProcessName(const ChildProcessInitializationParameters&)
>+void StorageProcess::initializeProcessName(const ChildProcessInitializationParameters&)
> {
> }
> 
>-void DatabaseProcess::initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&)
>+void StorageProcess::initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&)
> {
> }
> #endif
>diff --git a/Source/WebKit/DatabaseProcess/DatabaseProcess.h b/Source/WebKit/StorageProcess/StorageProcess.h
>similarity index 89%
>rename from Source/WebKit/DatabaseProcess/DatabaseProcess.h
>rename to Source/WebKit/StorageProcess/StorageProcess.h
>index 8fdac8b0fd4..a67c43ee852 100644
>--- a/Source/WebKit/DatabaseProcess/DatabaseProcess.h
>+++ b/Source/WebKit/StorageProcess/StorageProcess.h
>@@ -40,20 +40,20 @@ struct SecurityOriginData;
> 
> namespace WebKit {
> 
>-class DatabaseToWebProcessConnection;
>+class StorageToWebProcessConnection;
> enum class WebsiteDataType;
>-struct DatabaseProcessCreationParameters;
>+struct StorageProcessCreationParameters;
> 
>-class DatabaseProcess : public ChildProcess
>+class StorageProcess : public ChildProcess
> #if ENABLE(INDEXED_DATABASE)
>     , public WebCore::IDBServer::IDBBackingStoreTemporaryFileHandler
> #endif
> {
>-    WTF_MAKE_NONCOPYABLE(DatabaseProcess);
>-    friend class NeverDestroyed<DatabaseProcess>;
>+    WTF_MAKE_NONCOPYABLE(StorageProcess);
>+    friend class NeverDestroyed<StorageProcess>;
> public:
>-    static DatabaseProcess& singleton();
>-    ~DatabaseProcess();
>+    static StorageProcess& singleton();
>+    ~StorageProcess();
> 
> #if ENABLE(INDEXED_DATABASE)
>     WebCore::IDBServer::IDBServer& idbServer(WebCore::SessionID);
>@@ -74,7 +74,7 @@ public:
> #endif
> 
> private:
>-    DatabaseProcess();
>+    StorageProcess();
> 
>     // ChildProcess
>     void initializeProcess(const ChildProcessInitializationParameters&) override;
>@@ -86,10 +86,10 @@ private:
>     // IPC::Connection::Client
>     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
>     void didClose(IPC::Connection&) override;
>-    void didReceiveDatabaseProcessMessage(IPC::Connection&, IPC::Decoder&);
>+    void didReceiveStorageProcessMessage(IPC::Connection&, IPC::Decoder&);
> 
>     // Message Handlers
>-    void initializeWebsiteDataStore(const DatabaseProcessCreationParameters&);
>+    void initializeWebsiteDataStore(const StorageProcessCreationParameters&);
>     void createDatabaseToWebProcessConnection();
> 
>     void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID);
>@@ -108,7 +108,7 @@ private:
>     void performNextDatabaseTask();
>     void ensurePathExists(const String&);
> 
>-    Vector<RefPtr<DatabaseToWebProcessConnection>> m_databaseToWebProcessConnections;
>+    Vector<RefPtr<StorageToWebProcessConnection>> m_databaseToWebProcessConnections;
> 
>     Ref<WorkQueue> m_queue;
> 
>diff --git a/Source/WebKit/DatabaseProcess/DatabaseProcess.messages.in b/Source/WebKit/StorageProcess/StorageProcess.messages.in
>similarity index 89%
>rename from Source/WebKit/DatabaseProcess/DatabaseProcess.messages.in
>rename to Source/WebKit/StorageProcess/StorageProcess.messages.in
>index 6d20c28c72f..055873754be 100644
>--- a/Source/WebKit/DatabaseProcess/DatabaseProcess.messages.in
>+++ b/Source/WebKit/StorageProcess/StorageProcess.messages.in
>@@ -20,9 +20,9 @@
> # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
>-messages -> DatabaseProcess LegacyReceiver {
>-    # Initializes a WebsiteDataStore/Session in the DatabaseProcess with the correct parameters
>-    InitializeWebsiteDataStore(struct WebKit::DatabaseProcessCreationParameters processCreationParameters)
>+messages -> StorageProcess LegacyReceiver {
>+    # Initializes a WebsiteDataStore/Session in the StorageProcess with the correct parameters
>+    InitializeWebsiteDataStore(struct WebKit::StorageProcessCreationParameters processCreationParameters)
> 
>     # Creates a connection for communication with a WebProcess
>     CreateDatabaseToWebProcessConnection()
>diff --git a/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.cpp b/Source/WebKit/StorageProcess/StorageToWebProcessConnection.cpp
>similarity index 64%
>rename from Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.cpp
>rename to Source/WebKit/StorageProcess/StorageToWebProcessConnection.cpp
>index 9ad6aa2a6eb..4acc264044f 100644
>--- a/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.cpp
>+++ b/Source/WebKit/StorageProcess/StorageToWebProcessConnection.cpp
>@@ -24,37 +24,37 @@
>  */
> 
> #include "config.h"
>-#include "DatabaseToWebProcessConnection.h"
>+#include "StorageToWebProcessConnection.h"
> 
>-#include "DatabaseToWebProcessConnectionMessages.h"
> #include "Logging.h"
>+#include "StorageToWebProcessConnectionMessages.h"
> #include "WebIDBConnectionToClient.h"
> #include "WebIDBConnectionToClientMessages.h"
> #include <wtf/RunLoop.h>
> 
> namespace WebKit {
> 
>-Ref<DatabaseToWebProcessConnection> DatabaseToWebProcessConnection::create(IPC::Connection::Identifier connectionIdentifier)
>+Ref<StorageToWebProcessConnection> StorageToWebProcessConnection::create(IPC::Connection::Identifier connectionIdentifier)
> {
>-    return adoptRef(*new DatabaseToWebProcessConnection(connectionIdentifier));
>+    return adoptRef(*new StorageToWebProcessConnection(connectionIdentifier));
> }
> 
>-DatabaseToWebProcessConnection::DatabaseToWebProcessConnection(IPC::Connection::Identifier connectionIdentifier)
>+StorageToWebProcessConnection::StorageToWebProcessConnection(IPC::Connection::Identifier connectionIdentifier)
>     : m_connection(IPC::Connection::createServerConnection(connectionIdentifier, *this))
> {
>     m_connection->setOnlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage(true);
>     m_connection->open();
> }
> 
>-DatabaseToWebProcessConnection::~DatabaseToWebProcessConnection()
>+StorageToWebProcessConnection::~StorageToWebProcessConnection()
> {
> 
> }
> 
>-void DatabaseToWebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
>+void StorageToWebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
> {
>-    if (decoder.messageReceiverName() == Messages::DatabaseToWebProcessConnection::messageReceiverName()) {
>-        didReceiveDatabaseToWebProcessConnectionMessage(connection, decoder);
>+    if (decoder.messageReceiverName() == Messages::StorageToWebProcessConnection::messageReceiverName()) {
>+        didReceiveStorageToWebProcessConnectionMessage(connection, decoder);
>         return;
>     }
> 
>@@ -70,17 +70,17 @@ void DatabaseToWebProcessConnection::didReceiveMessage(IPC::Connection& connecti
>     ASSERT_NOT_REACHED();
> }
> 
>-void DatabaseToWebProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
>+void StorageToWebProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
> {
>-    if (decoder.messageReceiverName() == Messages::DatabaseToWebProcessConnection::messageReceiverName()) {
>-        didReceiveSyncDatabaseToWebProcessConnectionMessage(connection, decoder, replyEncoder);
>+    if (decoder.messageReceiverName() == Messages::StorageToWebProcessConnection::messageReceiverName()) {
>+        didReceiveSyncStorageToWebProcessConnectionMessage(connection, decoder, replyEncoder);
>         return;
>     }
> 
>     ASSERT_NOT_REACHED();
> }
> 
>-void DatabaseToWebProcessConnection::didClose(IPC::Connection&)
>+void StorageToWebProcessConnection::didClose(IPC::Connection&)
> {
> #if ENABLE(INDEXED_DATABASE)
>     auto connections = m_webIDBConnections;
>@@ -91,7 +91,7 @@ void DatabaseToWebProcessConnection::didClose(IPC::Connection&)
> #endif
> }
> 
>-void DatabaseToWebProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
>+void StorageToWebProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
> {
> 
> }
>@@ -105,16 +105,16 @@ static uint64_t generateConnectionToServerIdentifier()
>     return ++identifier;
> }
> 
>-void DatabaseToWebProcessConnection::establishIDBConnectionToServer(WebCore::SessionID sessionID, uint64_t& serverConnectionIdentifier)
>+void StorageToWebProcessConnection::establishIDBConnectionToServer(WebCore::SessionID sessionID, uint64_t& serverConnectionIdentifier)
> {
>     serverConnectionIdentifier = generateConnectionToServerIdentifier();
>-    LOG(IndexedDB, "DatabaseToWebProcessConnection::establishIDBConnectionToServer - %" PRIu64, serverConnectionIdentifier);
>+    LOG(IndexedDB, "StorageToWebProcessConnection::establishIDBConnectionToServer - %" PRIu64, serverConnectionIdentifier);
>     ASSERT(!m_webIDBConnections.contains(serverConnectionIdentifier));
> 
>     m_webIDBConnections.set(serverConnectionIdentifier, WebIDBConnectionToClient::create(*this, serverConnectionIdentifier, sessionID));
> }
> 
>-void DatabaseToWebProcessConnection::removeIDBConnectionToServer(uint64_t serverConnectionIdentifier)
>+void StorageToWebProcessConnection::removeIDBConnectionToServer(uint64_t serverConnectionIdentifier)
> {
>     ASSERT(m_webIDBConnections.contains(serverConnectionIdentifier));
> 
>diff --git a/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.h b/Source/WebKit/StorageProcess/StorageToWebProcessConnection.h
>similarity index 82%
>rename from Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.h
>rename to Source/WebKit/StorageProcess/StorageToWebProcessConnection.h
>index 595a8d3a398..12ffe95d822 100644
>--- a/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.h
>+++ b/Source/WebKit/StorageProcess/StorageToWebProcessConnection.h
>@@ -35,23 +35,23 @@ namespace WebKit {
> 
> class WebIDBConnectionToClient;
> 
>-class DatabaseToWebProcessConnection : public RefCounted<DatabaseToWebProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender {
>+class StorageToWebProcessConnection : public RefCounted<StorageToWebProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender {
> public:
>-    static Ref<DatabaseToWebProcessConnection> create(IPC::Connection::Identifier);
>-    ~DatabaseToWebProcessConnection();
>+    static Ref<StorageToWebProcessConnection> create(IPC::Connection::Identifier);
>+    ~StorageToWebProcessConnection();
> 
>     IPC::Connection& connection() { return m_connection.get(); }
> 
> private:
>-    DatabaseToWebProcessConnection(IPC::Connection::Identifier);
>+    StorageToWebProcessConnection(IPC::Connection::Identifier);
> 
>     // IPC::Connection::Client
>     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
>     void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&) override;
>     void didClose(IPC::Connection&) override;
>     void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
>-    void didReceiveDatabaseToWebProcessConnectionMessage(IPC::Connection&, IPC::Decoder&);
>-    void didReceiveSyncDatabaseToWebProcessConnectionMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&);
>+    void didReceiveStorageToWebProcessConnectionMessage(IPC::Connection&, IPC::Decoder&);
>+    void didReceiveSyncStorageToWebProcessConnectionMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&);
> 
>     // IPC::MessageSender
>     IPC::Connection* messageSenderConnection() override { return m_connection.ptr(); }
>diff --git a/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.messages.in b/Source/WebKit/StorageProcess/StorageToWebProcessConnection.messages.in
>similarity index 96%
>rename from Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.messages.in
>rename to Source/WebKit/StorageProcess/StorageToWebProcessConnection.messages.in
>index 0e4983ce1d7..5876120205e 100644
>--- a/Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.messages.in
>+++ b/Source/WebKit/StorageProcess/StorageToWebProcessConnection.messages.in
>@@ -20,7 +20,7 @@
> # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
>-messages -> DatabaseToWebProcessConnection LegacyReceiver {
>+messages -> StorageToWebProcessConnection LegacyReceiver {
> #if ENABLE(INDEXED_DATABASE)
>     # Creates a connection for communication with a WebProcess
>     EstablishIDBConnectionToServer(WebCore::SessionID sessionID) -> (uint64_t serverConnectionIdentifier)
>diff --git a/Source/WebKit/DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp b/Source/WebKit/StorageProcess/gtk/StorageProcessMainGtk.cpp
>similarity index 100%
>rename from Source/WebKit/DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp
>rename to Source/WebKit/StorageProcess/gtk/StorageProcessMainGtk.cpp
>diff --git a/Source/WebKit/DatabaseProcess/ios/DatabaseProcessIOS.mm b/Source/WebKit/StorageProcess/ios/StorageProcessIOS.mm
>similarity index 85%
>rename from Source/WebKit/DatabaseProcess/ios/DatabaseProcessIOS.mm
>rename to Source/WebKit/StorageProcess/ios/StorageProcessIOS.mm
>index c677cc2b143..b6fb8127545 100644
>--- a/Source/WebKit/DatabaseProcess/ios/DatabaseProcessIOS.mm
>+++ b/Source/WebKit/StorageProcess/ios/StorageProcessIOS.mm
>@@ -27,7 +27,7 @@
> 
> #if PLATFORM(IOS)
> 
>-#import "DatabaseProcess.h"
>+#import "StorageProcess.h"
> 
> #import "SandboxInitializationParameters.h"
> #import <WebCore/FileSystem.h>
>@@ -41,15 +41,15 @@ using namespace WebCore;
> 
> namespace WebKit {
> 
>-void DatabaseProcess::initializeProcess(const ChildProcessInitializationParameters&)
>+void StorageProcess::initializeProcess(const ChildProcessInitializationParameters&)
> {
> }
> 
>-void DatabaseProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
>+void StorageProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
> {
> }
> 
>-void DatabaseProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
>+void StorageProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
> {
> #if ENABLE_MANUAL_DATABASE_SANDBOXING
>     // Need to override the default, because service has a different bundle ID.
>diff --git a/Source/WebKit/DatabaseProcess/mac/DatabaseProcessMac.mm b/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm
>similarity index 87%
>rename from Source/WebKit/DatabaseProcess/mac/DatabaseProcessMac.mm
>rename to Source/WebKit/StorageProcess/mac/StorageProcessMac.mm
>index 06d15970347..3180bb84ebb 100644
>--- a/Source/WebKit/DatabaseProcess/mac/DatabaseProcessMac.mm
>+++ b/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm
>@@ -27,7 +27,7 @@
> 
> #if PLATFORM(MAC)
> 
>-#import "DatabaseProcess.h"
>+#import "StorageProcess.h"
> 
> #import "SandboxInitializationParameters.h"
> #import <WebCore/FileSystem.h>
>@@ -38,19 +38,19 @@ using namespace WebCore;
> 
> namespace WebKit {
> 
>-void DatabaseProcess::initializeProcess(const ChildProcessInitializationParameters&)
>+void StorageProcess::initializeProcess(const ChildProcessInitializationParameters&)
> {
>     // Having a window server connection in this process would result in spin logs (<rdar://problem/13239119>).
>     setApplicationIsDaemon();
> }
> 
>-void DatabaseProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
>+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];
>     WKSetVisibleApplicationName((CFStringRef)applicationName);
> }
> 
>-void DatabaseProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
>+void StorageProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
> {
>     // Need to overide the default, because service has a different bundle ID.
>     NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
>diff --git a/Source/WebKit/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in b/Source/WebKit/StorageProcess/mac/com.apple.WebKit.Databases.sb.in
>similarity index 100%
>rename from Source/WebKit/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in
>rename to Source/WebKit/StorageProcess/mac/com.apple.WebKit.Databases.sb.in
>diff --git a/Source/WebKit/DatabaseProcess/unix/DatabaseProcessMainUnix.h b/Source/WebKit/StorageProcess/unix/StorageProcessMainUnix.h
>similarity index 100%
>rename from Source/WebKit/DatabaseProcess/unix/DatabaseProcessMainUnix.h
>rename to Source/WebKit/StorageProcess/unix/StorageProcessMainUnix.h
>diff --git a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp b/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
>index 24c842dad62..0e9c0785cb7 100644
>--- a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
>@@ -27,13 +27,13 @@
> #include "NetworkProcessProxy.h"
> 
> #include "AuthenticationChallengeProxy.h"
>-#include "DatabaseProcessMessages.h"
> #include "DownloadProxyMessages.h"
> #include "LegacyCustomProtocolManagerProxyMessages.h"
> #include "Logging.h"
> #include "NetworkProcessCreationParameters.h"
> #include "NetworkProcessMessages.h"
> #include "SandboxExtension.h"
>+#include "StorageProcessMessages.h"
> #include "WebPageProxy.h"
> #include "WebProcessMessages.h"
> #include "WebProcessPool.h"
>@@ -299,7 +299,7 @@ void NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs(uint64
>         SandboxExtension::createHandle(paths[i], SandboxExtension::ReadWrite, extensions[i]);
>     }
> 
>-    m_processPool.sendToDatabaseProcessRelaunchingIfNecessary(Messages::DatabaseProcess::GrantSandboxExtensionsForBlobs(paths, extensions));
>+    m_processPool.sendToDatabaseProcessRelaunchingIfNecessary(Messages::StorageProcess::GrantSandboxExtensionsForBlobs(paths, extensions));
> #endif
>     connection()->send(Messages::NetworkProcess::DidGrantSandboxExtensionsToDatabaseProcessForBlobs(requestID), 0);
> }
>diff --git a/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.cpp b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp
>similarity index 64%
>rename from Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.cpp
>rename to Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp
>index 6beb7ef1d33..5e78c7d0a36 100644
>--- a/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp
>@@ -24,11 +24,11 @@
>  */
> 
> #include "config.h"
>-#include "DatabaseProcessProxy.h"
>+#include "StorageProcessProxy.h"
> 
>-#include "DatabaseProcessMessages.h"
>-#include "DatabaseProcessProxyMessages.h"
> #include "NetworkProcessMessages.h"
>+#include "StorageProcessMessages.h"
>+#include "StorageProcessProxyMessages.h"
> #include "WebProcessPool.h"
> #include "WebsiteData.h"
> #include <WebCore/NotImplemented.h>
>@@ -44,12 +44,12 @@ static uint64_t generateCallbackID()
>     return ++callbackID;
> }
> 
>-Ref<DatabaseProcessProxy> DatabaseProcessProxy::create(WebProcessPool* processPool)
>+Ref<StorageProcessProxy> StorageProcessProxy::create(WebProcessPool* processPool)
> {
>-    return adoptRef(*new DatabaseProcessProxy(processPool));
>+    return adoptRef(*new StorageProcessProxy(processPool));
> }
> 
>-DatabaseProcessProxy::DatabaseProcessProxy(WebProcessPool* processPool)
>+StorageProcessProxy::StorageProcessProxy(WebProcessPool* processPool)
>     : ChildProcessProxy(processPool->alwaysRunsAtBackgroundPriority())
>     , m_processPool(processPool)
>     , m_numPendingConnectionRequests(0)
>@@ -57,61 +57,61 @@ DatabaseProcessProxy::DatabaseProcessProxy(WebProcessPool* processPool)
>     connect();
> }
> 
>-DatabaseProcessProxy::~DatabaseProcessProxy()
>+StorageProcessProxy::~StorageProcessProxy()
> {
>     ASSERT(m_pendingFetchWebsiteDataCallbacks.isEmpty());
>     ASSERT(m_pendingDeleteWebsiteDataCallbacks.isEmpty());
>     ASSERT(m_pendingDeleteWebsiteDataForOriginsCallbacks.isEmpty());
> }
> 
>-void DatabaseProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
>+void StorageProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
> {
>     launchOptions.processType = ProcessLauncher::ProcessType::Database;
>     ChildProcessProxy::getLaunchOptions(launchOptions);
> }
> 
>-void DatabaseProcessProxy::processWillShutDown(IPC::Connection& connection)
>+void StorageProcessProxy::processWillShutDown(IPC::Connection& connection)
> {
>     ASSERT_UNUSED(connection, this->connection() == &connection);
> }
> 
>-void DatabaseProcessProxy::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
>+void StorageProcessProxy::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
> {
>-    if (decoder.messageReceiverName() == Messages::DatabaseProcessProxy::messageReceiverName()) {
>-        didReceiveDatabaseProcessProxyMessage(connection, decoder);
>+    if (decoder.messageReceiverName() == Messages::StorageProcessProxy::messageReceiverName()) {
>+        didReceiveStorageProcessProxyMessage(connection, decoder);
>         return;
>     }
> }
> 
>-void DatabaseProcessProxy::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WTF::Function<void (WebsiteData)>&& completionHandler)
>+void StorageProcessProxy::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WTF::Function<void (WebsiteData)>&& completionHandler)
> {
>     ASSERT(canSendMessage());
> 
>     uint64_t callbackID = generateCallbackID();
>     m_pendingFetchWebsiteDataCallbacks.add(callbackID, WTFMove(completionHandler));
> 
>-    send(Messages::DatabaseProcess::FetchWebsiteData(sessionID, dataTypes, callbackID), 0);
>+    send(Messages::StorageProcess::FetchWebsiteData(sessionID, dataTypes, callbackID), 0);
> }
> 
>-void DatabaseProcessProxy::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::chrono::system_clock::time_point modifiedSince, WTF::Function<void ()>&& completionHandler)
>+void StorageProcessProxy::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::chrono::system_clock::time_point modifiedSince, WTF::Function<void ()>&& completionHandler)
> {
>     auto callbackID = generateCallbackID();
> 
>     m_pendingDeleteWebsiteDataCallbacks.add(callbackID, WTFMove(completionHandler));
>-    send(Messages::DatabaseProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
>+    send(Messages::StorageProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
> }
> 
>-void DatabaseProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<WebCore::SecurityOriginData>& origins, WTF::Function<void()>&& completionHandler)
>+void StorageProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<WebCore::SecurityOriginData>& origins, WTF::Function<void()>&& completionHandler)
> {
>     ASSERT(canSendMessage());
> 
>     uint64_t callbackID = generateCallbackID();
>     m_pendingDeleteWebsiteDataForOriginsCallbacks.add(callbackID, WTFMove(completionHandler));
> 
>-    send(Messages::DatabaseProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, origins, callbackID), 0);
>+    send(Messages::StorageProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, origins, callbackID), 0);
> }
> 
>-void DatabaseProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
>+void StorageProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
> {
>     m_pendingConnectionReplies.append(WTFMove(reply));
> 
>@@ -120,10 +120,10 @@ void DatabaseProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcess
>         return;
>     }
> 
>-    send(Messages::DatabaseProcess::CreateDatabaseToWebProcessConnection(), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
>+    send(Messages::StorageProcess::CreateDatabaseToWebProcessConnection(), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
> }
> 
>-void DatabaseProcessProxy::didClose(IPC::Connection&)
>+void StorageProcessProxy::didClose(IPC::Connection&)
> {
>     // The database process must have crashed or exited, so send any pending sync replies we might have.
>     while (!m_pendingConnectionReplies.isEmpty()) {
>@@ -154,11 +154,11 @@ void DatabaseProcessProxy::didClose(IPC::Connection&)
>     m_processPool->databaseProcessCrashed(this);
> }
> 
>-void DatabaseProcessProxy::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
>+void StorageProcessProxy::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
> {
> }
> 
>-void DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection(const IPC::Attachment& connectionIdentifier)
>+void StorageProcessProxy::didCreateDatabaseToWebProcessConnection(const IPC::Attachment& connectionIdentifier)
> {
>     ASSERT(!m_pendingConnectionReplies.isEmpty());
> 
>@@ -173,26 +173,26 @@ void DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection(const IPC::At
> #endif
> }
> 
>-void DatabaseProcessProxy::didFetchWebsiteData(uint64_t callbackID, const WebsiteData& websiteData)
>+void StorageProcessProxy::didFetchWebsiteData(uint64_t callbackID, const WebsiteData& websiteData)
> {
>     auto callback = m_pendingFetchWebsiteDataCallbacks.take(callbackID);
>     callback(websiteData);
> }
> 
>-void DatabaseProcessProxy::didDeleteWebsiteData(uint64_t callbackID)
>+void StorageProcessProxy::didDeleteWebsiteData(uint64_t callbackID)
> {
>     auto callback = m_pendingDeleteWebsiteDataCallbacks.take(callbackID);
>     callback();
> }
> 
>-void DatabaseProcessProxy::didDeleteWebsiteDataForOrigins(uint64_t callbackID)
>+void StorageProcessProxy::didDeleteWebsiteDataForOrigins(uint64_t callbackID)
> {
>     auto callback = m_pendingDeleteWebsiteDataForOriginsCallbacks.take(callbackID);
>     callback();
> }
> 
> #if ENABLE(SANDBOX_EXTENSIONS)
>-void DatabaseProcessProxy::getSandboxExtensionsForBlobFiles(uint64_t requestID, const Vector<String>& paths)
>+void StorageProcessProxy::getSandboxExtensionsForBlobFiles(uint64_t requestID, const Vector<String>& paths)
> {
>     SandboxExtension::HandleArray extensions;
>     extensions.allocate(paths.size());
>@@ -201,11 +201,11 @@ void DatabaseProcessProxy::getSandboxExtensionsForBlobFiles(uint64_t requestID,
>         SandboxExtension::createHandle(paths[i], SandboxExtension::ReadWrite, extensions[i]);
>     }
> 
>-    send(Messages::DatabaseProcess::DidGetSandboxExtensionsForBlobFiles(requestID, extensions), 0);
>+    send(Messages::StorageProcess::DidGetSandboxExtensionsForBlobFiles(requestID, extensions), 0);
> }
> #endif
> 
>-void DatabaseProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
>+void StorageProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
> {
>     ChildProcessProxy::didFinishLaunching(launcher, connectionIdentifier);
> 
>@@ -215,7 +215,7 @@ void DatabaseProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Co
>     }
> 
>     for (unsigned i = 0; i < m_numPendingConnectionRequests; ++i)
>-        send(Messages::DatabaseProcess::CreateDatabaseToWebProcessConnection(), 0);
>+        send(Messages::StorageProcess::CreateDatabaseToWebProcessConnection(), 0);
>     
>     m_numPendingConnectionRequests = 0;
> }
>diff --git a/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.h b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h
>similarity index 93%
>rename from Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.h
>rename to Source/WebKit/UIProcess/Storage/StorageProcessProxy.h
>index 13d5c2d1b91..bbca70e055b 100644
>--- a/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.h
>+++ b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h
>@@ -43,10 +43,10 @@ class WebProcessPool;
> enum class WebsiteDataType;
> struct WebsiteData;
> 
>-class DatabaseProcessProxy : public ChildProcessProxy {
>+class StorageProcessProxy : public ChildProcessProxy {
> public:
>-    static Ref<DatabaseProcessProxy> create(WebProcessPool*);
>-    ~DatabaseProcessProxy();
>+    static Ref<StorageProcessProxy> create(WebProcessPool*);
>+    ~StorageProcessProxy();
> 
>     void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, WTF::Function<void(WebsiteData)>&& completionHandler);
>     void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, WTF::Function<void()>&& completionHandler);
>@@ -55,7 +55,7 @@ public:
>     void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
> 
> private:
>-    DatabaseProcessProxy(WebProcessPool*);
>+    StorageProcessProxy(WebProcessPool*);
> 
>     // ChildProcessProxy
>     void getLaunchOptions(ProcessLauncher::LaunchOptions&) override;
>@@ -66,7 +66,7 @@ private:
>     void didClose(IPC::Connection&) override;
>     void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
> 
>-    void didReceiveDatabaseProcessProxyMessage(IPC::Connection&, IPC::Decoder&);
>+    void didReceiveStorageProcessProxyMessage(IPC::Connection&, IPC::Decoder&);
> 
>     // Message handlers
>     void didCreateDatabaseToWebProcessConnection(const IPC::Attachment&);
>diff --git a/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.messages.in b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.messages.in
>similarity index 97%
>rename from Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.messages.in
>rename to Source/WebKit/UIProcess/Storage/StorageProcessProxy.messages.in
>index d444bf8a81f..fe1769333d6 100644
>--- a/Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.messages.in
>+++ b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.messages.in
>@@ -20,7 +20,7 @@
> # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
>-messages -> DatabaseProcessProxy LegacyReceiver {
>+messages -> StorageProcessProxy LegacyReceiver {
>     DidCreateDatabaseToWebProcessConnection(IPC::Attachment connectionIdentifier)
> 
>     DidFetchWebsiteData(uint64_t callbackID, struct WebKit::WebsiteData websiteData)
>diff --git a/Source/WebKit/UIProcess/WebContextSupplement.h b/Source/WebKit/UIProcess/WebContextSupplement.h
>index 31fe9c4a09b..80ca3a533a1 100644
>--- a/Source/WebKit/UIProcess/WebContextSupplement.h
>+++ b/Source/WebKit/UIProcess/WebContextSupplement.h
>@@ -28,8 +28,8 @@
> 
> namespace WebKit {
> 
>-class DatabaseProcessProxy;
> class NetworkProcessProxy;
>+class StorageProcessProxy;
> class WebProcessPool;
> class WebProcessProxy;
> 
>@@ -56,7 +56,7 @@ public:
>     {
>     }
> 
>-    virtual void processDidClose(DatabaseProcessProxy*)
>+    virtual void processDidClose(StorageProcessProxy*)
>     {
>     }
> 
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
>index 77e746fb3ef..f28f0997861 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
>+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
>@@ -35,8 +35,6 @@
> #include "APILegacyContextHistoryClient.h"
> #include "APIPageConfiguration.h"
> #include "APIProcessPoolConfiguration.h"
>-#include "DatabaseProcessCreationParameters.h"
>-#include "DatabaseProcessMessages.h"
> #include "DownloadProxy.h"
> #include "DownloadProxyMessages.h"
> #include "GamepadData.h"
>@@ -49,6 +47,8 @@
> #include "PerActivityStateCPUUsageSampler.h"
> #include "SandboxExtension.h"
> #include "StatisticsData.h"
>+#include "StorageProcessCreationParameters.h"
>+#include "StorageProcessMessages.h"
> #include "TextChecker.h"
> #include "UIGamepad.h"
> #include "UIGamepadProvider.h"
>@@ -521,9 +521,9 @@ void WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore*
>     // *********
> 
>     if (!m_databaseProcess) {
>-        m_databaseProcess = DatabaseProcessProxy::create(this);
>+        m_databaseProcess = StorageProcessProxy::create(this);
> 
>-        DatabaseProcessCreationParameters parameters;
>+        StorageProcessCreationParameters parameters;
> #if ENABLE(INDEXED_DATABASE)
>         ASSERT(!m_configuration->indexedDBDatabaseDirectory().isEmpty());
> 
>@@ -533,13 +533,13 @@ void WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore*
> #endif
> 
>         ASSERT(!parameters.indexedDatabaseDirectory.isEmpty());
>-        m_databaseProcess->send(Messages::DatabaseProcess::InitializeWebsiteDataStore(parameters), 0);
>+        m_databaseProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(parameters), 0);
>     }
> 
>     if (!relevantDataStore || relevantDataStore == &websiteDataStore().websiteDataStore())
>         return;
> 
>-    m_databaseProcess->send(Messages::DatabaseProcess::InitializeWebsiteDataStore(relevantDataStore->databaseProcessParameters()), 0);
>+    m_databaseProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(relevantDataStore->databaseProcessParameters()), 0);
> }
> 
> void WebProcessPool::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
>@@ -549,7 +549,7 @@ void WebProcessPool::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy:
>     m_databaseProcess->getDatabaseProcessConnection(WTFMove(reply));
> }
> 
>-void WebProcessPool::databaseProcessCrashed(DatabaseProcessProxy* databaseProcessProxy)
>+void WebProcessPool::databaseProcessCrashed(StorageProcessProxy* databaseProcessProxy)
> {
>     ASSERT(m_databaseProcess);
>     ASSERT(databaseProcessProxy == m_databaseProcess.get());
>@@ -961,7 +961,7 @@ void WebProcessPool::pageAddedToProcess(WebPageProxy& page)
> #if ENABLE(INDEXED_DATABASE)
>         auto databaseParameters = page.websiteDataStore().databaseProcessParameters();
>         if (!databaseParameters.indexedDatabaseDirectory.isEmpty())
>-            sendToDatabaseProcessRelaunchingIfNecessary(Messages::DatabaseProcess::InitializeWebsiteDataStore(databaseParameters));
>+            sendToDatabaseProcessRelaunchingIfNecessary(Messages::StorageProcess::InitializeWebsiteDataStore(databaseParameters));
> #endif
>     }
> }
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.h b/Source/WebKit/UIProcess/WebProcessPool.h
>index 8668cc485cf..df9ee2a36a2 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.h
>+++ b/Source/WebKit/UIProcess/WebProcessPool.h
>@@ -29,7 +29,6 @@
> #include "APIObject.h"
> #include "APIProcessPoolConfiguration.h"
> #include "APIWebsiteDataStore.h"
>-#include "DatabaseProcessProxy.h"
> #include "DownloadProxyMap.h"
> #include "GenericCallback.h"
> #include "HiddenPageThrottlingAutoIncreasesCounter.h"
>@@ -40,6 +39,7 @@
> #include "PluginInfoStore.h"
> #include "ProcessThrottler.h"
> #include "StatisticsRequest.h"
>+#include "StorageProcessProxy.h"
> #include "VisitedLinkStore.h"
> #include "WebContextClient.h"
> #include "WebContextConnectionClient.h"
>@@ -313,9 +313,9 @@ public:
>     void getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
> 
>     void ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore);
>-    DatabaseProcessProxy* databaseProcess() { return m_databaseProcess.get(); }
>+    StorageProcessProxy* databaseProcess() { return m_databaseProcess.get(); }
>     void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
>-    void databaseProcessCrashed(DatabaseProcessProxy*);
>+    void databaseProcessCrashed(StorageProcessProxy*);
> 
> #if PLATFORM(COCOA)
>     bool processSuppressionEnabled() const;
>@@ -549,7 +549,7 @@ private:
>     bool m_canHandleHTTPSServerTrustEvaluation;
>     bool m_didNetworkProcessCrash;
>     RefPtr<NetworkProcessProxy> m_networkProcess;
>-    RefPtr<DatabaseProcessProxy> m_databaseProcess;
>+    RefPtr<StorageProcessProxy> m_databaseProcess;
> 
>     HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks;
>     HashMap<uint64_t, RefPtr<StatisticsRequest>> m_statisticsRequests;
>diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>index 943b5bbbf60..cb5c8335820 100644
>--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>@@ -28,9 +28,9 @@
> 
> #include "APIProcessPoolConfiguration.h"
> #include "APIWebsiteDataRecord.h"
>-#include "DatabaseProcessCreationParameters.h"
> #include "NetworkProcessMessages.h"
> #include "StorageManager.h"
>+#include "StorageProcessCreationParameters.h"
> #include "WebCookieManagerProxy.h"
> #include "WebProcessMessages.h"
> #include "WebProcessPool.h"
>@@ -1315,11 +1315,11 @@ void WebsiteDataStore::enableResourceLoadStatisticsAndSetTestingCallback(Functio
>         processPool->setResourceLoadStatisticsEnabled(true);
> }
> 
>-DatabaseProcessCreationParameters WebsiteDataStore::databaseProcessParameters()
>+StorageProcessCreationParameters WebsiteDataStore::databaseProcessParameters()
> {
>     resolveDirectoriesIfNecessary();
> 
>-    DatabaseProcessCreationParameters parameters;
>+    StorageProcessCreationParameters parameters;
> 
>     parameters.sessionID = m_sessionID;
> 
>diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
>index 8e7749ed2ad..b54922ce298 100644
>--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
>+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
>@@ -54,7 +54,7 @@ class WebProcessPool;
> class WebResourceLoadStatisticsStore;
> enum class WebsiteDataFetchOption;
> enum class WebsiteDataType;
>-struct DatabaseProcessCreationParameters;
>+struct StorageProcessCreationParameters;
> struct WebsiteDataRecord;
> struct WebsiteDataStoreParameters;
> 
>@@ -121,7 +121,7 @@ public:
>     bool isAssociatedProcessPool(WebProcessPool&) const;
> 
>     WebsiteDataStoreParameters parameters();
>-    DatabaseProcessCreationParameters databaseProcessParameters();
>+    StorageProcessCreationParameters databaseProcessParameters();
> 
>     Vector<WebCore::Cookie> pendingCookies() const;
>     void addPendingCookie(const WebCore::Cookie&);
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index 989566b85ef..b9f0a7c0269 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -915,10 +915,6 @@
> 		4A3CC18F19B07B8A00D14AEF /* WKUserMediaPermissionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3619AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F601430155C5A32001FBDE0 /* BlockingResponseMap.h */; };
> 		51021E9C12B16788005C033C /* WebContextMenuClientMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51021E9B12B16788005C033C /* WebContextMenuClientMac.mm */; };
>-		51032F18180F73BB00961BB7 /* WebToDatabaseProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51032F16180F73BB00961BB7 /* WebToDatabaseProcessConnection.cpp */; };
>-		51032F19180F73BB00961BB7 /* WebToDatabaseProcessConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 51032F17180F73BB00961BB7 /* WebToDatabaseProcessConnection.h */; };
>-		51032F1D180F791700961BB7 /* DatabaseToWebProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51032F1B180F791700961BB7 /* DatabaseToWebProcessConnectionMessageReceiver.cpp */; };
>-		51032F1E180F791700961BB7 /* DatabaseToWebProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51032F1C180F791700961BB7 /* DatabaseToWebProcessConnectionMessages.h */; };
> 		5104F5A21F19D7D2004CF821 /* CookieStorageUtilsCF.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5104F5A11F19D7CF004CF821 /* CookieStorageUtilsCF.mm */; };
> 		5105236F1C739D42007993CB /* WebIDBConnectionToClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5105236D1C7393E9007993CB /* WebIDBConnectionToClient.cpp */; };
> 		510523701C739D42007993CB /* WebIDBConnectionToClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 5105236E1C7393E9007993CB /* WebIDBConnectionToClient.h */; };
>@@ -937,6 +933,16 @@
> 		510FBB9B1288C95E00AFFDF4 /* WebContextMenuItemData.h in Headers */ = {isa = PBXBuildFile; fileRef = 510FBB991288C95E00AFFDF4 /* WebContextMenuItemData.h */; };
> 		5110AE0C133C16CB0072717A /* WKIconDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5110AE0A133C16CB0072717A /* WKIconDatabase.cpp */; };
> 		5110AE0D133C16CB0072717A /* WKIconDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 5110AE0B133C16CB0072717A /* WKIconDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		5118E99B1F295266003EF9F5 /* WebToStorageProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5118E9991F295259003EF9F5 /* WebToStorageProcessConnection.cpp */; };
>+		5118E99C1F295266003EF9F5 /* WebToStorageProcessConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 5118E99A1F295259003EF9F5 /* WebToStorageProcessConnection.h */; };
>+		5118E9A01F295326003EF9F5 /* StorageProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5118E99E1F29531F003EF9F5 /* StorageProcessCreationParameters.cpp */; };
>+		5118E9A11F295326003EF9F5 /* StorageProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 5118E99F1F29531F003EF9F5 /* StorageProcessCreationParameters.h */; };
>+		5118E9A81F295977003EF9F5 /* StorageProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5118E9A51F295963003EF9F5 /* StorageProcessMessageReceiver.cpp */; };
>+		5118E9A91F295977003EF9F5 /* StorageProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 5118E9A61F295963003EF9F5 /* StorageProcessMessages.h */; };
>+		5118E9AA1F295977003EF9F5 /* StorageProcessProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5118E9A71F295963003EF9F5 /* StorageProcessProxyMessageReceiver.cpp */; };
>+		5118E9AB1F295977003EF9F5 /* StorageProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 5118E9A21F295963003EF9F5 /* StorageProcessProxyMessages.h */; };
>+		5118E9AC1F295977003EF9F5 /* StorageToWebProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5118E9A31F295963003EF9F5 /* StorageToWebProcessConnectionMessageReceiver.cpp */; };
>+		5118E9AD1F295977003EF9F5 /* StorageToWebProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 5118E9A41F295963003EF9F5 /* StorageToWebProcessConnectionMessages.h */; };
> 		511F7D411EB1BCF500E47B83 /* WebsiteDataStoreParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F7D401EB1BCEE00E47B83 /* WebsiteDataStoreParameters.h */; };
> 		511F7D421EB1BCF800E47B83 /* WebsiteDataStoreParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511F7D3F1EB1BCEE00E47B83 /* WebsiteDataStoreParameters.cpp */; };
> 		511F8A7B138B460900A95F44 /* SecItemShimLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F8A77138B460900A95F44 /* SecItemShimLibrary.h */; };
>@@ -954,10 +960,6 @@
> 		512935D81288D19400A4B695 /* WebContextMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 512935D61288D19400A4B695 /* WebContextMenuItem.h */; };
> 		512935E31288D97800A4B695 /* InjectedBundlePageContextMenuClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512935E11288D97800A4B695 /* InjectedBundlePageContextMenuClient.cpp */; };
> 		512935E41288D97800A4B695 /* InjectedBundlePageContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 512935E21288D97800A4B695 /* InjectedBundlePageContextMenuClient.h */; };
>-		512A9760180E031D0039A149 /* DatabaseProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512A975E180E03160039A149 /* DatabaseProcessMessageReceiver.cpp */; };
>-		512A9761180E031D0039A149 /* DatabaseProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 512A975F180E03160039A149 /* DatabaseProcessMessages.h */; };
>-		512A9769180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512A9767180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp */; };
>-		512A976A180E09B80039A149 /* DatabaseProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 512A9768180E09B80039A149 /* DatabaseProcessProxyMessages.h */; };
> 		512E34E4130B4D0500ABD19A /* WKApplicationCacheManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */; };
> 		512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		512F589612A8838800629530 /* AuthenticationChallengeProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512F588E12A8838800629530 /* AuthenticationChallengeProxy.cpp */; };
>@@ -1003,8 +1005,6 @@
> 		515BE1B71D5A94FD00DD7C68 /* UIGamepadProviderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 515BE1B61D5A94F900DD7C68 /* UIGamepadProviderMac.mm */; };
> 		515E7727183DD6F60007203F /* AsyncRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E7725183DD6F60007203F /* AsyncRequest.cpp */; };
> 		515E7728183DD6F60007203F /* AsyncRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E7726183DD6F60007203F /* AsyncRequest.h */; };
>-		515E772B184008B90007203F /* DatabaseProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E7729184008B90007203F /* DatabaseProcessCreationParameters.cpp */; };
>-		515E772C184008B90007203F /* DatabaseProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E772A184008B90007203F /* DatabaseProcessCreationParameters.h */; };
> 		5160BFE113381DF900918999 /* LoggingFoundation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160BFE013381DF900918999 /* LoggingFoundation.mm */; };
> 		516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */; };
> 		5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACC9341628064800342550 /* NetworkProcessMessageReceiver.cpp */; };
>@@ -1017,8 +1017,8 @@
> 		5179556E162877B300FA43B6 /* NetworkProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 510CC7EB16138E7200D03ED3 /* NetworkProcessProxy.h */; };
> 		517CF0E3163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */; };
> 		517CF0E4163A486C00C2950E /* NetworkProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */; };
>-		517DD5BE180DA7D30081660B /* DatabaseProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517DD5BC180DA7D30081660B /* DatabaseProcessProxy.cpp */; };
>-		517DD5BF180DA7D30081660B /* DatabaseProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 517DD5BD180DA7D30081660B /* DatabaseProcessProxy.h */; };
>+		517DD5BE180DA7D30081660B /* StorageProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517DD5BC180DA7D30081660B /* StorageProcessProxy.cpp */; };
>+		517DD5BF180DA7D30081660B /* StorageProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 517DD5BD180DA7D30081660B /* StorageProcessProxy.h */; };
> 		5183DDEC1630BDFC008BE5C7 /* NetworkProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5105B0D4162F7A7A00E27709 /* NetworkProcessConnection.cpp */; };
> 		51871B5B127CB89D00F76232 /* WebContextMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51871B59127CB89D00F76232 /* WebContextMenu.cpp */; };
> 		51871B5C127CB89D00F76232 /* WebContextMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 51871B5A127CB89D00F76232 /* WebContextMenu.h */; };
>@@ -1074,10 +1074,10 @@
> 		51DD9F2916367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51DD9F2716367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h */; };
> 		51E351CA180F2CCC00E53BE9 /* IDBUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E351C8180F2CCC00E53BE9 /* IDBUtilities.cpp */; };
> 		51E351CB180F2CCC00E53BE9 /* IDBUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E351C9180F2CCC00E53BE9 /* IDBUtilities.h */; };
>-		51E351FF180F5D0F00E53BE9 /* DatabaseProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E351FA180F5D0B00E53BE9 /* DatabaseProcess.cpp */; };
>-		51E35200180F5D0F00E53BE9 /* DatabaseToWebProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E351FD180F5D0B00E53BE9 /* DatabaseToWebProcessConnection.cpp */; };
>-		51E35202180F5D1E00E53BE9 /* DatabaseProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35201180F5D1E00E53BE9 /* DatabaseProcessMac.mm */; };
>-		51E35209180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */; };
>+		51E351FF180F5D0F00E53BE9 /* StorageProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E351FA180F5D0B00E53BE9 /* StorageProcess.cpp */; };
>+		51E35200180F5D0F00E53BE9 /* StorageToWebProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E351FD180F5D0B00E53BE9 /* StorageToWebProcessConnection.cpp */; };
>+		51E35202180F5D1E00E53BE9 /* StorageProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35201180F5D1E00E53BE9 /* StorageProcessMac.mm */; };
>+		51E35209180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35208180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm */; };
> 		51E399061D6F54C7009C8831 /* UIGamepadProviderCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E399051D6F54C5009C8831 /* UIGamepadProviderCocoa.mm */; };
> 		51E6C1601F29356000FD3437 /* ResourceLoadStatisticsPersistentStorageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E6C15F1F29355100FD3437 /* ResourceLoadStatisticsPersistentStorageIOS.mm */; };
> 		51E6C1631F2935D800FD3437 /* ResourceLoadStatisticsPersistentStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E6C1621F2935CD00FD3437 /* ResourceLoadStatisticsPersistentStorage.cpp */; };
>@@ -1952,7 +1952,7 @@
> 		D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */; };
> 		DF58C6361371ACA000F9A37C /* NativeWebWheelEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */; };
> 		E105FE5418D7B9DE008F57A8 /* EditingRange.h in Headers */ = {isa = PBXBuildFile; fileRef = E105FE5318D7B9DE008F57A8 /* EditingRange.h */; };
>-		E115C714190F89E400ECC516 /* DatabaseProcessIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1FEF39C190F791C00731658 /* DatabaseProcessIOS.mm */; };
>+		E115C714190F89E400ECC516 /* StorageProcessIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1FEF39C190F791C00731658 /* StorageProcessIOS.mm */; };
> 		E115C716190F8A2500ECC516 /* com.apple.WebKit.Databases.sb in Resources */ = {isa = PBXBuildFile; fileRef = E115C715190F8A2500ECC516 /* com.apple.WebKit.Databases.sb */; };
> 		E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */; };
> 		E14A954916E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14A954716E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp */; };
>@@ -3145,11 +3145,7 @@
> 		4F601430155C5A32001FBDE0 /* BlockingResponseMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlockingResponseMap.h; sourceTree = "<group>"; };
> 		510031F61379CACB00C8DFE4 /* SecItemShim.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = SecItemShim.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
> 		51021E9B12B16788005C033C /* WebContextMenuClientMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMenuClientMac.mm; sourceTree = "<group>"; };
>-		51032F16180F73BB00961BB7 /* WebToDatabaseProcessConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebToDatabaseProcessConnection.cpp; sourceTree = "<group>"; };
>-		51032F17180F73BB00961BB7 /* WebToDatabaseProcessConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebToDatabaseProcessConnection.h; sourceTree = "<group>"; };
>-		51032F1A180F74F100961BB7 /* DatabaseToWebProcessConnection.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = DatabaseToWebProcessConnection.messages.in; sourceTree = "<group>"; };
>-		51032F1B180F791700961BB7 /* DatabaseToWebProcessConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseToWebProcessConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
>-		51032F1C180F791700961BB7 /* DatabaseToWebProcessConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseToWebProcessConnectionMessages.h; sourceTree = "<group>"; };
>+		51032F1A180F74F100961BB7 /* StorageToWebProcessConnection.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageToWebProcessConnection.messages.in; sourceTree = "<group>"; };
> 		5104F5A11F19D7CF004CF821 /* CookieStorageUtilsCF.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CookieStorageUtilsCF.mm; sourceTree = "<group>"; };
> 		5105236D1C7393E9007993CB /* WebIDBConnectionToClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIDBConnectionToClient.cpp; sourceTree = "<group>"; };
> 		5105236E1C7393E9007993CB /* WebIDBConnectionToClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIDBConnectionToClient.h; sourceTree = "<group>"; };
>@@ -3175,6 +3171,16 @@
> 		510FBB991288C95E00AFFDF4 /* WebContextMenuItemData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMenuItemData.h; sourceTree = "<group>"; };
> 		5110AE0A133C16CB0072717A /* WKIconDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKIconDatabase.cpp; sourceTree = "<group>"; };
> 		5110AE0B133C16CB0072717A /* WKIconDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKIconDatabase.h; sourceTree = "<group>"; };
>+		5118E9991F295259003EF9F5 /* WebToStorageProcessConnection.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebToStorageProcessConnection.cpp; sourceTree = "<group>"; };
>+		5118E99A1F295259003EF9F5 /* WebToStorageProcessConnection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebToStorageProcessConnection.h; sourceTree = "<group>"; };
>+		5118E99E1F29531F003EF9F5 /* StorageProcessCreationParameters.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StorageProcessCreationParameters.cpp; sourceTree = "<group>"; };
>+		5118E99F1F29531F003EF9F5 /* StorageProcessCreationParameters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StorageProcessCreationParameters.h; sourceTree = "<group>"; };
>+		5118E9A21F295963003EF9F5 /* StorageProcessProxyMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StorageProcessProxyMessages.h; sourceTree = "<group>"; };
>+		5118E9A31F295963003EF9F5 /* StorageToWebProcessConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StorageToWebProcessConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
>+		5118E9A41F295963003EF9F5 /* StorageToWebProcessConnectionMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StorageToWebProcessConnectionMessages.h; sourceTree = "<group>"; };
>+		5118E9A51F295963003EF9F5 /* StorageProcessMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StorageProcessMessageReceiver.cpp; sourceTree = "<group>"; };
>+		5118E9A61F295963003EF9F5 /* StorageProcessMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StorageProcessMessages.h; sourceTree = "<group>"; };
>+		5118E9A71F295963003EF9F5 /* StorageProcessProxyMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StorageProcessProxyMessageReceiver.cpp; sourceTree = "<group>"; };
> 		511F7D3F1EB1BCEE00E47B83 /* WebsiteDataStoreParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebsiteDataStoreParameters.cpp; sourceTree = "<group>"; };
> 		511F7D401EB1BCEE00E47B83 /* WebsiteDataStoreParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsiteDataStoreParameters.h; sourceTree = "<group>"; };
> 		511F8A77138B460900A95F44 /* SecItemShimLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecItemShimLibrary.h; path = ../../WebProcess/mac/SecItemShimLibrary.h; sourceTree = "<group>"; };
>@@ -3192,11 +3198,7 @@
> 		512935D61288D19400A4B695 /* WebContextMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMenuItem.h; sourceTree = "<group>"; };
> 		512935E11288D97800A4B695 /* InjectedBundlePageContextMenuClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageContextMenuClient.cpp; sourceTree = "<group>"; };
> 		512935E21288D97800A4B695 /* InjectedBundlePageContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageContextMenuClient.h; sourceTree = "<group>"; };
>-		512A975E180E03160039A149 /* DatabaseProcessMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseProcessMessageReceiver.cpp; sourceTree = "<group>"; };
>-		512A975F180E03160039A149 /* DatabaseProcessMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DatabaseProcessMessages.h; sourceTree = "<group>"; };
>-		512A9766180E05D20039A149 /* DatabaseProcessProxy.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = DatabaseProcessProxy.messages.in; path = Databases/DatabaseProcessProxy.messages.in; sourceTree = "<group>"; };
>-		512A9767180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseProcessProxyMessageReceiver.cpp; sourceTree = "<group>"; };
>-		512A9768180E09B80039A149 /* DatabaseProcessProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseProcessProxyMessages.h; sourceTree = "<group>"; };
>+		512A9766180E05D20039A149 /* StorageProcessProxy.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageProcessProxy.messages.in; sourceTree = "<group>"; };
> 		512F588E12A8838800629530 /* AuthenticationChallengeProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationChallengeProxy.cpp; sourceTree = "<group>"; };
> 		512F588F12A8838800629530 /* AuthenticationChallengeProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeProxy.h; sourceTree = "<group>"; };
> 		512F589012A8838800629530 /* AuthenticationDecisionListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationDecisionListener.cpp; sourceTree = "<group>"; };
>@@ -3243,8 +3245,6 @@
> 		515BE1B61D5A94F900DD7C68 /* UIGamepadProviderMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = UIGamepadProviderMac.mm; path = UIProcess/Gamepad/mac/UIGamepadProviderMac.mm; sourceTree = SOURCE_ROOT; };
> 		515E7725183DD6F60007203F /* AsyncRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncRequest.cpp; sourceTree = "<group>"; };
> 		515E7726183DD6F60007203F /* AsyncRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncRequest.h; sourceTree = "<group>"; };
>-		515E7729184008B90007203F /* DatabaseProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseProcessCreationParameters.cpp; sourceTree = "<group>"; };
>-		515E772A184008B90007203F /* DatabaseProcessCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseProcessCreationParameters.h; sourceTree = "<group>"; };
> 		5160BFE013381DF900918999 /* LoggingFoundation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoggingFoundation.mm; sourceTree = "<group>"; };
> 		516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessProxyMac.mm; path = mac/NetworkProcessProxyMac.mm; sourceTree = "<group>"; };
> 		5164C0941B05B757004F102A /* ChildProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChildProcess.messages.in; sourceTree = "<group>"; };
>@@ -3253,8 +3253,8 @@
> 		517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKApplicationCacheManager.h; sourceTree = "<group>"; };
> 		517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkProcessConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
> 		517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkProcessConnectionMessages.h; sourceTree = "<group>"; };
>-		517DD5BC180DA7D30081660B /* DatabaseProcessProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseProcessProxy.cpp; path = Databases/DatabaseProcessProxy.cpp; sourceTree = "<group>"; };
>-		517DD5BD180DA7D30081660B /* DatabaseProcessProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseProcessProxy.h; path = Databases/DatabaseProcessProxy.h; sourceTree = "<group>"; };
>+		517DD5BC180DA7D30081660B /* StorageProcessProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageProcessProxy.cpp; sourceTree = "<group>"; };
>+		517DD5BD180DA7D30081660B /* StorageProcessProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageProcessProxy.h; sourceTree = "<group>"; };
> 		5183B3931379F85C00E8754E /* Shim.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shim.xcconfig; sourceTree = "<group>"; };
> 		51871B59127CB89D00F76232 /* WebContextMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContextMenu.cpp; sourceTree = "<group>"; };
> 		51871B5A127CB89D00F76232 /* WebContextMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMenu.h; sourceTree = "<group>"; };
>@@ -3333,14 +3333,14 @@
> 		51DD9F2716367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkConnectionToWebProcessMessages.h; sourceTree = "<group>"; };
> 		51E351C8180F2CCC00E53BE9 /* IDBUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBUtilities.cpp; sourceTree = "<group>"; };
> 		51E351C9180F2CCC00E53BE9 /* IDBUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBUtilities.h; sourceTree = "<group>"; };
>-		51E351FA180F5D0B00E53BE9 /* DatabaseProcess.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseProcess.cpp; sourceTree = "<group>"; };
>-		51E351FB180F5D0B00E53BE9 /* DatabaseProcess.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DatabaseProcess.h; sourceTree = "<group>"; };
>-		51E351FC180F5D0B00E53BE9 /* DatabaseProcess.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = DatabaseProcess.messages.in; sourceTree = "<group>"; };
>-		51E351FD180F5D0B00E53BE9 /* DatabaseToWebProcessConnection.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseToWebProcessConnection.cpp; sourceTree = "<group>"; };
>-		51E351FE180F5D0B00E53BE9 /* DatabaseToWebProcessConnection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DatabaseToWebProcessConnection.h; sourceTree = "<group>"; };
>-		51E35201180F5D1E00E53BE9 /* DatabaseProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DatabaseProcessMac.mm; sourceTree = "<group>"; };
>+		51E351FA180F5D0B00E53BE9 /* StorageProcess.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StorageProcess.cpp; sourceTree = "<group>"; };
>+		51E351FB180F5D0B00E53BE9 /* StorageProcess.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StorageProcess.h; sourceTree = "<group>"; };
>+		51E351FC180F5D0B00E53BE9 /* StorageProcess.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageProcess.messages.in; sourceTree = "<group>"; };
>+		51E351FD180F5D0B00E53BE9 /* StorageToWebProcessConnection.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StorageToWebProcessConnection.cpp; sourceTree = "<group>"; };
>+		51E351FE180F5D0B00E53BE9 /* StorageToWebProcessConnection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StorageToWebProcessConnection.h; sourceTree = "<group>"; };
>+		51E35201180F5D1E00E53BE9 /* StorageProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StorageProcessMac.mm; sourceTree = "<group>"; };
> 		51E35207180F5D6100E53BE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
>-		51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DatabaseServiceEntryPoint.mm; sourceTree = "<group>"; };
>+		51E35208180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StorageServiceEntryPoint.mm; sourceTree = "<group>"; };
> 		51E399051D6F54C5009C8831 /* UIGamepadProviderCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIGamepadProviderCocoa.mm; sourceTree = "<group>"; };
> 		51E6C15F1F29355100FD3437 /* ResourceLoadStatisticsPersistentStorageIOS.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = ResourceLoadStatisticsPersistentStorageIOS.mm; path = ios/ResourceLoadStatisticsPersistentStorageIOS.mm; sourceTree = "<group>"; };
> 		51E6C1611F2935CD00FD3437 /* ResourceLoadStatisticsPersistentStorage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ResourceLoadStatisticsPersistentStorage.h; sourceTree = "<group>"; };
>@@ -4338,7 +4338,7 @@
> 		E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageEditorClient.h; sourceTree = "<group>"; };
> 		E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageEditorClient.cpp; sourceTree = "<group>"; };
> 		E1FEF39A190F76F300731658 /* com.apple.WebKit.Databases.sb.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Databases.sb.in; sourceTree = "<group>"; };
>-		E1FEF39C190F791C00731658 /* DatabaseProcessIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DatabaseProcessIOS.mm; sourceTree = "<group>"; };
>+		E1FEF39C190F791C00731658 /* StorageProcessIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StorageProcessIOS.mm; sourceTree = "<group>"; };
> 		E413F59B1AC1ADB600345360 /* NetworkCacheEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheEntry.h; sourceTree = "<group>"; };
> 		E413F59E1AC1AF9D00345360 /* NetworkCacheEntry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheEntry.cpp; sourceTree = "<group>"; };
> 		E42E060B1AA7440D00B11699 /* NetworkCacheIOChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheIOChannel.h; sourceTree = "<group>"; };
>@@ -4495,7 +4495,7 @@
> 				1AADDF4B10D82AF000D3D63D /* Shared */,
> 				BC032DC310F438260058C15A /* UIProcess */,
> 				BC032D5C10F436D50058C15A /* WebProcess */,
>-				51F7DC0A180CC41100212CA3 /* DatabaseProcess */,
>+				51F7DC0A180CC41100212CA3 /* StorageProcess */,
> 				510CC7DA16138E0100D03ED3 /* NetworkProcess */,
> 				1A0EC6B0124BBD36007EF4A5 /* PluginProcess */,
> 				C0CE729D1247E71D00BC0EC4 /* Derived Sources */,
>@@ -4891,6 +4891,7 @@
> 				BC111B5A112F628200337BAB /* mac */,
> 				1AAE058C1279DCD400852418 /* Plugins */,
> 				0F5947A0187B3B7100437857 /* Scrolling */,
>+				5118E99D1F29531F003EF9F5 /* Storage */,
> 				1ABF43781A368035003FB0E6 /* WebsiteData */,
> 				A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */,
> 				A7D792D41767CB0900881CBE /* ActivityAssertion.h */,
>@@ -5163,7 +5164,6 @@
> 		1ABC3DF21899E415004F0626 /* Cocoa */ = {
> 			isa = PBXGroup;
> 			children = (
>-				517DD5BB180DA7C40081660B /* Databases */,
> 				99C81D551C20DFBE005C4C82 /* AutomationClient.h */,
> 				99C81D561C20DFBE005C4C82 /* AutomationClient.mm */,
> 				990D28B71C6539A000986977 /* AutomationSessionClient.h */,
>@@ -5985,6 +5985,24 @@
> 			path = Network;
> 			sourceTree = "<group>";
> 		};
>+		5118E9981F295259003EF9F5 /* Storage */ = {
>+			isa = PBXGroup;
>+			children = (
>+				5118E9991F295259003EF9F5 /* WebToStorageProcessConnection.cpp */,
>+				5118E99A1F295259003EF9F5 /* WebToStorageProcessConnection.h */,
>+			);
>+			path = Storage;
>+			sourceTree = "<group>";
>+		};
>+		5118E99D1F29531F003EF9F5 /* Storage */ = {
>+			isa = PBXGroup;
>+			children = (
>+				5118E99E1F29531F003EF9F5 /* StorageProcessCreationParameters.cpp */,
>+				5118E99F1F29531F003EF9F5 /* StorageProcessCreationParameters.h */,
>+			);
>+			path = Storage;
>+			sourceTree = "<group>";
>+		};
> 		511F8EDA180881660047DA96 /* IndexedDB */ = {
> 			isa = PBXGroup;
> 			children = (
>@@ -6018,8 +6036,6 @@
> 				511F8EDA180881660047DA96 /* IndexedDB */,
> 				1AA83F6A1A5B63FF00026EC6 /* WebDatabaseProvider.cpp */,
> 				1AA83F6B1A5B63FF00026EC6 /* WebDatabaseProvider.h */,
>-				51032F16180F73BB00961BB7 /* WebToDatabaseProcessConnection.cpp */,
>-				51032F17180F73BB00961BB7 /* WebToDatabaseProcessConnection.h */,
> 			);
> 			path = Databases;
> 			sourceTree = "<group>";
>@@ -6090,22 +6106,21 @@
> 			name = mac;
> 			sourceTree = "<group>";
> 		};
>-		517DD5BB180DA7C40081660B /* Databases */ = {
>+		517DD5BB180DA7C40081660B /* Storage */ = {
> 			isa = PBXGroup;
> 			children = (
>-				517DD5BC180DA7D30081660B /* DatabaseProcessProxy.cpp */,
>-				517DD5BD180DA7D30081660B /* DatabaseProcessProxy.h */,
>-				512A9766180E05D20039A149 /* DatabaseProcessProxy.messages.in */,
>+				517DD5BC180DA7D30081660B /* StorageProcessProxy.cpp */,
>+				517DD5BD180DA7D30081660B /* StorageProcessProxy.h */,
>+				512A9766180E05D20039A149 /* StorageProcessProxy.messages.in */,
> 			);
>-			name = Databases;
>-			path = ..;
>+			path = Storage;
> 			sourceTree = "<group>";
> 		};
> 		517DD5C0180DB7AA0081660B /* mac */ = {
> 			isa = PBXGroup;
> 			children = (
> 				E1FEF39A190F76F300731658 /* com.apple.WebKit.Databases.sb.in */,
>-				51E35201180F5D1E00E53BE9 /* DatabaseProcessMac.mm */,
>+				51E35201180F5D1E00E53BE9 /* StorageProcessMac.mm */,
> 			);
> 			path = mac;
> 			sourceTree = "<group>";
>@@ -6144,8 +6159,6 @@
> 			isa = PBXGroup;
> 			children = (
> 				51E351C3180F2C8A00E53BE9 /* IndexedDB */,
>-				515E7729184008B90007203F /* DatabaseProcessCreationParameters.cpp */,
>-				515E772A184008B90007203F /* DatabaseProcessCreationParameters.h */,
> 			);
> 			path = Databases;
> 			sourceTree = "<group>";
>@@ -6187,21 +6200,21 @@
> 			path = ios;
> 			sourceTree = "<group>";
> 		};
>-		51F7DC0A180CC41100212CA3 /* DatabaseProcess */ = {
>+		51F7DC0A180CC41100212CA3 /* StorageProcess */ = {
> 			isa = PBXGroup;
> 			children = (
> 				51F7DC0B180CC42200212CA3 /* EntryPoint */,
> 				51E351F9180F5CF600E53BE9 /* IndexedDB */,
> 				E1FEF39B190F791C00731658 /* ios */,
> 				517DD5C0180DB7AA0081660B /* mac */,
>-				51E351FA180F5D0B00E53BE9 /* DatabaseProcess.cpp */,
>-				51E351FB180F5D0B00E53BE9 /* DatabaseProcess.h */,
>-				51E351FC180F5D0B00E53BE9 /* DatabaseProcess.messages.in */,
>-				51E351FD180F5D0B00E53BE9 /* DatabaseToWebProcessConnection.cpp */,
>-				51E351FE180F5D0B00E53BE9 /* DatabaseToWebProcessConnection.h */,
>-				51032F1A180F74F100961BB7 /* DatabaseToWebProcessConnection.messages.in */,
>+				51E351FA180F5D0B00E53BE9 /* StorageProcess.cpp */,
>+				51E351FB180F5D0B00E53BE9 /* StorageProcess.h */,
>+				51E351FC180F5D0B00E53BE9 /* StorageProcess.messages.in */,
>+				51E351FD180F5D0B00E53BE9 /* StorageToWebProcessConnection.cpp */,
>+				51E351FE180F5D0B00E53BE9 /* StorageToWebProcessConnection.h */,
>+				51032F1A180F74F100961BB7 /* StorageToWebProcessConnection.messages.in */,
> 			);
>-			path = DatabaseProcess;
>+			path = StorageProcess;
> 			sourceTree = "<group>";
> 		};
> 		51F7DC0B180CC42200212CA3 /* EntryPoint */ = {
>@@ -6215,19 +6228,19 @@
> 		51F7DC0C180CC43100212CA3 /* XPCService */ = {
> 			isa = PBXGroup;
> 			children = (
>-				51F7DC0D180CC43800212CA3 /* DatabaseService */,
>-				51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */,
>+				51F7DC0D180CC43800212CA3 /* StorageService */,
>+				51E35208180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm */,
> 			);
> 			name = XPCService;
> 			path = mac/XPCService;
> 			sourceTree = "<group>";
> 		};
>-		51F7DC0D180CC43800212CA3 /* DatabaseService */ = {
>+		51F7DC0D180CC43800212CA3 /* StorageService */ = {
> 			isa = PBXGroup;
> 			children = (
> 				51E35207180F5D6100E53BE9 /* Info.plist */,
> 			);
>-			path = DatabaseService;
>+			path = StorageService;
> 			sourceTree = "<group>";
> 		};
> 		539BD5B21DADB0BA00F2E4E1 /* capture */ = {
>@@ -6537,6 +6550,7 @@
> 				31099974146C8AA80029DEB9 /* Notifications (User) */,
> 				1A6FB7AA11E64B4900DB1371 /* Plugins */,
> 				0F59478C187B3B2A00437857 /* Scrolling */,
>+				5118E9981F295259003EF9F5 /* Storage */,
> 				1AAF08AA1926930B00B6390C /* UserContent */,
> 				BC032D5D10F437220058C15A /* WebCoreSupport */,
> 				BC032D5E10F4372B0058C15A /* WebPage */,
>@@ -6687,6 +6701,7 @@
> 				31A2EC401489973700810D71 /* Notifications */,
> 				1AEFCC0511D01F34008219D3 /* Plugins */,
> 				0F594793187B3B4C00437857 /* Scrolling */,
>+				517DD5BB180DA7C40081660B /* Storage */,
> 				1AAF089E192681AC00B6390C /* UserContent */,
> 				1A44B95816B73F8C00B7BBD8 /* WebStorage */,
> 				1A53C2A31A325691004E8C70 /* WebsiteData */,
>@@ -7743,12 +7758,6 @@
> 				E17AE2C216B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb */,
> 				7A1506721DD56298001F4B58 /* com.apple.WebKit.plugin-common.sb */,
> 				E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */,
>-				512A975E180E03160039A149 /* DatabaseProcessMessageReceiver.cpp */,
>-				512A975F180E03160039A149 /* DatabaseProcessMessages.h */,
>-				512A9767180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp */,
>-				512A9768180E09B80039A149 /* DatabaseProcessProxyMessages.h */,
>-				51032F1B180F791700961BB7 /* DatabaseToWebProcessConnectionMessageReceiver.cpp */,
>-				51032F1C180F791700961BB7 /* DatabaseToWebProcessConnectionMessages.h */,
> 				1AB7D6171288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp */,
> 				1AB7D6181288B9D900CFD08C /* DownloadProxyMessages.h */,
> 				1A64229712DD029200CAAE2C /* DrawingAreaMessageReceiver.cpp */,
>@@ -7807,6 +7816,12 @@
> 				1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */,
> 				1AB31A9416BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp */,
> 				1AB31A9516BC688100F6DBC9 /* StorageManagerMessages.h */,
>+				5118E9A51F295963003EF9F5 /* StorageProcessMessageReceiver.cpp */,
>+				5118E9A61F295963003EF9F5 /* StorageProcessMessages.h */,
>+				5118E9A71F295963003EF9F5 /* StorageProcessProxyMessageReceiver.cpp */,
>+				5118E9A21F295963003EF9F5 /* StorageProcessProxyMessages.h */,
>+				5118E9A31F295963003EF9F5 /* StorageToWebProcessConnectionMessageReceiver.cpp */,
>+				5118E9A41F295963003EF9F5 /* StorageToWebProcessConnectionMessages.h */,
> 				CD491B0B1E732E4D00009066 /* UserMediaCaptureManagerMessageReceiver.cpp */,
> 				CD491B0C1E732E4D00009066 /* UserMediaCaptureManagerMessages.h */,
> 				CD491B151E73525500009066 /* UserMediaCaptureManagerProxyMessageReceiver.cpp */,
>@@ -8035,7 +8050,7 @@
> 		E1FEF39B190F791C00731658 /* ios */ = {
> 			isa = PBXGroup;
> 			children = (
>-				E1FEF39C190F791C00731658 /* DatabaseProcessIOS.mm */,
>+				E1FEF39C190F791C00731658 /* StorageProcessIOS.mm */,
> 			);
> 			path = ios;
> 			sourceTree = "<group>";
>@@ -8286,11 +8301,7 @@
> 				CE1A0BD31A48E6C60054EF74 /* CorePDFSPI.h in Headers */,
> 				37C21CAE1E994C0C0029D5F9 /* CorePredictionSPI.h in Headers */,
> 				B878B615133428DC006888E9 /* CorrectionPanel.h in Headers */,
>-				515E772C184008B90007203F /* DatabaseProcessCreationParameters.h in Headers */,
>-				512A9761180E031D0039A149 /* DatabaseProcessMessages.h in Headers */,
>-				517DD5BF180DA7D30081660B /* DatabaseProcessProxy.h in Headers */,
>-				512A976A180E09B80039A149 /* DatabaseProcessProxyMessages.h in Headers */,
>-				51032F1E180F791700961BB7 /* DatabaseToWebProcessConnectionMessages.h in Headers */,
>+				517DD5BF180DA7D30081660B /* StorageProcessProxy.h in Headers */,
> 				C55F91711C59676E0029E92D /* DataDetectionResult.h in Headers */,
> 				1AC75380183BE50F0072CB15 /* DataReference.h in Headers */,
> 				BC032DA610F437D10058C15A /* Decoder.h in Headers */,
>@@ -8391,6 +8402,7 @@
> 				1AAB037A185A7C6A00EDF501 /* MessageSender.h in Headers */,
> 				C0E3AA7C1209E83C00A49D01 /* Module.h in Headers */,
> 				2D50366B1BCDE17900E20BB3 /* NativeWebGestureEvent.h in Headers */,
>+				5118E99C1F295266003EF9F5 /* WebToStorageProcessConnection.h in Headers */,
> 				263172CF18B469490065B9C3 /* NativeWebTouchEvent.h in Headers */,
> 				1ADCB86B189831B30022EE5A /* NavigationActionData.h in Headers */,
> 				1ABC3DF61899E437004F0626 /* NavigationState.h in Headers */,
>@@ -8416,6 +8428,7 @@
> 				5302583F1DCBBD2200DA89C2 /* NetworkCaptureLogging.h in Headers */,
> 				530258411DCBBD2200DA89C2 /* NetworkCaptureManager.h in Headers */,
> 				530258431DCBBD2200DA89C2 /* NetworkCaptureRecorder.h in Headers */,
>+				5118E9A91F295977003EF9F5 /* StorageProcessMessages.h in Headers */,
> 				530258451DCBBD2200DA89C2 /* NetworkCaptureReplayer.h in Headers */,
> 				5302583C1DCBBD2200DA89C2 /* NetworkCaptureResource.h in Headers */,
> 				513A164D1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h in Headers */,
>@@ -8613,6 +8626,7 @@
> 				3F87B9BE158940190090FF62 /* WebColorChooser.h in Headers */,
> 				3F87B9C0158940D80090FF62 /* WebColorPicker.h in Headers */,
> 				728E86F11795188C0087879E /* WebColorPickerMac.h in Headers */,
>+				5118E9AB1F295977003EF9F5 /* StorageProcessProxyMessages.h in Headers */,
> 				7C4ABED11AA8E9F00088AA37 /* WebCompiledContentRuleList.h in Headers */,
> 				7C4ABED51AA8FCB80088AA37 /* WebCompiledContentRuleListData.h in Headers */,
> 				BC4A6290147312BE006C681A /* WebConnection.h in Headers */,
>@@ -8732,6 +8746,7 @@
> 				31D5929F166E060000E6BF02 /* WebPlugInClient.h in Headers */,
> 				BC5744F012638FB3006F0F12 /* WebPopupItem.h in Headers */,
> 				D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */,
>+				5118E9A11F295326003EF9F5 /* StorageProcessCreationParameters.h in Headers */,
> 				BC574E631267D080006F0F12 /* WebPopupMenuProxy.h in Headers */,
> 				BC5750971268F3C6006F0F12 /* WebPopupMenuProxyMac.h in Headers */,
> 				BCD597FF112B57BE00EC8C23 /* WebPreferences.h in Headers */,
>@@ -8772,7 +8787,6 @@
> 				836034A01ACB34D600626549 /* WebSQLiteDatabaseTracker.h in Headers */,
> 				1A52C0F81A38CDC70016160A /* WebStorageNamespaceProvider.h in Headers */,
> 				BCC5715B115ADAEF001CCAF9 /* WebSystemInterface.h in Headers */,
>-				51032F19180F73BB00961BB7 /* WebToDatabaseProcessConnection.h in Headers */,
> 				BCA0EF7F12331E78007D3CFB /* WebUndoStep.h in Headers */,
> 				1AAF08AE1926936700B6390C /* WebUserContentController.h in Headers */,
> 				7C065F2C1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h in Headers */,
>@@ -8922,6 +8936,7 @@
> 				BC06F44E12DBDF3F002D78DE /* WKGeolocationPermissionRequest.h in Headers */,
> 				BC0E619812D6CD120012A72A /* WKGeolocationPosition.h in Headers */,
> 				0FCB4E4F18BBE044000FCFC9 /* WKGeolocationProviderIOS.h in Headers */,
>+				5118E9AD1F295977003EF9F5 /* StorageToWebProcessConnectionMessages.h in Headers */,
> 				BCC8B374125FB69000DE46A4 /* WKGeometry.h in Headers */,
> 				1A422F8B18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h in Headers */,
> 				B62E7312143047B00069EC35 /* WKHitTestResult.h in Headers */,
>@@ -9830,16 +9845,12 @@
> 				CDC3831017212440008A2FC3 /* CookieStorageShim.mm in Sources */,
> 				5104F5A21F19D7D2004CF821 /* CookieStorageUtilsCF.mm in Sources */,
> 				B878B616133428DC006888E9 /* CorrectionPanel.mm in Sources */,
>-				51E351FF180F5D0F00E53BE9 /* DatabaseProcess.cpp in Sources */,
>-				515E772B184008B90007203F /* DatabaseProcessCreationParameters.cpp in Sources */,
>-				E115C714190F89E400ECC516 /* DatabaseProcessIOS.mm in Sources */,
>-				51E35202180F5D1E00E53BE9 /* DatabaseProcessMac.mm in Sources */,
>-				512A9760180E031D0039A149 /* DatabaseProcessMessageReceiver.cpp in Sources */,
>-				517DD5BE180DA7D30081660B /* DatabaseProcessProxy.cpp in Sources */,
>-				512A9769180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp in Sources */,
>-				51E35209180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm in Sources */,
>-				51E35200180F5D0F00E53BE9 /* DatabaseToWebProcessConnection.cpp in Sources */,
>-				51032F1D180F791700961BB7 /* DatabaseToWebProcessConnectionMessageReceiver.cpp in Sources */,
>+				51E351FF180F5D0F00E53BE9 /* StorageProcess.cpp in Sources */,
>+				E115C714190F89E400ECC516 /* StorageProcessIOS.mm in Sources */,
>+				51E35202180F5D1E00E53BE9 /* StorageProcessMac.mm in Sources */,
>+				517DD5BE180DA7D30081660B /* StorageProcessProxy.cpp in Sources */,
>+				51E35209180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm in Sources */,
>+				51E35200180F5D0F00E53BE9 /* StorageToWebProcessConnection.cpp in Sources */,
> 				C55F91701C595F630029E92D /* DataDetectionResult.mm in Sources */,
> 				1AC7537F183BE50F0072CB15 /* DataReference.cpp in Sources */,
> 				BC032DA510F437D10058C15A /* Decoder.cpp in Sources */,
>@@ -10003,6 +10014,7 @@
> 				532159531DBAE7180054AA3C /* NetworkSession.cpp in Sources */,
> 				5C20CB9D1BB0DCFA00895BB1 /* NetworkSessionCocoa.mm in Sources */,
> 				5C0B17811E7C8C2600E9123C /* NetworkSocketStream.cpp in Sources */,
>+				5118E99B1F295266003EF9F5 /* WebToStorageProcessConnection.cpp in Sources */,
> 				5C0B17781E7C880E00E9123C /* NetworkSocketStreamMessageReceiver.cpp in Sources */,
> 				31A2EC551489982E00810D71 /* NotificationPermissionRequest.cpp in Sources */,
> 				3131261E148FF82C00BA2A39 /* NotificationPermissionRequestManager.cpp in Sources */,
>@@ -10111,6 +10123,7 @@
> 				51D130531382EAC000351EDD /* SecItemRequestData.cpp in Sources */,
> 				51D130551382EAC000351EDD /* SecItemResponseData.cpp in Sources */,
> 				E179088D169BAA62006904C7 /* SecItemShim.cpp in Sources */,
>+				5118E9A01F295326003EF9F5 /* StorageProcessCreationParameters.cpp in Sources */,
> 				E18E690B169B563F009B6670 /* SecItemShimProxy.cpp in Sources */,
> 				E18E6917169B667B009B6670 /* SecItemShimProxyMessageReceiver.cpp in Sources */,
> 				514D9F5819119D35000063A7 /* ServicesController.mm in Sources */,
>@@ -10341,6 +10354,7 @@
> 				31D5929E166E060000E6BF02 /* WebPlugInClient.cpp in Sources */,
> 				1A08FEE41D593E2A008BA8CB /* WebPluginInfoProvider.cpp in Sources */,
> 				BC5744EF12638FB3006F0F12 /* WebPopupItem.cpp in Sources */,
>+				5118E9A81F295977003EF9F5 /* StorageProcessMessageReceiver.cpp in Sources */,
> 				D3B9484611FF4B6500032B39 /* WebPopupMenu.cpp in Sources */,
> 				BCC43AC7127B99DE00317F16 /* WebPopupMenuMac.mm in Sources */,
> 				BC5750981268F3C6006F0F12 /* WebPopupMenuProxyMac.mm in Sources */,
>@@ -10384,6 +10398,7 @@
> 				7C361D721927FA360036A59D /* WebScriptMessageHandler.cpp in Sources */,
> 				D3B9484811FF4B6500032B39 /* WebSearchPopupMenu.cpp in Sources */,
> 				1A4832D61A9CDF96008B4DFE /* WebsiteData.cpp in Sources */,
>+				5118E9AA1F295977003EF9F5 /* StorageProcessProxyMessageReceiver.cpp in Sources */,
> 				1A4832D91A9D1FD2008B4DFE /* WebsiteDataRecord.cpp in Sources */,
> 				1A53C2A91A32572B004E8C70 /* WebsiteDataStore.cpp in Sources */,
> 				1A4832C31A965A3C008B4DFE /* WebsiteDataStoreCocoa.mm in Sources */,
>@@ -10394,7 +10409,6 @@
> 				8360349F1ACB34D600626549 /* WebSQLiteDatabaseTracker.cpp in Sources */,
> 				1A52C0F71A38CDC70016160A /* WebStorageNamespaceProvider.cpp in Sources */,
> 				BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.mm in Sources */,
>-				51032F18180F73BB00961BB7 /* WebToDatabaseProcessConnection.cpp in Sources */,
> 				C0337DD8127A51B6008FF4F4 /* WebTouchEvent.cpp in Sources */,
> 				2DA944A31884E4F000ED86DB /* WebTouchEventIOS.cpp in Sources */,
> 				BCA0EF8012331E78007D3CFB /* WebUndoStep.cpp in Sources */,
>@@ -10573,6 +10587,7 @@
> 				1A7E377818E4A4FE003D0FFF /* WKScriptMessage.mm in Sources */,
> 				0FCB4E5518BBE044000FCFC9 /* WKScrollView.mm in Sources */,
> 				51CD1C661B34B9DC00142CA5 /* WKSecurityOrigin.mm in Sources */,
>+				5118E9AC1F295977003EF9F5 /* StorageToWebProcessConnectionMessageReceiver.cpp in Sources */,
> 				51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */,
> 				BC407603124FF0270068F20A /* WKSerializedScriptValue.cpp in Sources */,
> 				1ADE46B21954EC61000F7985 /* WKSessionStateRef.cpp in Sources */,
>diff --git a/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp b/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp
>index d113cb204a1..54c2d289105 100644
>--- a/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp
>+++ b/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp
>@@ -29,14 +29,14 @@
> #if ENABLE(INDEXED_DATABASE)
> 
> #include "DataReference.h"
>-#include "DatabaseToWebProcessConnectionMessages.h"
> #include "NetworkConnectionToWebProcessMessages.h"
> #include "NetworkProcessConnection.h"
>+#include "StorageToWebProcessConnectionMessages.h"
> #include "WebCoreArgumentCoders.h"
> #include "WebIDBConnectionToClientMessages.h"
> #include "WebIDBResult.h"
> #include "WebProcess.h"
>-#include "WebToDatabaseProcessConnection.h"
>+#include "WebToStorageProcessConnection.h"
> #include <WebCore/IDBConnectionToServer.h>
> #include <WebCore/IDBCursorInfo.h>
> #include <WebCore/IDBError.h>
>@@ -65,14 +65,14 @@ WebIDBConnectionToServer::WebIDBConnectionToServer(SessionID sessionID)
> {
>     relaxAdoptionRequirement();
> 
>-    m_isOpenInServer = sendSync(Messages::DatabaseToWebProcessConnection::EstablishIDBConnectionToServer(sessionID), Messages::DatabaseToWebProcessConnection::EstablishIDBConnectionToServer::Reply(m_identifier));
>+    m_isOpenInServer = sendSync(Messages::StorageToWebProcessConnection::EstablishIDBConnectionToServer(sessionID), Messages::StorageToWebProcessConnection::EstablishIDBConnectionToServer::Reply(m_identifier));
>     m_connectionToServer = IDBClient::IDBConnectionToServer::create(*this);
> }
> 
> WebIDBConnectionToServer::~WebIDBConnectionToServer()
> {
>     if (m_isOpenInServer)
>-        send(Messages::DatabaseToWebProcessConnection::RemoveIDBConnectionToServer(m_identifier));
>+        send(Messages::StorageToWebProcessConnection::RemoveIDBConnectionToServer(m_identifier));
> }
> 
> IPC::Connection* WebIDBConnectionToServer::messageSenderConnection()
>diff --git a/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp b/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp
>index ae5591b6c02..5cf7fd2b325 100644
>--- a/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp
>+++ b/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp
>@@ -27,7 +27,7 @@
> #include "WebDatabaseProvider.h"
> 
> #include "WebProcess.h"
>-#include "WebToDatabaseProcessConnection.h"
>+#include "WebToStorageProcessConnection.h"
> #include <WebCore/SessionID.h>
> #include <wtf/HashMap.h>
> #include <wtf/NeverDestroyed.h>
>diff --git a/Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.cpp b/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.cpp
>similarity index 97%
>rename from Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.cpp
>rename to Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.cpp
>index ece33d632ff..00121853efd 100644
>--- a/Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.cpp
>+++ b/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.cpp
>@@ -25,9 +25,9 @@
>  */
> 
> #include "config.h"
>-#include "WebToDatabaseProcessConnection.h"
>+#include "WebToStorageProcessConnection.h"
> 
>-#include "DatabaseToWebProcessConnectionMessages.h"
>+#include "StorageToWebProcessConnectionMessages.h"
> #include "WebIDBConnectionToServerMessages.h"
> #include "WebProcess.h"
> 
>diff --git a/Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.h b/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.h
>similarity index 100%
>rename from Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.h
>rename to Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.h
>diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp
>index 258ffe8b62d..d0130fdc387 100644
>--- a/Source/WebKit/WebProcess/WebProcess.cpp
>+++ b/Source/WebKit/WebProcess/WebProcess.cpp
>@@ -64,7 +64,7 @@
> #include "WebProcessProxyMessages.h"
> #include "WebResourceLoadStatisticsStoreMessages.h"
> #include "WebSocketStream.h"
>-#include "WebToDatabaseProcessConnection.h"
>+#include "WebToStorageProcessConnection.h"
> #include "WebsiteData.h"
> #include "WebsiteDataType.h"
> #include <JavaScriptCore/JSLock.h>
>diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
>index 983dc366cbe..d18a89e2cdd 100644
>--- a/Source/cmake/OptionsWPE.cmake
>+++ b/Source/cmake/OptionsWPE.cmake
>@@ -55,7 +55,7 @@ set(WebCore_LIBRARY_TYPE STATIC)
> set(WebKit2_OUTPUT_NAME WPEWebKit)
> set(WebKit2_WebProcess_OUTPUT_NAME WPEWebProcess)
> set(WebKit2_NetworkProcess_OUTPUT_NAME WPENetworkProcess)
>-set(WebKit2_DatabaseProcess_OUTPUT_NAME WPEDatabaseProcess)
>+set(WebKit2_StorageProcess_OUTPUT_NAME WPEStorageProcess)
> 
> find_package(ICU REQUIRED)
> find_package(Threads REQUIRED)
>diff --git a/Source/cmake/gtksymbols.filter b/Source/cmake/gtksymbols.filter
>index 5e8cc29f666..938cff4fb7a 100644
>--- a/Source/cmake/gtksymbols.filter
>+++ b/Source/cmake/gtksymbols.filter
>@@ -4,7 +4,7 @@ global:
>   WebProcessMainUnix;
>   NetworkProcessMainUnix;
>   PluginProcessMainUnix;
>-  DatabaseProcessMainUnix;
>+  StorageProcessMainUnix;
>   _ZN6WebKit22WebKitExtensionManager10initializeEPNS_14InjectedBundleEPN3API6ObjectE;
>   _ZN6WebKit22WebKitExtensionManager9singletonEv;
> local:

Actions: View | Formatted Diff | Diff

Attachments on bug 174879: 316498 | 316501 | 316502 | 316506 | 316508 | 316509 | 316510 | 316511 | 316512 | 316519 | 316521 | 316523 | 316528 | 316561 | 316564 | 316566 | 316567 | 316573 | 316797 | 316799 | 316801 | 316802 | 316806 | 316812 | 316818 | 316819 | 316821 | 316826 | 316829