Remove StorageProcess
authorsihui_liu@apple.com <sihui_liu@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Oct 2018 20:44:06 +0000 (20:44 +0000)
committersihui_liu@apple.com <sihui_liu@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Oct 2018 20:44:06 +0000 (20:44 +0000)
https://bugs.webkit.org/show_bug.cgi?id=189975

Reviewed by Geoffrey Garen.

Source/WebCore:

Clean up code. No behavior change.

* English.lproj/Localizable.strings:

Source/WebKit:

* CMakeLists.txt:
* Configurations/Storage-OSX-sandbox.entitlements: Removed.
* Configurations/StorageService.xcconfig: Removed.
* Configurations/WebKit.xcconfig:
* DerivedSources.make:
* NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp:
(WebKit::WebIDBConnectionToClient::putOrAdd):
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::establishIDBConnectionToServer):
* PlatformGTK.cmake:
* PlatformMac.cmake:
* PlatformWPE.cmake:
* PlatformWin.cmake:
* Shared/ProcessExecutablePath.h:
* Shared/Storage/StorageProcessCreationParameters.cpp: Removed.
* Shared/Storage/StorageProcessCreationParameters.h: Removed.
* Shared/glib/ProcessExecutablePathGLib.cpp:
(WebKit::executablePathOfStorageProcess): Deleted.
* Sources.txt:
* SourcesCocoa.txt:
* SourcesGTK.txt:
* SourcesWPE.txt:
* StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist: Removed.
* StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm: Removed.
* StorageProcess/EntryPoint/unix/StorageProcessMain.cpp: Removed.
* StorageProcess/EntryPoint/win/StorageProcessMain.cpp: Removed.
* StorageProcess/StorageProcess.cpp: Removed.
* StorageProcess/StorageProcess.h: Removed.
* StorageProcess/StorageProcess.messages.in: Removed.
* StorageProcess/StorageToWebProcessConnection.cpp: Removed.
* StorageProcess/StorageToWebProcessConnection.h: Removed.
* StorageProcess/StorageToWebProcessConnection.messages.in: Removed.
* StorageProcess/glib/StorageProcessMainGLib.cpp: Removed.
* StorageProcess/ios/StorageProcessIOS.mm: Removed.
* StorageProcess/mac/StorageProcessMac.mm: Removed.
* StorageProcess/mac/com.apple.WebKit.Storage.sb.in: Removed.
* StorageProcess/unix/StorageProcessMainUnix.h: Removed.
* StorageProcess/win/StorageProcessMainWin.cpp: Removed.
* StorageProcess/win/StorageProcessMainWin.h: Removed.
* UIProcess/API/C/WKContext.cpp:
(WKContextTerminateStorageProcess): Deleted.
(WKContextGetDatabaseProcessIdentifier): Deleted.
* UIProcess/API/C/WKContext.h:
* UIProcess/API/C/WKContextPrivate.h:
* UIProcess/API/Cocoa/WKProcessPool.mm:
(-[WKProcessPool _terminateStorageProcess]): Deleted.
(-[WKProcessPool _storageProcessIdentifier]): Deleted.
* UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
* UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
(WebKit::ProcessLauncher::launchProcess):
* UIProcess/Launcher/win/ProcessLauncherWin.cpp:
(WebKit::processName):
* UIProcess/Storage/StorageProcessProxy.cpp: Removed.
* UIProcess/Storage/StorageProcessProxy.h: Removed.
* UIProcess/Storage/StorageProcessProxy.messages.in: Removed.
* UIProcess/WebContextClient.cpp:
(WebKit::WebContextClient::storageProcessDidCrash): Deleted.
* UIProcess/WebContextClient.h:
* UIProcess/WebContextSupplement.h:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::sendMemoryPressureEvent):
(WebKit::WebProcessPool::setAnyPageGroupMightHavePrivateBrowsingEnabled):
(WebKit::WebProcessPool::ensureStorageProcessAndWebsiteDataStore): Deleted.
(WebKit::WebProcessPool::getStorageProcessConnection): Deleted.
(WebKit::WebProcessPool::storageProcessCrashed): Deleted.
(WebKit::WebProcessPool::storageProcessIdentifier): Deleted.
(WebKit::WebProcessPool::terminateStorageProcessForTesting): Deleted.
* UIProcess/WebProcessPool.h:
(WebKit::WebProcessPool::sendToStorageProcess): Deleted.
(WebKit::WebProcessPool::sendToStorageProcessRelaunchingIfNecessary): Deleted.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::getStorageProcessConnection): Deleted.
* UIProcess/WebProcessProxy.h:
* UIProcess/WebProcessProxy.messages.in:
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::~WebsiteDataStore):
(WebKit::WebsiteDataStore::storageProcessParameters): Deleted.
* UIProcess/WebsiteData/WebsiteDataStore.h:
* WebKit.xcodeproj/project.pbxproj:
* WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
* WebProcess/Storage/WebServiceWorkerProvider.cpp:
* WebProcess/Storage/WebToStorageProcessConnection.cpp: Removed.
* WebProcess/Storage/WebToStorageProcessConnection.h: Removed.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::establishWorkerContextConnectionToNetworkProcess):
(WebKit::WebProcess::webToStorageProcessConnectionClosed): Deleted.
(WebKit::WebProcess::ensureWebToStorageProcessConnection): Deleted.
* WebProcess/WebProcess.h:
* webkitglib-symbols.map:

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm:
(TEST):
* TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:
* TestWebKitAPI/Tests/WebKitCocoa/WebProcessKillIDBCleanup.mm:
(TEST):
* TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm:
(TEST):
* WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::terminateStorageProcess): Deleted.
* WebKitTestRunner/InjectedBundle/TestRunner.h:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::generatePageConfiguration):
(WTR::TestController::databaseProcessName): Deleted.
(WTR::TestController::databaseProcessDidCrash): Deleted.
(WTR::TestController::terminateStorageProcess): Deleted.
* WebKitTestRunner/TestController.h:
* WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):

LayoutTests:

Since Service Worker management is in netowrk process now, we should terminate network
process instead of storage process.

* http/wpt/service-workers/persistent-importScripts.html:

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

80 files changed:
LayoutTests/ChangeLog
LayoutTests/http/wpt/service-workers/persistent-importScripts.html
Source/WebCore/ChangeLog
Source/WebCore/English.lproj/Localizable.strings
Source/WebKit/CMakeLists.txt
Source/WebKit/ChangeLog
Source/WebKit/Configurations/Storage-OSX-sandbox.entitlements [deleted file]
Source/WebKit/Configurations/StorageService.xcconfig [deleted file]
Source/WebKit/Configurations/WebKit.xcconfig
Source/WebKit/DerivedSources.make
Source/WebKit/NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp
Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
Source/WebKit/PlatformGTK.cmake
Source/WebKit/PlatformMac.cmake
Source/WebKit/PlatformWPE.cmake
Source/WebKit/PlatformWin.cmake
Source/WebKit/Shared/ProcessExecutablePath.h
Source/WebKit/Shared/Storage/StorageProcessCreationParameters.cpp [deleted file]
Source/WebKit/Shared/Storage/StorageProcessCreationParameters.h [deleted file]
Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp
Source/WebKit/Sources.txt
Source/WebKit/SourcesCocoa.txt
Source/WebKit/SourcesGTK.txt
Source/WebKit/SourcesWPE.txt
Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist [deleted file]
Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm [deleted file]
Source/WebKit/StorageProcess/EntryPoint/unix/StorageProcessMain.cpp [deleted file]
Source/WebKit/StorageProcess/EntryPoint/win/StorageProcessMain.cpp [deleted file]
Source/WebKit/StorageProcess/StorageProcess.cpp [deleted file]
Source/WebKit/StorageProcess/StorageProcess.h [deleted file]
Source/WebKit/StorageProcess/StorageProcess.messages.in [deleted file]
Source/WebKit/StorageProcess/StorageToWebProcessConnection.cpp [deleted file]
Source/WebKit/StorageProcess/StorageToWebProcessConnection.h [deleted file]
Source/WebKit/StorageProcess/StorageToWebProcessConnection.messages.in [deleted file]
Source/WebKit/StorageProcess/glib/StorageProcessMainGLib.cpp [deleted file]
Source/WebKit/StorageProcess/ios/StorageProcessIOS.mm [deleted file]
Source/WebKit/StorageProcess/mac/StorageProcessMac.mm [deleted file]
Source/WebKit/StorageProcess/mac/com.apple.WebKit.Storage.sb.in [deleted file]
Source/WebKit/StorageProcess/unix/StorageProcessMainUnix.h [deleted file]
Source/WebKit/StorageProcess/win/StorageProcessMainWin.cpp [deleted file]
Source/WebKit/StorageProcess/win/StorageProcessMainWin.h [deleted file]
Source/WebKit/UIProcess/API/C/WKContext.cpp
Source/WebKit/UIProcess/API/C/WKContext.h
Source/WebKit/UIProcess/API/C/WKContextPrivate.h
Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h
Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp
Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp [deleted file]
Source/WebKit/UIProcess/Storage/StorageProcessProxy.h [deleted file]
Source/WebKit/UIProcess/Storage/StorageProcessProxy.messages.in [deleted file]
Source/WebKit/UIProcess/WebContextClient.cpp
Source/WebKit/UIProcess/WebContextClient.h
Source/WebKit/UIProcess/WebContextSupplement.h
Source/WebKit/UIProcess/WebProcessPool.cpp
Source/WebKit/UIProcess/WebProcessPool.h
Source/WebKit/UIProcess/WebProcessProxy.cpp
Source/WebKit/UIProcess/WebProcessProxy.h
Source/WebKit/UIProcess/WebProcessProxy.messages.in
Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
Source/WebKit/WebKit.xcodeproj/project.pbxproj
Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h
Source/WebKit/WebProcess/Storage/WebServiceWorkerProvider.cpp
Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.cpp [deleted file]
Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.h [deleted file]
Source/WebKit/WebProcess/WebProcess.cpp
Source/WebKit/WebProcess/WebProcess.h
Source/WebKit/webkitglib-symbols.map
Tools/ChangeLog
Tools/TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/WebProcessKillIDBCleanup.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm
Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
Tools/WebKitTestRunner/TestController.cpp
Tools/WebKitTestRunner/TestController.h
Tools/WebKitTestRunner/TestInvocation.cpp

index 31e0ccd..7488376 100644 (file)
@@ -1,3 +1,15 @@
+2018-10-01  Sihui Liu  <sihui_liu@apple.com>
+
+        Remove StorageProcess
+        https://bugs.webkit.org/show_bug.cgi?id=189975
+
+        Reviewed by Geoffrey Garen.
+
+        Since Service Worker management is in netowrk process now, we should terminate network 
+        process instead of storage process.
+
+        * http/wpt/service-workers/persistent-importScripts.html:
+
 2018-10-01  Jiewen Tan  <jiewen_tan@apple.com>
 
         [WebAuthN] Import a JS CBOR coder
index bc616b1..08a9a59 100644 (file)
@@ -37,7 +37,7 @@ async function doTest() {
 
     if (!window.location.hash.length) {
         if (window.testRunner)
-            testRunner.terminateStorageProcess();
+            testRunner.terminateNetworkProcess();
         await waitFor(100);
         window.location += "?test#" + randomId;
         return;
index 8f5d6a6..80f497a 100644 (file)
@@ -1,3 +1,14 @@
+2018-10-01  Sihui Liu  <sihui_liu@apple.com>
+
+        Remove StorageProcess
+        https://bugs.webkit.org/show_bug.cgi?id=189975
+
+        Reviewed by Geoffrey Garen.
+
+        Clean up code. No behavior change.
+
+        * English.lproj/Localizable.strings:
+
 2018-10-01  Alicia Boya GarcĂ­a  <aboya@igalia.com>
 
         [MSE][GStreamer] Set a minimum sample duration
index dc35d93..f26e96d 100644 (file)
@@ -43,9 +43,6 @@
 /* Visible name of Service Worker process. The argument is the application name. */
 "%@ Service Worker (%@)" = "%@ Service Worker (%@)";
 
-/* visible name of the storage process. The argument is the application name. */
-"%@ Storage" = "%@ Storage";
-
 /* Visible name of the web process. The argument is the application name. */
 "%@ Web Content" = "%@ Web Content";
 
index c60bde2..f161542 100644 (file)
@@ -31,9 +31,7 @@ set(WebKit_INCLUDE_DIRECTORIES
     "${WEBKIT_DIR}/Shared/Plugins/Netscape"
     "${WEBKIT_DIR}/Shared/Plugins/Netscape/x11"
     "${WEBKIT_DIR}/Shared/RemoteLayerTree"
-    "${WEBKIT_DIR}/Shared/Storage"
     "${WEBKIT_DIR}/Shared/WebsiteData"
-    "${WEBKIT_DIR}/StorageProcess"
     "${WEBKIT_DIR}/UIProcess"
     "${WEBKIT_DIR}/UIProcess/API"
     "${WEBKIT_DIR}/UIProcess/API/C"
@@ -49,7 +47,6 @@ set(WebKit_INCLUDE_DIRECTORIES
     "${WEBKIT_DIR}/UIProcess/Notifications"
     "${WEBKIT_DIR}/UIProcess/Plugins"
     "${WEBKIT_DIR}/UIProcess/RemoteLayerTree"
-    "${WEBKIT_DIR}/UIProcess/Storage"
     "${WEBKIT_DIR}/UIProcess/UserContent"
     "${WEBKIT_DIR}/UIProcess/WebAuthentication"
     "${WEBKIT_DIR}/UIProcess/WebAuthentication/Mock"
@@ -135,9 +132,6 @@ set(WebKit_MESSAGES_IN_FILES
 
     Shared/Plugins/NPObjectMessageReceiver.messages.in
 
-    StorageProcess/StorageProcess.messages.in
-    StorageProcess/StorageToWebProcessConnection.messages.in
-
     UIProcess/DrawingAreaProxy.messages.in
     UIProcess/RemoteWebInspectorProxy.messages.in
     UIProcess/VisitedLinkStore.messages.in
@@ -159,8 +153,6 @@ set(WebKit_MESSAGES_IN_FILES
 
     UIProcess/Plugins/PluginProcessProxy.messages.in
 
-    UIProcess/Storage/StorageProcessProxy.messages.in
-
     UIProcess/UserContent/WebUserContentControllerProxy.messages.in
 
     UIProcess/WebStorage/StorageManager.messages.in
@@ -229,10 +221,6 @@ set(NetworkProcess_LIBRARIES
     WebKit
 )
 
-set(StorageProcess_LIBRARIES
-    WebKit
-)
-
 set(PluginProcess_LIBRARIES
     WebKit
 )
@@ -452,20 +440,10 @@ if (WebKit_NetworkProcess_OUTPUT_NAME)
     set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit_NetworkProcess_OUTPUT_NAME})
 endif ()
 
-add_executable(StorageProcess ${StorageProcess_SOURCES})
-ADD_WEBKIT_PREFIX_HEADER(StorageProcess)
-target_link_libraries(StorageProcess ${StorageProcess_LIBRARIES})
-install(TARGETS StorageProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
-
-if (WebKit_StorageProcess_OUTPUT_NAME)
-    set_target_properties(StorageProcess PROPERTIES OUTPUT_NAME ${WebKit_StorageProcess_OUTPUT_NAME})
-endif ()
-
 if (COMPILER_IS_GCC_OR_CLANG)
     WEBKIT_ADD_TARGET_CXX_FLAGS(WebKit -Wno-unused-parameter)
     WEBKIT_ADD_TARGET_CXX_FLAGS(WebProcess -Wno-unused-parameter)
     WEBKIT_ADD_TARGET_CXX_FLAGS(NetworkProcess -Wno-unused-parameter)
-    WEBKIT_ADD_TARGET_CXX_FLAGS(StorageProcess -Wno-unused-parameter)
 endif ()
 
 # FIXME: Mac should build a plugin process.
index 4220e50..c832406 100644 (file)
@@ -1,3 +1,100 @@
+2018-10-01  Sihui Liu  <sihui_liu@apple.com>
+
+        Remove StorageProcess
+        https://bugs.webkit.org/show_bug.cgi?id=189975
+
+        Reviewed by Geoffrey Garen.
+
+        * CMakeLists.txt:
+        * Configurations/Storage-OSX-sandbox.entitlements: Removed.
+        * Configurations/StorageService.xcconfig: Removed.
+        * Configurations/WebKit.xcconfig:
+        * DerivedSources.make:
+        * NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp:
+        (WebKit::WebIDBConnectionToClient::putOrAdd):
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        (WebKit::NetworkConnectionToWebProcess::establishIDBConnectionToServer):
+        * PlatformGTK.cmake:
+        * PlatformMac.cmake:
+        * PlatformWPE.cmake:
+        * PlatformWin.cmake:
+        * Shared/ProcessExecutablePath.h:
+        * Shared/Storage/StorageProcessCreationParameters.cpp: Removed.
+        * Shared/Storage/StorageProcessCreationParameters.h: Removed.
+        * Shared/glib/ProcessExecutablePathGLib.cpp:
+        (WebKit::executablePathOfStorageProcess): Deleted.
+        * Sources.txt:
+        * SourcesCocoa.txt:
+        * SourcesGTK.txt:
+        * SourcesWPE.txt:
+        * StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist: Removed.
+        * StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm: Removed.
+        * StorageProcess/EntryPoint/unix/StorageProcessMain.cpp: Removed.
+        * StorageProcess/EntryPoint/win/StorageProcessMain.cpp: Removed.
+        * StorageProcess/StorageProcess.cpp: Removed.
+        * StorageProcess/StorageProcess.h: Removed.
+        * StorageProcess/StorageProcess.messages.in: Removed.
+        * StorageProcess/StorageToWebProcessConnection.cpp: Removed.
+        * StorageProcess/StorageToWebProcessConnection.h: Removed.
+        * StorageProcess/StorageToWebProcessConnection.messages.in: Removed.
+        * StorageProcess/glib/StorageProcessMainGLib.cpp: Removed.
+        * StorageProcess/ios/StorageProcessIOS.mm: Removed.
+        * StorageProcess/mac/StorageProcessMac.mm: Removed.
+        * StorageProcess/mac/com.apple.WebKit.Storage.sb.in: Removed.
+        * StorageProcess/unix/StorageProcessMainUnix.h: Removed.
+        * StorageProcess/win/StorageProcessMainWin.cpp: Removed.
+        * StorageProcess/win/StorageProcessMainWin.h: Removed.
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextTerminateStorageProcess): Deleted.
+        (WKContextGetDatabaseProcessIdentifier): Deleted.
+        * UIProcess/API/C/WKContext.h:
+        * UIProcess/API/C/WKContextPrivate.h:
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        (-[WKProcessPool _terminateStorageProcess]): Deleted.
+        (-[WKProcessPool _storageProcessIdentifier]): Deleted.
+        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
+        * UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
+        (WebKit::ProcessLauncher::launchProcess):
+        * UIProcess/Launcher/win/ProcessLauncherWin.cpp:
+        (WebKit::processName):
+        * UIProcess/Storage/StorageProcessProxy.cpp: Removed.
+        * UIProcess/Storage/StorageProcessProxy.h: Removed.
+        * UIProcess/Storage/StorageProcessProxy.messages.in: Removed.
+        * UIProcess/WebContextClient.cpp:
+        (WebKit::WebContextClient::storageProcessDidCrash): Deleted.
+        * UIProcess/WebContextClient.h:
+        * UIProcess/WebContextSupplement.h:
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::sendMemoryPressureEvent):
+        (WebKit::WebProcessPool::setAnyPageGroupMightHavePrivateBrowsingEnabled):
+        (WebKit::WebProcessPool::ensureStorageProcessAndWebsiteDataStore): Deleted.
+        (WebKit::WebProcessPool::getStorageProcessConnection): Deleted.
+        (WebKit::WebProcessPool::storageProcessCrashed): Deleted.
+        (WebKit::WebProcessPool::storageProcessIdentifier): Deleted.
+        (WebKit::WebProcessPool::terminateStorageProcessForTesting): Deleted.
+        * UIProcess/WebProcessPool.h:
+        (WebKit::WebProcessPool::sendToStorageProcess): Deleted.
+        (WebKit::WebProcessPool::sendToStorageProcessRelaunchingIfNecessary): Deleted.
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::getStorageProcessConnection): Deleted.
+        * UIProcess/WebProcessProxy.h:
+        * UIProcess/WebProcessProxy.messages.in:
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::~WebsiteDataStore):
+        (WebKit::WebsiteDataStore::storageProcessParameters): Deleted.
+        * UIProcess/WebsiteData/WebsiteDataStore.h:
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
+        * WebProcess/Storage/WebServiceWorkerProvider.cpp:
+        * WebProcess/Storage/WebToStorageProcessConnection.cpp: Removed.
+        * WebProcess/Storage/WebToStorageProcessConnection.h: Removed.
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::establishWorkerContextConnectionToNetworkProcess):
+        (WebKit::WebProcess::webToStorageProcessConnectionClosed): Deleted.
+        (WebKit::WebProcess::ensureWebToStorageProcessConnection): Deleted.
+        * WebProcess/WebProcess.h:
+        * webkitglib-symbols.map:
+
 2018-10-01  David Quesada  <david_quesada@apple.com>
 
         Add missing Objective-C versions of downloads SPI
diff --git a/Source/WebKit/Configurations/Storage-OSX-sandbox.entitlements b/Source/WebKit/Configurations/Storage-OSX-sandbox.entitlements
deleted file mode 100644 (file)
index bbb392e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>com.apple.rootless.storage.WebKitStorageSandbox</key>
-       <true/>
-</dict>
-</plist>
diff --git a/Source/WebKit/Configurations/StorageService.xcconfig b/Source/WebKit/Configurations/StorageService.xcconfig
deleted file mode 100644 (file)
index 5d51209..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (C) 2013-2016 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-//    notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-
-#include "BaseXPCService.xcconfig"
-
-WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Databases-iOS;
-
-WK_STORAGE_ENTITLEMENTS_RESTRICTED_NO = ;
-WK_STORAGE_ENTITLEMENTS_RESTRICTED_YES = Configurations/Storage-OSX-sandbox.entitlements;
-
-CODE_SIGN_ENTITLEMENTS_COCOA_TOUCH_NO = $(WK_STORAGE_ENTITLEMENTS_RESTRICTED_$(WK_USE_RESTRICTED_ENTITLEMENTS));
-OTHER_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS);
-
-PRODUCT_NAME = $(WK_STORAGE_SERVICE_PRODUCT_NAME);
-PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
-INFOPLIST_FILE = StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist;
index 10c6b26..25c9e6e 100644 (file)
@@ -146,7 +146,7 @@ SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInte
 SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order;
 
 EXCLUDED_SOURCE_FILE_NAMES = Resources/ios/*;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.Storage.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb com.apple.WebKit.plugin-common.sb PlugInSandboxProfiles/*.sb;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb com.apple.WebKit.plugin-common.sb PlugInSandboxProfiles/*.sb;
 
 INSTALLHDRS_SCRIPT_PHASE = YES;
 
index ad1ab61..4dfb170 100644 (file)
@@ -37,8 +37,6 @@ VPATH = \
     $(WebKit2)/Shared/API/Cocoa \
     $(WebKit2)/Shared/Authentication \
     $(WebKit2)/Shared/mac \
-    $(WebKit2)/StorageProcess \
-    $(WebKit2)/StorageProcess/mac \
     $(WebKit2)/WebProcess/ApplePay \
     $(WebKit2)/WebProcess/ApplicationCache \
     $(WebKit2)/WebProcess/Automation \
@@ -133,9 +131,6 @@ MESSAGE_RECEIVERS = \
     SmartMagnificationController \
     StorageAreaMap \
     StorageManager \
-    StorageProcess \
-    StorageProcessProxy \
-    StorageToWebProcessConnection \
     UserMediaCaptureManager \
     UserMediaCaptureManagerProxy \
     ViewGestureController \
@@ -231,7 +226,6 @@ endif
 
 SANDBOX_PROFILES = \
        com.apple.WebProcess.sb \
-       com.apple.WebKit.Storage.sb \
        com.apple.WebKit.plugin-common.sb \
        com.apple.WebKit.NetworkProcess.sb
 
index beff2f7..4dd954e 100644 (file)
@@ -287,7 +287,7 @@ void WebIDBConnectionToClient::putOrAdd(const IDBRequestData& request, const IDB
         && overwriteMode != static_cast<unsigned>(IndexedDB::ObjectStoreOverwriteMode::Overwrite)
         && overwriteMode != static_cast<unsigned>(IndexedDB::ObjectStoreOverwriteMode::OverwriteForCursor)) {
         // FIXME: This message from the WebProcess is corrupt.
-        // The StorageProcess should return early at this point, but can we also kill the bad WebProcess?
+        // The Network Process should return early at this point, but can we also kill the bad WebProcess?
         return;
     }
 
index 05ac450..4705498 100644 (file)
@@ -732,7 +732,7 @@ static uint64_t generateIDBConnectionToServerIdentifier()
 void NetworkConnectionToWebProcess::establishIDBConnectionToServer(PAL::SessionID sessionID, uint64_t& serverConnectionIdentifier)
 {
     serverConnectionIdentifier = generateIDBConnectionToServerIdentifier();
-    LOG(IndexedDB, "StorageToWebProcessConnection::establishIDBConnectionToServer - %" PRIu64, serverConnectionIdentifier);
+    LOG(IndexedDB, "NetworkConnectionToWebProcess::establishIDBConnectionToServer - %" PRIu64, serverConnectionIdentifier);
     ASSERT(!m_webIDBConnections.contains(serverConnectionIdentifier));
     
     m_webIDBConnections.set(serverConnectionIdentifier, WebIDBConnectionToClient::create(*this, serverConnectionIdentifier, sessionID));
index e36e4c3..46cc037 100644 (file)
@@ -4,7 +4,6 @@ set(WebKit_OUTPUT_NAME webkit2gtk-${WEBKITGTK_API_VERSION})
 set(WebKit_WebProcess_OUTPUT_NAME WebKitWebProcess)
 set(WebKit_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
 set(WebKit_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
-set(WebKit_StorageProcess_OUTPUT_NAME WebKitStorageProcess)
 
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR})
 file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_DIR})
@@ -385,7 +384,6 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES
     "${WEBKIT_DIR}/Shared/linux"
     "${WEBKIT_DIR}/Shared/soup"
     "${WEBKIT_DIR}/Shared/unix"
-    "${WEBKIT_DIR}/StorageProcess/unix"
     "${WEBKIT_DIR}/UIProcess/API/C/cairo"
     "${WEBKIT_DIR}/UIProcess/API/C/gtk"
     "${WEBKIT_DIR}/UIProcess/API/glib"
@@ -445,10 +443,6 @@ list(APPEND NetworkProcess_SOURCES
     NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
 )
 
-list(APPEND StorageProcess_SOURCES
-    StorageProcess/EntryPoint/unix/StorageProcessMain.cpp
-)
-
 set(SharedWebKitLibraries
     ${WebKit_LIBRARIES}
 )
index d11a901..1c7fb26 100644 (file)
@@ -160,8 +160,6 @@ list(APPEND WebKit_SOURCES
     Shared/mac/WebHitTestResultData.mm
     Shared/mac/WebMemorySampler.mac.mm
 
-    StorageProcess/mac/StorageProcessMac.mm
-
     UIProcess/HighPerformanceGraphicsUsageSampler.cpp
     UIProcess/PerActivityStateCPUUsageSampler.cpp
     UIProcess/WebResourceLoadStatisticsStore.cpp
@@ -454,15 +452,9 @@ list(APPEND NetworkProcess_SOURCES
     ${XPCService_SOURCES}
 )
 
-list(APPEND StorageProcess_SOURCES
-    StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm
-    ${XPCService_SOURCES}
-)
-
 # FIXME: These should not have Development in production builds.
 set(WebKit_WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development)
 set(WebKit_NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development)
-set(WebKit_StorageProcess_OUTPUT_NAME com.apple.WebKit.Storage.Development)
 
 add_definitions("-include WebKit2Prefix.h")
 
@@ -789,11 +781,6 @@ function(WEBKIT_DEFINE_XPC_SERVICES)
         ${WEBKIT_DIR}/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist
         ${WebKit_NetworkProcess_OUTPUT_NAME})
 
-    WEBKIT_XPC_SERVICE(StorageProcess
-        "com.apple.WebKit.Storage"
-        ${WEBKIT_DIR}/StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist
-        ${WebKit_StorageProcess_OUTPUT_NAME})
-
     add_custom_target(WebContentProcessNib COMMAND
         ibtool --compile ${WebKit_XPC_SERVICE_DIR}/com.apple.WebKit.WebContent.xpc/Contents/Resources/WebContentProcess.nib ${WEBKIT_DIR}/Resources/WebContentProcess.xib
         VERBATIM)
index 0f4f024..b90e8c0 100644 (file)
@@ -3,7 +3,6 @@ include(InspectorGResources.cmake)
 set(WebKit_OUTPUT_NAME WPEWebKit-${WPE_API_VERSION})
 set(WebKit_WebProcess_OUTPUT_NAME WPEWebProcess)
 set(WebKit_NetworkProcess_OUTPUT_NAME WPENetworkProcess)
-set(WebKit_StorageProcess_OUTPUT_NAME WPEStorageProcess)
 
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WPE_API_DIR})
 file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_DIR})
@@ -71,10 +70,6 @@ list(APPEND NetworkProcess_SOURCES
     NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
 )
 
-list(APPEND StorageProcess_SOURCES
-    StorageProcess/EntryPoint/unix/StorageProcessMain.cpp
-)
-
 list(APPEND WebKit_UNIFIED_SOURCE_LIST_FILES
     "SourcesWPE.txt"
 )
@@ -249,7 +244,6 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES
     "${WEBKIT_DIR}/Shared/soup"
     "${WEBKIT_DIR}/Shared/unix"
     "${WEBKIT_DIR}/Shared/wpe"
-    "${WEBKIT_DIR}/StorageProcess/unix"
     "${WEBKIT_DIR}/UIProcess/API/C/cairo"
     "${WEBKIT_DIR}/UIProcess/API/C/wpe"
     "${WEBKIT_DIR}/UIProcess/API/glib"
index 5c99d5a..3aeb6a4 100644 (file)
@@ -2,7 +2,6 @@ set(WebKit_OUTPUT_NAME WebKit2)
 set(WebKit_WebProcess_OUTPUT_NAME WebKitWebProcess)
 set(WebKit_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
 set(WebKit_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
-set(WebKit_StorageProcess_OUTPUT_NAME WebKitStorageProcess)
 
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
 
@@ -29,8 +28,6 @@ list(APPEND WebKit_SOURCES
     Shared/win/NativeWebWheelEventWin.cpp
     Shared/win/WebEventFactory.cpp
 
-    StorageProcess/win/StorageProcessMainWin.cpp
-
     UIProcess/AcceleratedDrawingAreaProxy.cpp
     UIProcess/BackingStore.cpp
     UIProcess/DefaultUndoController.cpp
@@ -107,7 +104,6 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES
     "${WEBKIT_DIR}/Shared/Plugins/win"
     "${WEBKIT_DIR}/Shared/unix"
     "${WEBKIT_DIR}/Shared/win"
-    "${WEBKIT_DIR}/StorageProcess/win"
     "${WEBKIT_DIR}/UIProcess/API/C/cairo"
     "${WEBKIT_DIR}/UIProcess/API/C/win"
     "${WEBKIT_DIR}/UIProcess/API/cpp/win"
@@ -138,10 +134,6 @@ list(APPEND NetworkProcess_SOURCES
     NetworkProcess/EntryPoint/win/NetworkProcessMain.cpp
 )
 
-list(APPEND StorageProcess_SOURCES
-    StorageProcess/EntryPoint/win/StorageProcessMain.cpp
-)
-
 if (${ENABLE_PLUGIN_PROCESS})
     list(APPEND PluginProcess_SOURCES
     )
index b5159fb..2ce716e 100644 (file)
@@ -32,6 +32,5 @@ namespace WebKit {
 String executablePathOfWebProcess();
 String executablePathOfPluginProcess();
 String executablePathOfNetworkProcess();
-String executablePathOfStorageProcess();
 
 }
diff --git a/Source/WebKit/Shared/Storage/StorageProcessCreationParameters.cpp b/Source/WebKit/Shared/Storage/StorageProcessCreationParameters.cpp
deleted file mode 100644 (file)
index af73c61..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#include "config.h"
-#include "StorageProcessCreationParameters.h"
-
-#include "ArgumentCoders.h"
-
-namespace WebKit {
-
-StorageProcessCreationParameters::StorageProcessCreationParameters()
-{
-}
-
-void StorageProcessCreationParameters::encode(IPC::Encoder& encoder) const
-{
-    encoder << sessionID;
-}
-
-bool StorageProcessCreationParameters::decode(IPC::Decoder& decoder, StorageProcessCreationParameters& result)
-{
-    if (!decoder.decode(result.sessionID))
-        return false;
-
-    return true;
-}
-
-} // namespace WebKit
diff --git a/Source/WebKit/Shared/Storage/StorageProcessCreationParameters.h b/Source/WebKit/Shared/Storage/StorageProcessCreationParameters.h
deleted file mode 100644 (file)
index 4ef407b..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
- *
- */
-
-#pragma once
-
-#include "SandboxExtension.h"
-#include <pal/SessionID.h>
-#include <wtf/text/WTFString.h>
-
-namespace IPC {
-class Decoder;
-class Encoder;
-}
-
-namespace WebKit {
-
-struct StorageProcessCreationParameters {
-    StorageProcessCreationParameters();
-
-    void encode(IPC::Encoder&) const;
-    static bool decode(IPC::Decoder&, StorageProcessCreationParameters&);
-
-    PAL::SessionID sessionID;
-};
-
-} // namespace WebKit
index 89f1350..a70b41a 100644 (file)
@@ -92,13 +92,4 @@ String executablePathOfNetworkProcess()
 #endif
 }
 
-String executablePathOfStorageProcess()
-{
-#if PLATFORM(WPE)
-    return findWebKitProcess("WPEStorageProcess");
-#else
-    return findWebKitProcess("WebKitStorageProcess");
-#endif
-}
-
 } // namespace WebKit
index fcca3c5..102499b 100644 (file)
@@ -219,13 +219,8 @@ Shared/Plugins/PluginProcessCreationParameters.cpp @no-unify
 Shared/Plugins/Netscape/NetscapePluginModule.cpp  @no-unify
 Shared/Plugins/Netscape/PluginInformation.cpp @no-unify
 
-Shared/Storage/StorageProcessCreationParameters.cpp
-
 Shared/WebsiteData/WebsiteData.cpp
 
-StorageProcess/StorageProcess.cpp @no-unify
-StorageProcess/StorageToWebProcessConnection.cpp @no-unify
-
 UIProcess/BackgroundProcessResponsivenessTimer.cpp
 UIProcess/ChildProcessProxy.cpp
 UIProcess/DrawingAreaProxy.cpp
@@ -385,8 +380,6 @@ UIProcess/Plugins/PluginInfoStore.cpp
 UIProcess/Plugins/PluginProcessManager.cpp
 UIProcess/Plugins/PluginProcessProxy.cpp
 
-UIProcess/Storage/StorageProcessProxy.cpp
-
 UIProcess/UserContent/WebScriptMessageHandler.cpp
 UIProcess/UserContent/WebUserContentControllerProxy.cpp
 
@@ -500,7 +493,6 @@ WebProcess/Storage/WebSWContextManagerConnection.cpp
 WebProcess/Storage/WebSWOriginTable.cpp
 WebProcess/Storage/WebServiceWorkerFetchTaskClient.cpp
 WebProcess/Storage/WebServiceWorkerProvider.cpp
-WebProcess/Storage/WebToStorageProcessConnection.cpp
 
 WebProcess/UserContent/WebUserContentController.cpp
 
index b372680..76e433a 100644 (file)
@@ -194,12 +194,6 @@ Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm
 Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm
 Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
 
-StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm @no-unify
-
-StorageProcess/ios/StorageProcessIOS.mm @no-unify
-
-StorageProcess/mac/StorageProcessMac.mm @no-unify
-
 UIProcess/_WKWebViewPrintFormatter.mm
 UIProcess/ApplicationStateTracker.mm
 UIProcess/HighPerformanceGraphicsUsageSampler.cpp
index c45cafe..e138194 100644 (file)
@@ -104,8 +104,6 @@ Shared/soup/WebErrorsSoup.cpp
 
 Shared/unix/ChildProcessMain.cpp @no-unify
 
-StorageProcess/glib/StorageProcessMainGLib.cpp
-
 UIProcess/AcceleratedDrawingAreaProxy.cpp
 UIProcess/BackingStore.cpp
 UIProcess/DefaultUndoController.cpp
index f9cf371..c59f8eb 100644 (file)
@@ -95,8 +95,6 @@ Shared/wpe/NativeWebTouchEventWPE.cpp
 Shared/wpe/NativeWebWheelEventWPE.cpp
 Shared/wpe/WebEventFactory.cpp
 
-StorageProcess/glib/StorageProcessMainGLib.cpp
-
 UIProcess/AcceleratedDrawingAreaProxy.cpp
 UIProcess/BackingStore.cpp
 UIProcess/DefaultUndoController.cpp
diff --git a/Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist b/Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist
deleted file mode 100644 (file)
index 0b1f790..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleGetInfoString</key>
-       <string>${BUNDLE_VERSION}, Copyright 2003-2018 Apple Inc.</string>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>${EXECUTABLE_NAME}</string>
-       <key>CFBundleIdentifier</key>
-       <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>${PRODUCT_NAME}</string>
-       <key>CFBundlePackageType</key>
-       <string>XPC!</string>
-       <key>CFBundleShortVersionString</key>
-       <string>${SHORT_VERSION_STRING}</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>${BUNDLE_VERSION}</string>
-       <key>LSFileQuarantineEnabled</key>
-       <true/>
-       <key>WebKitEntryPoint</key>
-       <string>DatabaseServiceInitializer</string>
-       <key>LSUIElement</key>
-       <true/>
-       <key>XPCService</key>
-       <dict>
-               <key>RunLoopType</key>
-               <string>NSRunLoop</string>
-               <key>ServiceType</key>
-               <string>Application</string>
-               <key>_MultipleInstances</key>
-               <true/>
-       </dict>
-</dict>
-</plist>
diff --git a/Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm b/Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm
deleted file mode 100644 (file)
index a594bac..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#import "config.h"
-
-#import "EnvironmentUtilities.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);
-
-void DatabaseServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage)
-{
-    XPCServiceInitializer<StorageProcess, XPCServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);
-}
diff --git a/Source/WebKit/StorageProcess/EntryPoint/unix/StorageProcessMain.cpp b/Source/WebKit/StorageProcess/EntryPoint/unix/StorageProcessMain.cpp
deleted file mode 100644 (file)
index 84c2b10..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2015 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#include "config.h"
-#include "StorageProcessMainUnix.h"
-
-using namespace WebKit;
-
-int main(int argc, char** argv)
-{
-    return StorageProcessMainUnix(argc, argv);
-}
diff --git a/Source/WebKit/StorageProcess/EntryPoint/win/StorageProcessMain.cpp b/Source/WebKit/StorageProcess/EntryPoint/win/StorageProcessMain.cpp
deleted file mode 100644 (file)
index 069e111..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2017 Sony Interactive Entertainment Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#include "config.h"
-#include "StorageProcessMainWin.h"
-
-using namespace WebKit;
-
-int main(int argc, char** argv)
-{
-    return StorageProcessMainWin(argc, argv);
-}
diff --git a/Source/WebKit/StorageProcess/StorageProcess.cpp b/Source/WebKit/StorageProcess/StorageProcess.cpp
deleted file mode 100644 (file)
index 918e9b2..0000000
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#include "config.h"
-#include "StorageProcess.h"
-
-#include "ChildProcessMessages.h"
-#include "Logging.h"
-#include "StorageProcessCreationParameters.h"
-#include "StorageProcessMessages.h"
-#include "StorageProcessProxyMessages.h"
-#include "StorageToWebProcessConnection.h"
-#include "WebCoreArgumentCoders.h"
-#include "WebsiteData.h"
-#include <WebCore/FileSystem.h>
-#include <WebCore/NotImplemented.h>
-#include <WebCore/TextEncoding.h>
-#include <pal/SessionID.h>
-#include <wtf/CallbackAggregator.h>
-#include <wtf/CrossThreadTask.h>
-#include <wtf/MainThread.h>
-#include <wtf/MemoryPressureHandler.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-StorageProcess& StorageProcess::singleton()
-{
-    static NeverDestroyed<StorageProcess> process;
-    return process;
-}
-
-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();
-}
-
-StorageProcess::~StorageProcess()
-{
-}
-
-void StorageProcess::initializeConnection(IPC::Connection* connection)
-{
-    ChildProcess::initializeConnection(connection);
-}
-
-bool StorageProcess::shouldTerminate()
-{
-    return true;
-}
-
-void StorageProcess::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
-{
-    if (messageReceiverMap().dispatchMessage(connection, decoder))
-        return;
-
-    if (decoder.messageReceiverName() == Messages::StorageProcess::messageReceiverName()) {
-        didReceiveStorageProcessMessage(connection, decoder);
-        return;
-    }
-
-    if (decoder.messageReceiverName() == Messages::ChildProcess::messageReceiverName()) {
-        ChildProcess::didReceiveMessage(connection, decoder);
-        return;
-    }
-}
-
-void StorageProcess::initializeWebsiteDataStore(const StorageProcessCreationParameters& parameters)
-{
-}
-
-void StorageProcess::ensurePathExists(const String& path)
-{
-    ASSERT(!RunLoop::isMain());
-
-    if (!FileSystem::makeAllDirectories(path))
-        LOG_ERROR("Failed to make all directories for path '%s'", path.utf8().data());
-}
-
-void StorageProcess::postStorageTask(CrossThreadTask&& task)
-{
-    ASSERT(RunLoop::isMain());
-
-    LockHolder locker(m_storageTaskMutex);
-
-    m_storageTasks.append(WTFMove(task));
-
-    m_queue->dispatch([this] {
-        performNextStorageTask();
-    });
-}
-
-void StorageProcess::performNextStorageTask()
-{
-    ASSERT(!RunLoop::isMain());
-
-    CrossThreadTask task;
-    {
-        LockHolder locker(m_storageTaskMutex);
-        ASSERT(!m_storageTasks.isEmpty());
-        task = m_storageTasks.takeFirst();
-    }
-
-    task.performTask();
-}
-
-void StorageProcess::createStorageToWebProcessConnection(bool isServiceWorkerProcess, WebCore::SecurityOriginData&& securityOrigin)
-{
-#if USE(UNIX_DOMAIN_SOCKETS)
-    IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
-    m_storageToWebProcessConnections.append(StorageToWebProcessConnection::create(socketPair.server));
-    parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateStorageToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);
-#elif OS(DARWIN)
-    // Create the listening port.
-    mach_port_t listeningPort = MACH_PORT_NULL;
-    auto kr = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
-    if (kr != KERN_SUCCESS) {
-        LOG_ERROR("Could not allocate mach port, error %x", kr);
-        CRASH();
-    }
-
-    // Create a listening connection.
-    m_storageToWebProcessConnections.append(StorageToWebProcessConnection::create(IPC::Connection::Identifier(listeningPort)));
-
-    IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
-    parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateStorageToWebProcessConnection(clientPort), 0);
-#elif OS(WINDOWS)
-    IPC::Connection::Identifier serverIdentifier, clientIdentifier;
-    if (!IPC::Connection::createServerAndClientIdentifiers(serverIdentifier, clientIdentifier)) {
-        LOG_ERROR("Failed to create server and client identifiers");
-        CRASH();
-    }
-
-    auto connection = StorageToWebProcessConnection::create(serverIdentifier);
-    m_storageToWebProcessConnections.append(WTFMove(connection));
-
-    IPC::Attachment clientSocket(clientIdentifier);
-    parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateStorageToWebProcessConnection(clientSocket), 0);
-#else
-    notImplemented();
-#endif
-}
-
-void StorageProcess::destroySession(PAL::SessionID sessionID)
-{
-}
-
-void StorageProcess::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID)
-{
-    auto websiteData = std::make_unique<WebsiteData>();
-    auto callbackAggregator = CallbackAggregator::create([this, websiteData = WTFMove(websiteData), callbackID]() {
-        parentProcessConnection()->send(Messages::StorageProcessProxy::DidFetchWebsiteData(callbackID, *websiteData), 0);
-    });
-}
-
-void StorageProcess::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, WallTime modifiedSince, uint64_t callbackID)
-{
-    auto callbackAggregator = CallbackAggregator::create([this, callbackID] {
-        parentProcessConnection()->send(Messages::StorageProcessProxy::DidDeleteWebsiteData(callbackID), 0);
-    });
-}
-
-void StorageProcess::deleteWebsiteDataForOrigins(PAL::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<SecurityOriginData>& securityOrigins, uint64_t callbackID)
-{
-    auto callbackAggregator = CallbackAggregator::create([this, callbackID]() {
-        parentProcessConnection()->send(Messages::StorageProcessProxy::DidDeleteWebsiteDataForOrigins(callbackID), 0);
-    });
-}
-
-#if !PLATFORM(COCOA)
-void StorageProcess::initializeProcess(const ChildProcessInitializationParameters&)
-{
-#if OS(LINUX)
-    auto& memoryPressureHandler = MemoryPressureHandler::singleton();
-    memoryPressureHandler.setLowMemoryHandler([this] (Critical, Synchronous) {
-        // FIXME: no lowMemoryHandler() implemented for StorageProcess currently.
-        // But at least define this setLowMemoryHandler() empty so platformReleaseMemory is called.
-    });
-    memoryPressureHandler.install();
-#endif
-}
-
-void StorageProcess::initializeProcessName(const ChildProcessInitializationParameters&)
-{
-}
-
-void StorageProcess::initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&)
-{
-}
-#endif // !PLATFORM(COCOA)
-
-} // namespace WebKit
diff --git a/Source/WebKit/StorageProcess/StorageProcess.h b/Source/WebKit/StorageProcess/StorageProcess.h
deleted file mode 100644 (file)
index d6d4faa..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#pragma once
-
-#include "ChildProcess.h"
-#include <WebCore/SecurityOriginData.h>
-#include <pal/SessionID.h>
-#include <wtf/CrossThreadTask.h>
-#include <wtf/Function.h>
-
-namespace WebKit {
-
-class StorageToWebProcessConnection;
-enum class WebsiteDataType;
-struct StorageProcessCreationParameters;
-
-#if ENABLE(SERVICE_WORKER)
-class WebSWOriginStore;
-#endif
-
-class StorageProcess : public ChildProcess
-{
-    WTF_MAKE_NONCOPYABLE(StorageProcess);
-    friend NeverDestroyed<StorageProcess>;
-public:
-    static StorageProcess& singleton();
-    static constexpr ProcessType processType = ProcessType::Storage;
-
-    ~StorageProcess();
-
-    void postStorageTask(CrossThreadTask&&);
-
-    void didReceiveStorageProcessMessage(IPC::Connection&, IPC::Decoder&);
-
-private:
-    StorageProcess();
-
-    // ChildProcess
-    void initializeProcess(const ChildProcessInitializationParameters&) override;
-    void initializeProcessName(const ChildProcessInitializationParameters&) override;
-    void initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&) override;
-    void initializeConnection(IPC::Connection*) override;
-    bool shouldTerminate() override;
-
-    // IPC::Connection::Client
-    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
-
-    // Message Handlers
-    void initializeWebsiteDataStore(const StorageProcessCreationParameters&);
-    void createStorageToWebProcessConnection(bool isServiceWorkerProcess, WebCore::SecurityOriginData&&);
-
-    void destroySession(PAL::SessionID);
-    void fetchWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID);
-    void deleteWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, WallTime modifiedSince, uint64_t callbackID);
-    void deleteWebsiteDataForOrigins(PAL::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<WebCore::SecurityOriginData>& origins, uint64_t callbackID);
-
-    // For execution on work queue thread only
-    void performNextStorageTask();
-    void ensurePathExists(const String&);
-
-    Vector<Ref<StorageToWebProcessConnection>> m_storageToWebProcessConnections;
-
-    Ref<WorkQueue> m_queue;
-
-    Deque<CrossThreadTask> m_storageTasks;
-    Lock m_storageTaskMutex;
-};
-
-} // namespace WebKit
diff --git a/Source/WebKit/StorageProcess/StorageProcess.messages.in b/Source/WebKit/StorageProcess/StorageProcess.messages.in
deleted file mode 100644 (file)
index ae8cc8c..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2013 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-# 2.  Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# 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 -> 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
-    CreateStorageToWebProcessConnection(bool isServiceWorkerProcess, struct WebCore::SecurityOriginData origin)
-
-    FetchWebsiteData(PAL::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, uint64_t callbackID)
-    DeleteWebsiteData(PAL::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, WallTime modifiedSince, uint64_t callbackID)
-    DeleteWebsiteDataForOrigins(PAL::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, uint64_t callbackID)
-
-    DestroySession(PAL::SessionID sessionID)
-}
diff --git a/Source/WebKit/StorageProcess/StorageToWebProcessConnection.cpp b/Source/WebKit/StorageProcess/StorageToWebProcessConnection.cpp
deleted file mode 100644 (file)
index 6093af2..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#include "config.h"
-#include "StorageToWebProcessConnection.h"
-
-#include "Logging.h"
-#include "StorageProcess.h"
-#include "StorageProcessMessages.h"
-#include "StorageToWebProcessConnectionMessages.h"
-#include <wtf/RunLoop.h>
-
-using namespace PAL;
-using namespace WebCore;
-
-namespace WebKit {
-
-Ref<StorageToWebProcessConnection> StorageToWebProcessConnection::create(IPC::Connection::Identifier connectionIdentifier)
-{
-    return adoptRef(*new StorageToWebProcessConnection(connectionIdentifier));
-}
-
-StorageToWebProcessConnection::StorageToWebProcessConnection(IPC::Connection::Identifier connectionIdentifier)
-    : m_connection(IPC::Connection::createServerConnection(connectionIdentifier, *this))
-{
-    // Use this flag to force synchronous messages to be treated as asynchronous messages in the WebProcess.
-    // Otherwise, the WebProcess would process incoming synchronous IPC while waiting for a synchronous IPC
-    // reply from the storage process, which would be unsafe.
-    m_connection->setOnlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage(true);
-    m_connection->open();
-}
-
-StorageToWebProcessConnection::~StorageToWebProcessConnection()
-{
-    m_connection->invalidate();
-}
-
-void StorageToWebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
-{
-    if (decoder.messageReceiverName() == Messages::StorageProcess::messageReceiverName()) {
-        StorageProcess::singleton().didReceiveStorageProcessMessage(connection, decoder);
-        return;
-    }
-
-    ASSERT_NOT_REACHED();
-}
-
-void StorageToWebProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
-{
-    ASSERT_NOT_REACHED();
-}
-
-void StorageToWebProcessConnection::didClose(IPC::Connection& connection)
-{
-    UNUSED_PARAM(connection);
-}
-
-void StorageToWebProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
-{
-
-}
-
-} // namespace WebKit
diff --git a/Source/WebKit/StorageProcess/StorageToWebProcessConnection.h b/Source/WebKit/StorageProcess/StorageToWebProcessConnection.h
deleted file mode 100644 (file)
index d534bad..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#pragma once
-
-#include "Connection.h"
-#include "MessageSender.h"
-#include <pal/SessionID.h>
-#include <wtf/HashMap.h>
-
-namespace WebKit {
-
-class StorageToWebProcessConnection : public RefCounted<StorageToWebProcessConnection>, private IPC::Connection::Client, private IPC::MessageSender {
-public:
-    static Ref<StorageToWebProcessConnection> create(IPC::Connection::Identifier);
-    ~StorageToWebProcessConnection();
-
-    IPC::Connection& connection() { return m_connection.get(); }
-
-private:
-    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 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(); }
-    uint64_t messageSenderDestinationID() override { return 0; }
-
-    Ref<IPC::Connection> m_connection;
-};
-
-} // namespace WebKit
diff --git a/Source/WebKit/StorageProcess/StorageToWebProcessConnection.messages.in b/Source/WebKit/StorageProcess/StorageToWebProcessConnection.messages.in
deleted file mode 100644 (file)
index ab68477..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2013 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-# 2.  Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# 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 -> StorageToWebProcessConnection LegacyReceiver {
-}
diff --git a/Source/WebKit/StorageProcess/glib/StorageProcessMainGLib.cpp b/Source/WebKit/StorageProcess/glib/StorageProcessMainGLib.cpp
deleted file mode 100644 (file)
index bc18478..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2015 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#include "config.h"
-#include "StorageProcessMainUnix.h"
-
-#include "ChildProcessMain.h"
-#include "StorageProcess.h"
-
-namespace WebKit {
-
-int StorageProcessMainUnix(int argc, char** argv)
-{
-    return ChildProcessMain<StorageProcess, ChildProcessMainBase>(argc, argv);
-}
-
-} // namespace WebKit
diff --git a/Source/WebKit/StorageProcess/ios/StorageProcessIOS.mm b/Source/WebKit/StorageProcess/ios/StorageProcessIOS.mm
deleted file mode 100644 (file)
index 5e658a4..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#import "config.h"
-
-#if PLATFORM(IOS)
-
-#import "StorageProcess.h"
-
-#import "SandboxInitializationParameters.h"
-
-#define ENABLE_MANUAL_DATABASE_SANDBOXING 0
-
-namespace WebKit {
-
-void StorageProcess::initializeProcess(const ChildProcessInitializationParameters&)
-{
-}
-
-void StorageProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
-{
-}
-
-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.
-    NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
-    sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.Storage" ofType:@"sb"]);
-    ChildProcess::initializeSandbox(parameters, sandboxParameters);
-#endif
-}
-
-} // namespace WebKit
-
-#endif // PLATFORM(IOS)
diff --git a/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm b/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm
deleted file mode 100644 (file)
index 9be210f..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#import "config.h"
-
-#if PLATFORM(MAC)
-
-#import "StorageProcess.h"
-
-#import "SandboxInitializationParameters.h"
-#import "WKFoundation.h"
-#import <WebCore/FileSystem.h>
-#import <WebCore/LocalizedStrings.h>
-#import <pal/spi/cocoa/LaunchServicesSPI.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void StorageProcess::initializeProcess(const ChildProcessInitializationParameters&)
-{
-    // Having a window server connection in this process would result in spin logs (<rdar://problem/13239119>).
-    setApplicationIsDaemon();
-}
-
-void StorageProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
-{
-    NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Storage", "visible name of the storage process. The argument is the application name."), (NSString *)parameters.uiProcessName];
-    _LSSetApplicationInformationItem(kLSDefaultSessionID, _LSGetCurrentApplicationASN(), _kLSDisplayNameKey, (CFStringRef)applicationName, nullptr);
-}
-
-void StorageProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
-{
-    // Need to overide the default, because service has a different bundle ID.
-#if WK_API_ENABLED
-    NSBundle *webKit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
-#else
-    NSBundle *webKit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
-#endif
-    sandboxParameters.setOverrideSandboxProfilePath([webKit2Bundle pathForResource:@"com.apple.WebKit.Storage" ofType:@"sb"]);
-
-    ChildProcess::initializeSandbox(parameters, sandboxParameters);
-}
-
-} // namespace WebKit
-
-#endif // PLATFORM(MAC)
diff --git a/Source/WebKit/StorageProcess/mac/com.apple.WebKit.Storage.sb.in b/Source/WebKit/StorageProcess/mac/com.apple.WebKit.Storage.sb.in
deleted file mode 100644 (file)
index 55b4afc..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-; Copyright (C) 2014-2016 Apple Inc. All rights reserved.
-;
-; Redistribution and use in source and binary forms, with or without
-; modification, are permitted provided that the following conditions
-; are met:
-; 1. Redistributions of source code must retain the above copyright
-;    notice, this list of conditions and the following disclaimer.
-; 2. Redistributions in binary form must reproduce the above copyright
-;    notice, this list of conditions and the following disclaimer in the
-;    documentation and/or other materials provided with the distribution.
-;
-; THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-; THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-; PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-; BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-; CONTRACT, STRICT LIABILITY, 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.
-
-(version 1)
-(deny default (with partial-symbolication))
-(allow system-audit file-read-metadata)
-
-(import "system.sb")
-
-;;; process-info* defaults to allow; deny it and then allow operations we actually need.
-(deny process-info*)
-(allow process-info-pidinfo)
-(allow process-info-setcontrol (target self))
-
-(deny sysctl*)
-(allow sysctl-read
-    (sysctl-name
-        "hw.availcpu"
-        "hw.ncpu"
-        "hw.model"
-        "kern.memorystatus_level"
-        "vm.footprint_suspend"))
-
-(deny iokit-get-properties)
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
-(deny mach-lookup (xpc-service-name-prefix ""))
-#endif
-
-;; Utility functions for home directory relative path filters
-(define (home-regex home-relative-regex)
-  (regex (string-append "^" (regex-quote (param "HOME_DIR")) home-relative-regex)))
-
-(define (home-subpath home-relative-subpath)
-    (subpath (string-append (param "HOME_DIR") home-relative-subpath)))
-
-(define (home-literal home-relative-literal)
-    (literal (string-append (param "HOME_DIR") home-relative-literal)))
-
-(define (allow-read-write-directory-and-issue-read-write-extensions path)
-    (if path
-        (begin
-            (allow file-read* file-write* (subpath path))
-            (allow file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read") (subpath path)))
-            (allow file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read-write") (subpath path))))))
-
-;; IOKit user clients
-(allow iokit-open
-    (iokit-user-client-class "RootDomainUserClient"))
-
-;; Security framework
-(allow mach-lookup
-       (global-name "com.apple.SecurityServer"))
-(allow user-preference-read
-    (preference-domain
-        "com.apple.security"
-        "com.apple.security.revocation"))
-(allow file-read*
-       (subpath "/private/var/db/mds")
-       (literal "/private/var/db/DetachedSignatures")
-       ; The following are needed until <rdar://problem/11134688> is resolved.
-       (literal "/Library/Preferences/com.apple.security.plist")
-       (literal "/Library/Preferences/com.apple.security.revocation.plist")
-       (home-literal "/Library/Preferences/com.apple.security.plist")
-       (home-literal "/Library/Preferences/com.apple.security.revocation.plist"))
-(allow ipc-posix-shm-read* ipc-posix-shm-write-data
-       (ipc-posix-name "com.apple.AppleDatabaseChanged"))
-(if (positive? (string-length (param "DARWIN_USER_CACHE_DIR")))
-    (allow-read-write-directory-and-issue-read-write-extensions (param "DARWIN_USER_CACHE_DIR")))
-(if (positive? (string-length (param "DARWIN_USER_TEMP_DIR")))
-    (allow-read-write-directory-and-issue-read-write-extensions (param "DARWIN_USER_TEMP_DIR")))
-
-;; Read-only preferences and data
-(allow user-preference-read
-    (preference-domain
-        "kCFPreferencesAnyApplication"))
-(allow file-read*
-    ;; Basic system paths
-    (subpath "/Library/Frameworks")
-    (subpath "/Library/Managed Preferences")
-
-    ;; On-disk WebKit2 framework location, to account for debug installations
-    ;; outside of /System/Library/Frameworks
-    (subpath (param "WEBKIT2_FRAMEWORK_DIR")))
-(allow system-fsctl (fsctl-command (_IO "h" 47)))
-
-;; Various services required by CFNetwork and other frameworks
-(allow mach-lookup
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
-    (global-name "com.apple.analyticsd")
-#endif
-    (global-name "com.apple.lsd.mapdb")
-)
-
-;; Sandbox extensions
-(define (apply-read-and-issue-extension op path-filter)
-    (op file-read* path-filter)
-    (op file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read") path-filter)))
-(define (apply-write-and-issue-extension op path-filter)
-    (op file-write* path-filter)
-    (op file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read-write") path-filter)))
-(define (read-only-and-issue-extensions path-filter)
-    (apply-read-and-issue-extension allow path-filter))
-(define (read-write-and-issue-extensions path-filter)
-    (apply-read-and-issue-extension allow path-filter)
-    (apply-write-and-issue-extension allow path-filter))
-(read-only-and-issue-extensions (extension "com.apple.app-sandbox.read"))
-(read-write-and-issue-extensions (extension "com.apple.app-sandbox.read-write"))
-
-(if (defined? 'vnode-type)
-    (deny file-write-create (vnode-type SYMLINK)))
-
-;; Reserve a namespace for additional protected extended attributes.
-(deny file-read-xattr file-write-xattr (xattr-regex #"^com\.apple\.security\.private\."))
diff --git a/Source/WebKit/StorageProcess/unix/StorageProcessMainUnix.h b/Source/WebKit/StorageProcess/unix/StorageProcessMainUnix.h
deleted file mode 100644 (file)
index 5824420..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2015 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#pragma once
-
-#include <WebKit/WKBase.h>
-
-namespace WebKit {
-
-extern "C" {
-WK_EXPORT int StorageProcessMainUnix(int argc, char** argv);
-}
-
-} // namespace WebKit
diff --git a/Source/WebKit/StorageProcess/win/StorageProcessMainWin.cpp b/Source/WebKit/StorageProcess/win/StorageProcessMainWin.cpp
deleted file mode 100644 (file)
index 7a66bba..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2017 Sony Interactive Entertainment Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#include "config.h"
-#include "StorageProcessMainWin.h"
-
-#include "ChildProcessMain.h"
-#include "StorageProcess.h"
-
-namespace WebKit {
-
-int StorageProcessMainWin(int argc, char** argv)
-{
-    return ChildProcessMain<StorageProcess, ChildProcessMainBase>(argc, argv);
-}
-
-} // namespace WebKit
diff --git a/Source/WebKit/StorageProcess/win/StorageProcessMainWin.h b/Source/WebKit/StorageProcess/win/StorageProcessMainWin.h
deleted file mode 100644 (file)
index de118a5..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2017 Sony Interactive Entertainment Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#pragma once
-
-#include <WebKit/WKBase.h>
-
-namespace WebKit {
-
-extern "C" {
-WK_EXPORT int StorageProcessMainWin(int argc, char** argv);
-}
-
-} // namespace WebKit
index 28d878e..196528c 100644 (file)
@@ -621,21 +621,11 @@ void WKContextTerminateServiceWorkerProcess(WKContextRef context)
     toImpl(context)->terminateServiceWorkerProcesses();
 }
 
-void WKContextTerminateStorageProcess(WKContextRef context)
-{
-    toImpl(context)->terminateStorageProcessForTesting();
-}
-
 ProcessID WKContextGetNetworkProcessIdentifier(WKContextRef contextRef)
 {
     return toImpl(contextRef)->networkProcessIdentifier();
 }
 
-ProcessID WKContextGetDatabaseProcessIdentifier(WKContextRef contextRef)
-{
-    return toImpl(contextRef)->storageProcessIdentifier();
-}
-
 void WKContextAddSupportedPlugin(WKContextRef contextRef, WKStringRef domainRef, WKStringRef nameRef, WKArrayRef mimeTypesRef, WKArrayRef extensionsRef)
 {
 #if ENABLE(NETSCAPE_PLUGIN_API)
index dc0fe38..c2de3af 100644 (file)
@@ -50,7 +50,6 @@ typedef WKDataRef (*WKContextCopyWebCryptoMasterKeyCallback)(WKContextRef contex
 
 typedef void (*WKContextChildProcessDidCrashCallback)(WKContextRef context, const void *clientInfo);
 typedef WKContextChildProcessDidCrashCallback WKContextNetworkProcessDidCrashCallback;
-typedef WKContextChildProcessDidCrashCallback WKContextDatabaseProcessDidCrashCallback;
 
 typedef struct WKContextClientBase {
     int                                                                 version;
@@ -89,8 +88,6 @@ typedef struct WKContextClientV2 {
     // Version 1.
     void                                                                (*copyWebCryptoMasterKey_unavailable)(void);
 
-    // Version 2.
-    WKContextDatabaseProcessDidCrashCallback                            databaseProcessDidCrash;
 } WKContextClientV2;
 
 // FIXME: Remove these once support for Mavericks has been dropped.
index ca457d7..ec6c863 100644 (file)
@@ -92,7 +92,6 @@ WK_EXPORT void WKContextSetUsesNetworkProcess(WKContextRef, bool);
 
 WK_EXPORT void WKContextTerminateNetworkProcess(WKContextRef);
 WK_EXPORT void WKContextTerminateServiceWorkerProcess(WKContextRef);
-WK_EXPORT void WKContextTerminateStorageProcess(WKContextRef);
 
 WK_EXPORT void WKContextSetAllowsAnySSLCertificateForWebSocketTesting(WKContextRef, bool);
 WK_EXPORT void WKContextSetAllowsAnySSLCertificateForServiceWorkerTesting(WKContextRef, bool);
@@ -113,7 +112,6 @@ WK_EXPORT void WKContextSetFontWhitelist(WKContextRef, WKArrayRef);
 WK_EXPORT void WKContextPreconnectToServer(WKContextRef context, WKURLRef serverURL);
 
 WK_EXPORT WKProcessID WKContextGetNetworkProcessIdentifier(WKContextRef context);
-WK_EXPORT WKProcessID WKContextGetDatabaseProcessIdentifier(WKContextRef context);
 
 WK_EXPORT void WKContextAddSupportedPlugin(WKContextRef context, WKStringRef domain, WKStringRef name, WKArrayRef mimeTypes, WKArrayRef extensions);
 WK_EXPORT void WKContextClearSupportedPlugins(WKContextRef context);
index 573d10b..2876316 100644 (file)
@@ -424,11 +424,6 @@ static NSDictionary *policiesHashMapToDictionary(const HashMap<String, HashMap<S
     _processPool->clearSupportedPlugins();
 }
 
-- (void)_terminateStorageProcess
-{
-    _processPool->terminateStorageProcessForTesting();
-}
-
 - (void)_terminateNetworkProcess
 {
     _processPool->terminateNetworkProcess();
@@ -449,11 +444,6 @@ static NSDictionary *policiesHashMapToDictionary(const HashMap<String, HashMap<S
     return _processPool->networkProcessIdentifier();
 }
 
-- (pid_t)_storageProcessIdentifier
-{
-    return _processPool->storageProcessIdentifier();
-}
-
 - (void)_syncNetworkProcessCookies
 {
     _processPool->syncNetworkProcessCookies();
index 2e712cf..7d4b615 100644 (file)
 - (_WKDownload *)_resumeDownloadFromData:(NSData *)resumeData path:(NSString *)path WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 // Test only. Should be called only while no web content processes are running.
-- (void)_terminateStorageProcess;
 - (void)_terminateNetworkProcess;
 - (void)_terminateServiceWorkerProcesses WK_API_AVAILABLE(macosx(10.14), ios(12.0));
 - (void)_disableServiceWorkerProcessTerminationDelay WK_API_AVAILABLE(macosx(10.14), ios(12.0));
 
 // Test only.
 - (pid_t)_networkProcessIdentifier WK_API_AVAILABLE(macosx(10.13), ios(11.0));
-- (pid_t)_storageProcessIdentifier WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
 
 // Test only.
 - (size_t)_webProcessCount WK_API_AVAILABLE(macosx(10.13), ios(11.0));
index 5291697..81cd003 100644 (file)
@@ -84,9 +84,6 @@ void ProcessLauncher::launchProcess()
     case ProcessLauncher::ProcessType::Network:
         executablePath = executablePathOfNetworkProcess();
         break;
-    case ProcessLauncher::ProcessType::Storage:
-        executablePath = executablePathOfStorageProcess();
-        break;
     default:
         ASSERT_NOT_REACHED();
         return;
index 5f03312..8fdf717 100644 (file)
@@ -42,8 +42,6 @@ static const LPCWSTR processName(ProcessLauncher::ProcessType processType)
         return L"WebKitWebProcess.exe";
     case ProcessLauncher::ProcessType::Network:
         return L"WebKitNetworkProcess.exe";
-    case ProcessLauncher::ProcessType::Storage:
-        return L"WebKitStorageProcess.exe";
     }
     return L"WebKitWebProcess.exe";
 }
diff --git a/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp
deleted file mode 100644 (file)
index 922bae5..0000000
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#include "config.h"
-#include "StorageProcessProxy.h"
-
-#include "NetworkProcessMessages.h"
-#include "ServiceWorkerProcessProxy.h"
-#include "StorageProcessMessages.h"
-#include "StorageProcessProxyMessages.h"
-#include "WebProcessPool.h"
-#include "WebsiteData.h"
-#include <WebCore/NotImplemented.h>
-
-namespace WebKit {
-using namespace WebCore;
-
-static uint64_t generateStorageProcessCallbackID()
-{
-    static uint64_t callbackID;
-
-    return ++callbackID;
-}
-
-StorageProcessProxy::StorageProcessProxy(WebProcessPool& processPool)
-    : ChildProcessProxy(processPool.alwaysRunsAtBackgroundPriority())
-    , m_processPool(processPool)
-    , m_numPendingConnectionRequests(0)
-{
-    connect();
-}
-
-StorageProcessProxy::~StorageProcessProxy()
-{
-    ASSERT(m_pendingFetchWebsiteDataCallbacks.isEmpty());
-    ASSERT(m_pendingDeleteWebsiteDataCallbacks.isEmpty());
-    ASSERT(m_pendingDeleteWebsiteDataForOriginsCallbacks.isEmpty());
-}
-
-void StorageProcessProxy::terminateForTesting()
-{
-    for (auto& callback : m_pendingFetchWebsiteDataCallbacks.values())
-        callback({ });
-
-    for (auto& callback : m_pendingDeleteWebsiteDataCallbacks.values())
-        callback();
-
-    for (auto& callback : m_pendingDeleteWebsiteDataForOriginsCallbacks.values())
-        callback();
-    
-    m_pendingFetchWebsiteDataCallbacks.clear();
-    m_pendingDeleteWebsiteDataCallbacks.clear();
-    m_pendingDeleteWebsiteDataForOriginsCallbacks.clear();
-    
-    terminate();
-}
-
-void StorageProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
-{
-    launchOptions.processType = ProcessLauncher::ProcessType::Storage;
-    ChildProcessProxy::getLaunchOptions(launchOptions);
-}
-
-void StorageProcessProxy::processWillShutDown(IPC::Connection& connection)
-{
-    ASSERT_UNUSED(connection, this->connection() == &connection);
-}
-
-void StorageProcessProxy::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
-{
-    if (decoder.messageReceiverName() == Messages::StorageProcessProxy::messageReceiverName()) {
-        didReceiveStorageProcessProxyMessage(connection, decoder);
-        return;
-    }
-}
-
-void StorageProcessProxy::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, CompletionHandler<void (WebsiteData)>&& completionHandler)
-{
-    ASSERT(canSendMessage());
-
-    uint64_t callbackID = generateStorageProcessCallbackID();
-    m_pendingFetchWebsiteDataCallbacks.add(callbackID, WTFMove(completionHandler));
-
-    send(Messages::StorageProcess::FetchWebsiteData(sessionID, dataTypes, callbackID), 0);
-}
-
-void StorageProcessProxy::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WallTime modifiedSince, CompletionHandler<void ()>&& completionHandler)
-{
-    auto callbackID = generateStorageProcessCallbackID();
-
-    m_pendingDeleteWebsiteDataCallbacks.add(callbackID, WTFMove(completionHandler));
-    send(Messages::StorageProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
-}
-
-void StorageProcessProxy::deleteWebsiteDataForOrigins(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<WebCore::SecurityOriginData>& origins, CompletionHandler<void()>&& completionHandler)
-{
-    ASSERT(canSendMessage());
-
-    uint64_t callbackID = generateStorageProcessCallbackID();
-    m_pendingDeleteWebsiteDataForOriginsCallbacks.add(callbackID, WTFMove(completionHandler));
-
-    send(Messages::StorageProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, origins, callbackID), 0);
-}
-
-void StorageProcessProxy::getStorageProcessConnection(WebProcessProxy& webProcessProxy, Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply&& reply)
-{
-    m_pendingConnectionReplies.append(WTFMove(reply));
-
-    if (state() == State::Launching) {
-        m_numPendingConnectionRequests++;
-        return;
-    }
-
-    bool isServiceWorkerProcess = false;
-    SecurityOriginData securityOrigin;
-
-    send(Messages::StorageProcess::CreateStorageToWebProcessConnection(isServiceWorkerProcess, securityOrigin), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
-}
-
-void StorageProcessProxy::didClose(IPC::Connection&)
-{
-    auto protectedProcessPool = makeRef(m_processPool);
-
-    // The storage process must have crashed or exited, so send any pending sync replies we might have.
-    while (!m_pendingConnectionReplies.isEmpty()) {
-        auto reply = m_pendingConnectionReplies.takeFirst();
-
-#if USE(UNIX_DOMAIN_SOCKETS)
-        reply(IPC::Attachment());
-#elif OS(DARWIN)
-        reply(IPC::Attachment(0, MACH_MSG_TYPE_MOVE_SEND));
-#elif OS(WINDOWS)
-        reply(IPC::Attachment());
-#else
-        notImplemented();
-#endif
-    }
-
-    while (!m_pendingFetchWebsiteDataCallbacks.isEmpty())
-        m_pendingFetchWebsiteDataCallbacks.take(m_pendingFetchWebsiteDataCallbacks.begin()->key)(WebsiteData { });
-
-    while (!m_pendingDeleteWebsiteDataCallbacks.isEmpty())
-        m_pendingDeleteWebsiteDataCallbacks.take(m_pendingDeleteWebsiteDataCallbacks.begin()->key)();
-
-    while (!m_pendingDeleteWebsiteDataForOriginsCallbacks.isEmpty())
-        m_pendingDeleteWebsiteDataForOriginsCallbacks.take(m_pendingDeleteWebsiteDataForOriginsCallbacks.begin()->key)();
-
-    // Tell ProcessPool to forget about this storage process. This may cause us to be deleted.
-    m_processPool.storageProcessCrashed(this);
-}
-
-void StorageProcessProxy::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
-{
-}
-
-void StorageProcessProxy::didCreateStorageToWebProcessConnection(const IPC::Attachment& connectionIdentifier)
-{
-    ASSERT(!m_pendingConnectionReplies.isEmpty());
-
-    auto reply = m_pendingConnectionReplies.takeFirst();
-
-#if USE(UNIX_DOMAIN_SOCKETS)
-    reply(connectionIdentifier);
-#elif OS(DARWIN)
-    reply(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND));
-#elif OS(WINDOWS)
-    reply(connectionIdentifier.handle());
-#else
-    notImplemented();
-#endif
-}
-
-void StorageProcessProxy::didFetchWebsiteData(uint64_t callbackID, const WebsiteData& websiteData)
-{
-    auto callback = m_pendingFetchWebsiteDataCallbacks.take(callbackID);
-    callback(websiteData);
-}
-
-void StorageProcessProxy::didDeleteWebsiteData(uint64_t callbackID)
-{
-    auto callback = m_pendingDeleteWebsiteDataCallbacks.take(callbackID);
-    callback();
-}
-
-void StorageProcessProxy::didDeleteWebsiteDataForOrigins(uint64_t callbackID)
-{
-    auto callback = m_pendingDeleteWebsiteDataForOriginsCallbacks.take(callbackID);
-    callback();
-}
-
-void StorageProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
-{
-    ChildProcessProxy::didFinishLaunching(launcher, connectionIdentifier);
-
-    if (!IPC::Connection::identifierIsValid(connectionIdentifier)) {
-        // FIXME: Do better cleanup here.
-        return;
-    }
-
-    for (unsigned i = 0; i < m_numPendingConnectionRequests; ++i)
-        send(Messages::StorageProcess::CreateStorageToWebProcessConnection(false, { }), 0);
-    
-    m_numPendingConnectionRequests = 0;
-}
-
-} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h
deleted file mode 100644 (file)
index 65074a9..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#pragma once
-
-#include "ChildProcessProxy.h"
-#include "ProcessLauncher.h"
-#include "WebProcessProxyMessages.h"
-#include <wtf/Deque.h>
-#include <wtf/Forward.h>
-
-namespace PAL {
-class SessionID;
-}
-
-namespace WebCore {
-class SecurityOrigin;
-struct SecurityOriginData;
-}
-
-namespace WebKit {
-
-class WebProcessPool;
-class WebProcessProxy;
-enum class WebsiteDataType;
-struct WebsiteData;
-
-class StorageProcessProxy final : public ChildProcessProxy {
-public:
-    explicit StorageProcessProxy(WebProcessPool&);
-    ~StorageProcessProxy();
-
-    void fetchWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, CompletionHandler<void(WebsiteData)>&&);
-    void deleteWebsiteData(PAL::SessionID, OptionSet<WebsiteDataType>, WallTime modifiedSince, CompletionHandler<void()>&&);
-    void deleteWebsiteDataForOrigins(PAL::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>&, CompletionHandler<void()>&&);
-
-    void getStorageProcessConnection(WebProcessProxy&, Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply&&);
-
-    void terminateForTesting();
-
-private:
-    // ChildProcessProxy
-    void getLaunchOptions(ProcessLauncher::LaunchOptions&) override;
-    void processWillShutDown(IPC::Connection&) override;
-
-    // IPC::Connection::Client
-    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
-    void didClose(IPC::Connection&) override;
-    void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
-
-    void didReceiveStorageProcessProxyMessage(IPC::Connection&, IPC::Decoder&);
-
-    // Message handlers
-    void didCreateStorageToWebProcessConnection(const IPC::Attachment&);
-    void didFetchWebsiteData(uint64_t callbackID, const WebsiteData&);
-    void didDeleteWebsiteData(uint64_t callbackID);
-    void didDeleteWebsiteDataForOrigins(uint64_t callbackID);
-
-    // ProcessLauncher::Client
-    void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier) override;
-
-    WebProcessPool& m_processPool;
-
-    unsigned m_numPendingConnectionRequests;
-    Deque<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply> m_pendingConnectionReplies;
-
-    HashMap<uint64_t, CompletionHandler<void (WebsiteData)>> m_pendingFetchWebsiteDataCallbacks;
-    HashMap<uint64_t, CompletionHandler<void ()>> m_pendingDeleteWebsiteDataCallbacks;
-    HashMap<uint64_t, CompletionHandler<void ()>> m_pendingDeleteWebsiteDataForOriginsCallbacks;
-};
-
-} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/Storage/StorageProcessProxy.messages.in b/Source/WebKit/UIProcess/Storage/StorageProcessProxy.messages.in
deleted file mode 100644 (file)
index b363085..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 2013 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-# 2.  Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# 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 -> StorageProcessProxy LegacyReceiver {
-    DidCreateStorageToWebProcessConnection(IPC::Attachment connectionIdentifier)
-
-    DidFetchWebsiteData(uint64_t callbackID, struct WebKit::WebsiteData websiteData)
-    DidDeleteWebsiteData(uint64_t callbackID)
-    DidDeleteWebsiteDataForOrigins(uint64_t callbackID)
-}
index 41c0c25..fa45762 100644 (file)
@@ -46,12 +46,4 @@ void WebContextClient::networkProcessDidCrash(WebProcessPool* processPool)
     m_client.networkProcessDidCrash(toAPI(processPool), m_client.base.clientInfo);
 }
 
-void WebContextClient::storageProcessDidCrash(WebProcessPool* processPool)
-{
-    if (!m_client.databaseProcessDidCrash)
-        return;
-
-    m_client.databaseProcessDidCrash(toAPI(processPool), m_client.base.clientInfo);
-}
-
 } // namespace WebKit
index 038f63a..80c3112 100644 (file)
@@ -45,7 +45,6 @@ class WebContextClient : public API::Client<WKContextClientBase> {
 public:
     void plugInAutoStartOriginHashesChanged(WebProcessPool*);
     void networkProcessDidCrash(WebProcessPool*);
-    void storageProcessDidCrash(WebProcessPool*);
 };
 
 } // namespace WebKit
index 80ca3a5..ed55b40 100644 (file)
@@ -29,7 +29,6 @@
 namespace WebKit {
 
 class NetworkProcessProxy;
-class StorageProcessProxy;
 class WebProcessPool;
 class WebProcessProxy;
 
@@ -56,10 +55,6 @@ public:
     {
     }
 
-    virtual void processDidClose(StorageProcessProxy*)
-    {
-    }
-
     WebProcessPool* processPool() const { return m_processPool; }
     void clearProcessPool() { m_processPool = nullptr; }
 
index 2477e5a..eff3414 100644 (file)
@@ -54,8 +54,6 @@
 #include "SandboxExtension.h"
 #include "ServiceWorkerProcessProxy.h"
 #include "StatisticsData.h"
-#include "StorageProcessCreationParameters.h"
-#include "StorageProcessMessages.h"
 #include "TextChecker.h"
 #include "UIGamepad.h"
 #include "UIGamepadProvider.h"
@@ -441,7 +439,6 @@ void WebProcessPool::sendMemoryPressureEvent(bool isCritical)
 {
     sendToAllProcesses(Messages::ChildProcess::DidReceiveMemoryPressureEvent(isCritical));
     sendToNetworkingProcess(Messages::ChildProcess::DidReceiveMemoryPressureEvent(isCritical));
-    sendToStorageProcess(Messages::ChildProcess::DidReceiveMemoryPressureEvent(isCritical));
 #if ENABLE(NETSCAPE_PLUGIN_API)
     PluginProcessManager::singleton().sendMemoryPressureEvent(isCritical);
 #endif
@@ -606,46 +603,6 @@ void WebProcessPool::getNetworkProcessConnection(WebProcessProxy& webProcessProx
     m_networkProcess->getNetworkProcessConnection(webProcessProxy, WTFMove(reply));
 }
 
-void WebProcessPool::ensureStorageProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore)
-{
-    if (!m_storageProcess) {
-        auto parameters = m_websiteDataStore ? m_websiteDataStore->websiteDataStore().storageProcessParameters() : (relevantDataStore ? relevantDataStore->storageProcessParameters() : API::WebsiteDataStore::defaultDataStore()->websiteDataStore().storageProcessParameters());
-
-        ASSERT(parameters.sessionID.isValid());
-
-        m_storageProcess = std::make_unique<StorageProcessProxy>(*this);
-        m_storageProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(parameters), 0);
-    }
-
-    if (!relevantDataStore || !m_websiteDataStore || relevantDataStore == &m_websiteDataStore->websiteDataStore())
-        return;
-
-    m_storageProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(relevantDataStore->storageProcessParameters()), 0);
-}
-
-void WebProcessPool::getStorageProcessConnection(WebProcessProxy& webProcessProxy, PAL::SessionID initialSessionID, Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply&& reply)
-{
-    ensureStorageProcessAndWebsiteDataStore(WebsiteDataStore::existingNonDefaultDataStoreForSessionID(initialSessionID));
-
-    m_storageProcess->getStorageProcessConnection(webProcessProxy, WTFMove(reply));
-}
-
-void WebProcessPool::storageProcessCrashed(StorageProcessProxy* storageProcessProxy)
-{
-    ASSERT(m_storageProcess);
-    ASSERT(storageProcessProxy == m_storageProcess.get());
-
-    for (auto& supplement : m_supplements.values())
-        supplement->processDidClose(storageProcessProxy);
-
-    m_client.storageProcessDidCrash(this);
-
-    if (m_automationSession)
-        m_automationSession->terminate();
-
-    m_storageProcess = nullptr;
-}
-
 #if ENABLE(SERVICE_WORKER)
 void WebProcessPool::establishWorkerContextConnectionToNetworkProcess(NetworkProcessProxy& proxy, SecurityOriginData&& securityOrigin, std::optional<PAL::SessionID> sessionID)
 {
@@ -722,7 +679,6 @@ void WebProcessPool::setAnyPageGroupMightHavePrivateBrowsingEnabled(bool private
         sendToAllProcesses(Messages::WebProcess::AddWebsiteDataStore(WebsiteDataStoreParameters::legacyPrivateSessionParameters()));
     } else {
         networkProcess()->removeSession(PAL::SessionID::legacyPrivateSessionID());
-        sendToStorageProcess(Messages::StorageProcess::DestroySession(PAL::SessionID::legacyPrivateSessionID()));
         sendToAllProcesses(Messages::WebProcess::DestroySession(PAL::SessionID::legacyPrivateSessionID()));
     }
 }
@@ -1361,14 +1317,6 @@ ProcessID WebProcessPool::networkProcessIdentifier()
     return m_networkProcess->processIdentifier();
 }
 
-ProcessID WebProcessPool::storageProcessIdentifier()
-{
-    if (!m_storageProcess)
-        return 0;
-
-    return m_storageProcess->processIdentifier();
-}
-
 void WebProcessPool::setAlwaysUsesComplexTextCodePath(bool alwaysUseComplexText)
 {
     m_alwaysUsesComplexTextCodePath = alwaysUseComplexText;
@@ -1625,15 +1573,6 @@ void WebProcessPool::clearCachedCredentials()
         m_networkProcess->send(Messages::NetworkProcess::ClearCachedCredentials(), 0);
 }
 
-void WebProcessPool::terminateStorageProcessForTesting()
-{
-    if (!m_storageProcess)
-        return;
-
-    m_storageProcess->terminateForTesting();
-    m_storageProcess = nullptr;
-}
-
 void WebProcessPool::terminateNetworkProcess()
 {
     if (!m_networkProcess)
index 9709679..144428b 100644 (file)
@@ -40,7 +40,6 @@
 #include "ProcessThrottler.h"
 #include "ServiceWorkerProcessProxy.h"
 #include "StatisticsRequest.h"
-#include "StorageProcessProxy.h"
 #include "VisitedLinkStore.h"
 #include "WebContextClient.h"
 #include "WebContextConnectionClient.h"
@@ -174,10 +173,6 @@ public:
     template<typename T, typename U> void sendSyncToNetworkingProcess(T&& message, U&& reply);
     template<typename T> void sendToNetworkingProcessRelaunchingIfNecessary(T&& message);
 
-    // Sends the message to WebProcess or StorageProcess as approporiate for current process model.
-    template<typename T> void sendToStorageProcess(T&& message);
-    template<typename T> void sendToStorageProcessRelaunchingIfNecessary(T&& message);
-
     void processDidFinishLaunching(WebProcessProxy*);
 
     // Disconnect the process from the context.
@@ -220,7 +215,6 @@ public:
     void clearSupportedPlugins();
 
     ProcessID networkProcessIdentifier();
-    ProcessID storageProcessIdentifier();
 
     WebPageGroup& defaultPageGroup() { return m_defaultPageGroup.get(); }
 
@@ -280,7 +274,6 @@ public:
     void setAllowsAnySSLCertificateForWebSocket(bool);
 
     void clearCachedCredentials();
-    void terminateStorageProcessForTesting();
     void terminateNetworkProcess();
     void terminateServiceWorkerProcesses();
     void disableServiceWorkerProcessTerminationDelay();
@@ -345,10 +338,6 @@ public:
 
     void getNetworkProcessConnection(WebProcessProxy&, Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply&&);
 
-    void ensureStorageProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore);
-    StorageProcessProxy* storageProcess() { return m_storageProcess.get(); }
-    void getStorageProcessConnection(WebProcessProxy&, PAL::SessionID initialSessionID, Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply&&);
-    void storageProcessCrashed(StorageProcessProxy*);
 #if ENABLE(SERVICE_WORKER)
     void establishWorkerContextConnectionToNetworkProcess(NetworkProcessProxy&, WebCore::SecurityOriginData&&, std::optional<PAL::SessionID>);
     ServiceWorkerProcessProxy* serviceWorkerProcessProxyFromPageID(uint64_t pageID) const;
@@ -630,7 +619,6 @@ private:
     bool m_canHandleHTTPSServerTrustEvaluation { true };
     bool m_didNetworkProcessCrash { false };
     std::unique_ptr<NetworkProcessProxy> m_networkProcess;
-    std::unique_ptr<StorageProcessProxy> m_storageProcess;
 
     HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks;
     HashMap<uint64_t, RefPtr<StatisticsRequest>> m_statisticsRequests;
@@ -725,20 +713,6 @@ void WebProcessPool::sendToNetworkingProcessRelaunchingIfNecessary(T&& message)
 }
 
 template<typename T>
-void WebProcessPool::sendToStorageProcess(T&& message)
-{
-    if (m_storageProcess && m_storageProcess->canSendMessage())
-        m_storageProcess->send(std::forward<T>(message), 0);
-}
-
-template<typename T>
-void WebProcessPool::sendToStorageProcessRelaunchingIfNecessary(T&& message)
-{
-    ensureStorageProcessAndWebsiteDataStore(nullptr);
-    m_storageProcess->send(std::forward<T>(message), 0);
-}
-
-template<typename T>
 void WebProcessPool::sendToAllProcesses(const T& message)
 {
     size_t processCount = m_processes.size();
index 8b20feb..cc23287 100644 (file)
@@ -631,11 +631,6 @@ void WebProcessProxy::getNetworkProcessConnection(Messages::WebProcessProxy::Get
     m_processPool->getNetworkProcessConnection(*this, WTFMove(reply));
 }
 
-void WebProcessProxy::getStorageProcessConnection(PAL::SessionID initialSessionID, Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply&& reply)
-{
-    m_processPool->getStorageProcessConnection(*this, initialSessionID, WTFMove(reply));
-}
-
 #if !PLATFORM(COCOA)
 bool WebProcessProxy::platformIsBeingDebugged() const
 {
index 4366bb0..eec9ad8 100644 (file)
@@ -272,7 +272,6 @@ private:
     void getPluginProcessConnection(uint64_t pluginProcessToken, Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply&&);
 #endif
     void getNetworkProcessConnection(Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply&&);
-    void getStorageProcessConnection(PAL::SessionID initialSessionID, Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply&&);
 
     bool platformIsBeingDebugged() const;
     bool shouldAllowNonValidInjectedCode() const;
index 0c733d8..49e0492 100644 (file)
@@ -37,7 +37,6 @@ messages -> WebProcessProxy LegacyReceiver {
     GetPluginProcessConnection(uint64_t pluginProcessToken) -> (IPC::Attachment connectionHandle, bool supportsAsynchronousInitialization) Delayed
 #endif
     GetNetworkProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
-    GetStorageProcessConnection(PAL::SessionID initialSessionID) -> (IPC::Attachment connectionHandle) Delayed
     ProcessReadyToSuspend()
     DidCancelProcessSuspension()
 
index 235d179..c2e7e1b 100644 (file)
@@ -33,8 +33,6 @@
 #include "MockAuthenticatorManager.h"
 #include "NetworkProcessMessages.h"
 #include "StorageManager.h"
-#include "StorageProcessCreationParameters.h"
-#include "StorageProcessMessages.h"
 #include "WebCookieManagerProxy.h"
 #include "WebProcessMessages.h"
 #include "WebProcessPool.h"
@@ -135,7 +133,6 @@ WebsiteDataStore::~WebsiteDataStore()
         ASSERT(nonDefaultDataStores().get(m_sessionID) == this);
         nonDefaultDataStores().remove(m_sessionID);
         for (auto& processPool : WebProcessPool::allProcessPools()) {
-            processPool->sendToStorageProcess(Messages::StorageProcess::DestroySession(m_sessionID));
             if (auto* networkProcess = processPool->networkProcess())
                 networkProcess->removeSession(m_sessionID);
         }
@@ -1596,17 +1593,6 @@ void WebsiteDataStore::clearResourceLoadStatisticsInWebProcesses(CompletionHandl
     callback();
 }
 
-StorageProcessCreationParameters WebsiteDataStore::storageProcessParameters()
-{
-    resolveDirectoriesIfNecessary();
-
-    StorageProcessCreationParameters parameters;
-
-    parameters.sessionID = m_sessionID;
-
-    return parameters;
-}
-
 Vector<WebCore::Cookie> WebsiteDataStore::pendingCookies() const
 {
     return copyToVector(m_pendingCookies);
index d124a06..a42261f 100644 (file)
@@ -61,7 +61,6 @@ class WebResourceLoadStatisticsStore;
 enum class WebsiteDataFetchOption;
 enum class WebsiteDataType;
 struct MockWebAuthenticationConfiguration;
-struct StorageProcessCreationParameters;
 struct WebsiteDataRecord;
 struct WebsiteDataStoreParameters;
 
@@ -166,7 +165,6 @@ public:
     bool isAssociatedProcessPool(WebProcessPool&) const;
 
     WebsiteDataStoreParameters parameters();
-    StorageProcessCreationParameters storageProcessParameters();
 
     Vector<WebCore::Cookie> pendingCookies() const;
     void addPendingCookie(const WebCore::Cookie&);
index e62ca6a..d4bcc6d 100644 (file)
@@ -17,7 +17,6 @@
                        dependencies = (
                                BCA8D46815BCE0D6009DC1F1 /* PBXTargetDependency */,
                                372EBB492017E6CF00085064 /* PBXTargetDependency */,
-                               51A60B2E180CCF1700F3BF50 /* PBXTargetDependency */,
                                BC77F95616D0459100F8F78A /* PBXTargetDependency */,
                                BC82844616B4FF6600A278FE /* PBXTargetDependency */,
                                BC8283D516B4C01F00A278FE /* PBXTargetDependency */,
                510F59111DDE297000412FF5 /* _WKLinkIconParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C0C9791DDD78540032CAD3 /* _WKLinkIconParameters.h */; settings = {ATTRIBUTES = (Private, ); }; };
                510FBB9B1288C95E00AFFDF4 /* WebContextMenuItemData.h in Headers */ = {isa = PBXBuildFile; fileRef = 510FBB991288C95E00AFFDF4 /* WebContextMenuItemData.h */; };
                5110AE0D133C16CB0072717A /* WKIconDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 5110AE0B133C16CB0072717A /* WKIconDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               5118E99C1F295266003EF9F5 /* WebToStorageProcessConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 5118E99A1F295259003EF9F5 /* WebToStorageProcessConnection.h */; };
-               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 */; };
                511F8A7B138B460900A95F44 /* SecItemShimLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F8A77138B460900A95F44 /* SecItemShimLibrary.h */; };
                511F8A81138B485D00A95F44 /* SecItemShimLibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 511F8A78138B460900A95F44 /* SecItemShimLibrary.mm */; };
                517CF0E3163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */; };
                517CF0E3163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp */; };
                517CF0E4163A486C00C2950E /* NetworkProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */; };
-               517DD5BF180DA7D30081660B /* StorageProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 517DD5BD180DA7D30081660B /* StorageProcessProxy.h */; };
                51871B5C127CB89D00F76232 /* WebContextMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 51871B5A127CB89D00F76232 /* WebContextMenu.h */; };
                518ACAEA12AEE6BB00B04B83 /* WKProtectionSpaceTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 518ACAE912AEE6BB00B04B83 /* WKProtectionSpaceTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                518ACF1112B015F800B04B83 /* WKCredentialTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 518ACF1012B015F800B04B83 /* WKCredentialTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51DD9F2816367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51DD9F2616367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp */; };
                51DD9F2916367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51DD9F2716367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h */; };
                51E351CB180F2CCC00E53BE9 /* IDBUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E351C9180F2CCC00E53BE9 /* IDBUtilities.h */; };
-               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 */; };
                51E6C1641F2935DD00FD3437 /* ResourceLoadStatisticsPersistentStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E6C1611F2935CD00FD3437 /* ResourceLoadStatisticsPersistentStorage.h */; };
                51EFC1CF1524E62500C9A938 /* WKBundleDOMWindowExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FA2D541521118600C1BA0B /* WKBundleDOMWindowExtension.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51F060E01654317F00F3281B /* WebResourceLoaderMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F060DE1654317500F3281B /* WebResourceLoaderMessages.h */; };
                51F060E11654318500F3282E /* NetworkRTCProviderMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F060DD1654317500F3282E /* NetworkRTCProviderMessageReceiver.cpp */; };
                51F060E11654318500F3282F /* WebMDNSRegisterMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F060DD1654317500F3282F /* WebMDNSRegisterMessageReceiver.cpp */; };
                51F060E11654318500F3283F /* NetworkMDNSRegisterMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F060DD1654317500F3283F /* NetworkMDNSRegisterMessageReceiver.cpp */; };
-               51F7DC41180CC93600212CA3 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
-               51F7DC43180CC93600212CA3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
-               51F7DC44180CC93600212CA3 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
                51F886A61F2C228100C193EF /* WKTestingSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F886A41F2C214A00C193EF /* WKTestingSupport.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51FAEC3A1B0657630009C4E7 /* ChildProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FAEC371B0657310009C4E7 /* ChildProcessMessages.h */; };
                51FAEC3B1B0657680009C4E7 /* ChildProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51FAEC361B0657310009C4E7 /* ChildProcessMessageReceiver.cpp */; };
                A5C0F0A72000654D00536536 /* _WKNSWindowExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = A5C0F0A62000654400536536 /* _WKNSWindowExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A5C0F0AB2000658200536536 /* WKInspectorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = A5C0F0AA2000656E00536536 /* WKInspectorWindow.h */; };
                A5EFD38C16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Storage.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Storage.sb */; };
                A78CCDDB193AC9F8005ECC25 /* com.apple.WebKit.Networking.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */; };
                A78CCDDC193AC9FB005ECC25 /* com.apple.WebKit.WebContent.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */; };
                A7D792D81767CCA300881CBE /* ActivityAssertion.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D792D41767CB0900881CBE /* ActivityAssertion.h */; };
                D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484311FF4B6500032B39 /* WebPopupMenu.h */; };
                D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */; };
                E105FE5418D7B9DE008F57A8 /* EditingRange.h in Headers */ = {isa = PBXBuildFile; fileRef = E105FE5318D7B9DE008F57A8 /* EditingRange.h */; };
-               E115C714190F89E400ECC516 /* StorageProcessIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1FEF39C190F791C00731658 /* StorageProcessIOS.mm */; };
-               E115C716190F8A2500ECC516 /* com.apple.WebKit.Storage.sb in Resources */ = {isa = PBXBuildFile; fileRef = E115C715190F8A2500ECC516 /* com.apple.WebKit.Storage.sb */; };
                E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */; };
                E14A954A16E016A40068DE82 /* NetworkProcessPlatformStrategies.h in Headers */ = {isa = PBXBuildFile; fileRef = E14A954816E016A40068DE82 /* NetworkProcessPlatformStrategies.h */; };
                E1513C67166EABB200149FCB /* ChildProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = E1513C65166EABB200149FCB /* ChildProcessProxy.h */; };
                        remoteGlobalIDString = 372EBB382017E64300085064;
                        remoteInfo = WebContent.Development;
                };
-               375E0626191EA8CC004E3CAF /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
-                       remoteInfo = WebKit;
-               };
                375E062A191EA8D4004E3CAF /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
                        remoteGlobalIDString = C0CE72851247E66800BC0EC4;
                        remoteInfo = "Derived Sources";
                };
-               51A60B2D180CCF1700F3BF50 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 51F7DC3F180CC93600212CA3;
-                       remoteInfo = Databases;
-               };
                BC77F95516D0459100F8F78A /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
                        remoteGlobalIDString = E1AC2E2720F7B94C00B0897D;
                        remoteInfo = "Unlock Keychain";
                };
-               E1AC2E3B20F7B9AA00B0897D /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = E1AC2E2720F7B94C00B0897D;
-                       remoteInfo = "Unlock Keychain";
-               };
                E1AC2E3D20F7B9C000B0897D /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
                        dstSubfolderSpec = 0;
                        files = (
                                A78CCDDB193AC9F8005ECC25 /* com.apple.WebKit.Networking.sb in CopyFiles */,
-                               A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Storage.sb in CopyFiles */,
                                A78CCDDC193AC9FB005ECC25 /* com.apple.WebKit.WebContent.sb in CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                4157E4AF20E2EC9800A6C0D7 /* com.google.o1dbrowserplugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.google.o1dbrowserplugin.sb; sourceTree = "<group>"; };
                4188C154211377700012ABCD /* process-network-sandbox-entitlements.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "process-network-sandbox-entitlements.sh"; sourceTree = "<group>"; };
                4188C156211377E80012ABCD /* process-webcontent-sandbox-entitlements.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "process-webcontent-sandbox-entitlements.sh"; sourceTree = "<group>"; };
-               4188C157211378520012ABCD /* Storage-OSX-sandbox.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "Storage-OSX-sandbox.entitlements"; sourceTree = "<group>"; };
                4188C158211378520012ABCD /* WebContent-OSX-sandbox.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "WebContent-OSX-sandbox.entitlements"; sourceTree = "<group>"; };
                41897ECB1F415D5C0016FA42 /* WebCacheStorageConnection.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebCacheStorageConnection.messages.in; sourceTree = "<group>"; };
                41897ECC1F415D5C0016FA42 /* WebCacheStorageProvider.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebCacheStorageProvider.cpp; sourceTree = "<group>"; };
                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>"; };
-               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>"; };
                510523711C73D22B007993CB /* WebIDBConnectionToServer.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebIDBConnectionToServer.messages.in; sourceTree = "<group>"; };
                510523721C73D37B007993CB /* WebIDBConnectionToServerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIDBConnectionToServerMessageReceiver.cpp; sourceTree = "<group>"; };
                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>"; };
                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>"; };
-               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>"; };
                517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkProcessConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
                517CF0E1163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheStorageEngineConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
                517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkProcessConnectionMessages.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>"; };
                51A55600128C6D92009ABCEC /* WKContextMenuItemTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextMenuItemTypes.h; sourceTree = "<group>"; };
                51A5877E1D1C4CB9004BA9AF /* WebIDBResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIDBResult.cpp; sourceTree = "<group>"; };
                51A5877F1D1C4CB9004BA9AF /* WebIDBResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIDBResult.h; sourceTree = "<group>"; };
-               51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = StorageService.xcconfig; sourceTree = "<group>"; };
                51A728DC1B1BAD2D00102EEE /* WKBundleNavigationActionPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleNavigationActionPrivate.h; sourceTree = "<group>"; };
                51A7F2F2125BF820008AEB1D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = "<group>"; };
                51A7F2F4125BF8D4008AEB1D /* Logging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Logging.cpp; sourceTree = "<group>"; };
                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 /* 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 /* 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>"; };
                51F060DD1654317500F3282F /* WebMDNSRegisterMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebMDNSRegisterMessageReceiver.cpp; sourceTree = "<group>"; };
                51F060DD1654317500F3283F /* NetworkMDNSRegisterMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkMDNSRegisterMessageReceiver.cpp; sourceTree = "<group>"; };
                51F060DE1654317500F3281B /* WebResourceLoaderMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebResourceLoaderMessages.h; sourceTree = "<group>"; };
-               51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Storage.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Storage.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
                51F886A31F2C214A00C193EF /* WKTestingSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKTestingSupport.cpp; sourceTree = "<group>"; };
                51F886A41F2C214A00C193EF /* WKTestingSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKTestingSupport.h; sourceTree = "<group>"; };
                51FA2D541521118600C1BA0B /* WKBundleDOMWindowExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleDOMWindowExtension.h; sourceTree = "<group>"; };
                E1E552C316AE065E004ED653 /* SandboxInitializationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SandboxInitializationParameters.h; sourceTree = "<group>"; };
                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.Storage.sb.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Storage.sb.in; 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>"; };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               51F7DC42180CC93600212CA3 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               51F7DC43180CC93600212CA3 /* Foundation.framework in Frameworks */,
-                               51F7DC44180CC93600212CA3 /* WebKit.framework in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                8DC2EF560486A6940098B216 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                                BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */,
                                BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.xpc */,
                                BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.xpc */,
-                               51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Storage.xpc */,
                                372EBB462017E64300085064 /* com.apple.WebKit.WebContent.Development.xpc */,
                                BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.xpc */,
                                1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */,
                                1AADDF4B10D82AF000D3D63D /* Shared */,
                                BC032DC310F438260058C15A /* UIProcess */,
                                BC032D5C10F436D50058C15A /* WebProcess */,
-                               51F7DC0A180CC41100212CA3 /* StorageProcess */,
                                510CC7DA16138E0100D03ED3 /* NetworkProcess */,
                                1A0EC6B0124BBD36007EF4A5 /* PluginProcess */,
                                C0CE729D1247E71D00BC0EC4 /* Derived Sources */,
                                37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */,
                                A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */,
                                5183B3931379F85C00E8754E /* Shim.xcconfig */,
-                               4188C157211378520012ABCD /* Storage-OSX-sandbox.entitlements */,
-                               51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */,
                                1A4F976E100E7B6600637A18 /* Version.xcconfig */,
                                37119A7E20CCB64E002C6DC9 /* WebContent-iOS-minimalsimulator.entitlements */,
                                7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */,
                                BC111B5A112F628200337BAB /* mac */,
                                1AAE058C1279DCD400852418 /* Plugins */,
                                2D2E04761F5BEC4F00BB25ED /* RemoteLayerTree */,
-                               5118E99D1F29531F003EF9F5 /* Storage */,
                                1ABF43781A368035003FB0E6 /* WebsiteData */,
                                A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */,
                                A7D792D41767CB0900881CBE /* ActivityAssertion.h */,
                                466BC03A1FA266C9002FA9C1 /* WebSWContextManagerConnection.messages.in */,
                                83F1A0771F96E7700045B94E /* WebSWOriginTable.cpp */,
                                83F1A0781F96E7710045B94E /* WebSWOriginTable.h */,
-                               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>";
                        name = mac;
                        sourceTree = "<group>";
                };
-               517DD5BB180DA7C40081660B /* Storage */ = {
-                       isa = PBXGroup;
-                       children = (
-                               517DD5BC180DA7D30081660B /* StorageProcessProxy.cpp */,
-                               517DD5BD180DA7D30081660B /* StorageProcessProxy.h */,
-                               512A9766180E05D20039A149 /* StorageProcessProxy.messages.in */,
-                       );
-                       path = Storage;
-                       sourceTree = "<group>";
-               };
-               517DD5C0180DB7AA0081660B /* mac */ = {
-                       isa = PBXGroup;
-                       children = (
-                               E1FEF39A190F76F300731658 /* com.apple.WebKit.Storage.sb.in */,
-                               51E35201180F5D1E00E53BE9 /* StorageProcessMac.mm */,
-                       );
-                       path = mac;
-                       sourceTree = "<group>";
-               };
                518E8EF116B208F000E91429 /* Authentication */ = {
                        isa = PBXGroup;
                        children = (
                        path = ios;
                        sourceTree = "<group>";
                };
-               51F7DC0A180CC41100212CA3 /* StorageProcess */ = {
-                       isa = PBXGroup;
-                       children = (
-                               51F7DC0B180CC42200212CA3 /* EntryPoint */,
-                               E1FEF39B190F791C00731658 /* ios */,
-                               517DD5C0180DB7AA0081660B /* mac */,
-                               51E351FA180F5D0B00E53BE9 /* StorageProcess.cpp */,
-                               51E351FB180F5D0B00E53BE9 /* StorageProcess.h */,
-                               51E351FC180F5D0B00E53BE9 /* StorageProcess.messages.in */,
-                               51E351FD180F5D0B00E53BE9 /* StorageToWebProcessConnection.cpp */,
-                               51E351FE180F5D0B00E53BE9 /* StorageToWebProcessConnection.h */,
-                               51032F1A180F74F100961BB7 /* StorageToWebProcessConnection.messages.in */,
-                       );
-                       path = StorageProcess;
-                       sourceTree = "<group>";
-               };
-               51F7DC0B180CC42200212CA3 /* EntryPoint */ = {
-                       isa = PBXGroup;
-                       children = (
-                               51F7DC0C180CC43100212CA3 /* XPCService */,
-                       );
-                       path = EntryPoint;
-                       sourceTree = "<group>";
-               };
-               51F7DC0C180CC43100212CA3 /* XPCService */ = {
-                       isa = PBXGroup;
-                       children = (
-                               51F7DC0D180CC43800212CA3 /* StorageService */,
-                               51E35208180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm */,
-                       );
-                       name = XPCService;
-                       path = mac/XPCService;
-                       sourceTree = "<group>";
-               };
-               51F7DC0D180CC43800212CA3 /* StorageService */ = {
-                       isa = PBXGroup;
-                       children = (
-                               51E35207180F5D6100E53BE9 /* Info.plist */,
-                       );
-                       path = StorageService;
-                       sourceTree = "<group>";
-               };
                539BD5B21DADB0BA00F2E4E1 /* capture */ = {
                        isa = PBXGroup;
                        children = (
                                31A2EC401489973700810D71 /* Notifications */,
                                1AEFCC0511D01F34008219D3 /* Plugins */,
                                2D1551A91F5A9B420006E3FE /* RemoteLayerTree */,
-                               517DD5BB180DA7C40081660B /* Storage */,
                                1AAF089E192681AC00B6390C /* UserContent */,
                                57608294202BD84900116678 /* WebAuthentication */,
                                1A53C2A31A325691004E8C70 /* WebsiteData */,
                        name = PDF;
                        sourceTree = "<group>";
                };
-               E1FEF39B190F791C00731658 /* ios */ = {
-                       isa = PBXGroup;
-                       children = (
-                               E1FEF39C190F791C00731658 /* StorageProcessIOS.mm */,
-                       );
-                       path = ios;
-                       sourceTree = "<group>";
-               };
                E489D2821A0A2BE80078C06A /* cache */ = {
                        isa = PBXGroup;
                        children = (
                                1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */,
                                1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */,
                                1AB31A9716BC688100F6DBC9 /* StorageManagerMessages.h in Headers */,
-                               5118E9A11F295326003EF9F5 /* StorageProcessCreationParameters.h in Headers */,
-                               5118E9A91F295977003EF9F5 /* StorageProcessMessages.h in Headers */,
-                               517DD5BF180DA7D30081660B /* StorageProcessProxy.h in Headers */,
-                               5118E9AB1F295977003EF9F5 /* StorageProcessProxyMessages.h in Headers */,
-                               5118E9AD1F295977003EF9F5 /* StorageToWebProcessConnectionMessages.h in Headers */,
                                1AE00D6C18327C1200087DD7 /* StringReference.h in Headers */,
                                296BD85D15019BC30071F424 /* StringUtilities.h in Headers */,
                                3157135F2040A9B20084F9CF /* SystemPreviewController.h in Headers */,
                                9356F2DD2152B6F600E6D5DF /* WebSWServerConnection.h in Headers */,
                                517A52D91F43A9DA00DCDC0A /* WebSWServerConnectionMessages.h in Headers */,
                                515262BC1FB9515D0070E579 /* WebSWServerToContextConnectionMessages.h in Headers */,
-                               5118E99C1F295266003EF9F5 /* WebToStorageProcessConnection.h in Headers */,
                                BCA0EF7F12331E78007D3CFB /* WebUndoStep.h in Headers */,
                                1AAF08AE1926936700B6390C /* WebUserContentController.h in Headers */,
                                7C065F2C1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h in Headers */,
                        productReference = 510031F61379CACB00C8DFE4 /* SecItemShim.dylib */;
                        productType = "com.apple.product-type.library.dynamic";
                };
-               51F7DC3F180CC93600212CA3 /* Databases */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 51F7DC46180CC93600212CA3 /* Build configuration list for PBXNativeTarget "Databases" */;
-                       buildPhases = (
-                               51F7DC40180CC93600212CA3 /* Sources */,
-                               51F7DC42180CC93600212CA3 /* Frameworks */,
-                               51F7DC45180CC93600212CA3 /* Resources */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               E1AC2E3C20F7B9AA00B0897D /* PBXTargetDependency */,
-                               375E0627191EA8CC004E3CAF /* PBXTargetDependency */,
-                       );
-                       name = Databases;
-                       productName = Networking;
-                       productReference = 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Storage.xpc */;
-                       productType = "com.apple.product-type.xpc-service";
-               };
                8DC2EF4F0486A6940098B216 /* WebKit */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit" */;
                                BC8283B016B4BF7700A278FE /* Networking */,
                                BC8283F816B4FDDE00A278FE /* Plugin.32 */,
                                BC82841E16B4FDF600A278FE /* Plugin.64 */,
-                               51F7DC3F180CC93600212CA3 /* Databases */,
                                A7AADA1019395CA9003EA1C7 /* Sandbox Profiles */,
                                E1AC2E2720F7B94C00B0897D /* Unlock Keychain */,
                        );
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               51F7DC45180CC93600212CA3 /* Resources */ = {
-                       isa = PBXResourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                8DC2EF520486A6940098B216 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                                E17AE2C316B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb in Resources */,
-                               E115C716190F8A2500ECC516 /* com.apple.WebKit.Storage.sb in Resources */,
                                E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */,
                                414DD37920BF43F5006959FB /* com.cisco.webex.plugin.gpc64.sb in Resources */,
                                6BE969C11E54D452008B7483 /* corePrediction_model in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               51F7DC40180CC93600212CA3 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               51F7DC41180CC93600212CA3 /* XPCServiceMain.mm in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                8DC2EF540486A6940098B216 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                                2DE6943D18BD2A68005C15E5 /* SmartMagnificationControllerMessageReceiver.cpp in Sources */,
                                1A334DED16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp in Sources */,
                                1AB31A9616BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp in Sources */,
-                               51E351FF180F5D0F00E53BE9 /* StorageProcess.cpp in Sources */,
-                               E115C714190F89E400ECC516 /* StorageProcessIOS.mm in Sources */,
-                               51E35202180F5D1E00E53BE9 /* StorageProcessMac.mm in Sources */,
-                               5118E9A81F295977003EF9F5 /* StorageProcessMessageReceiver.cpp in Sources */,
-                               5118E9AA1F295977003EF9F5 /* StorageProcessProxyMessageReceiver.cpp in Sources */,
-                               51E35209180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm in Sources */,
-                               51E35200180F5D0F00E53BE9 /* StorageToWebProcessConnection.cpp in Sources */,
-                               5118E9AC1F295977003EF9F5 /* StorageToWebProcessConnectionMessageReceiver.cpp in Sources */,
                                2D92A783212B6A7100F493FD /* StringReference.cpp in Sources */,
                                2D11B7512126A282006F8878 /* UnifiedSource1-mm.mm in Sources */,
                                2D11B7522126A282006F8878 /* UnifiedSource1.cpp in Sources */,
                        target = 372EBB382017E64300085064 /* WebContent.Development */;
                        targetProxy = 372EBB482017E6CF00085064 /* PBXContainerItemProxy */;
                };
-               375E0627191EA8CC004E3CAF /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 8DC2EF4F0486A6940098B216 /* WebKit */;
-                       targetProxy = 375E0626191EA8CC004E3CAF /* PBXContainerItemProxy */;
-               };
                375E062B191EA8D4004E3CAF /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 8DC2EF4F0486A6940098B216 /* WebKit */;
                        target = C0CE72851247E66800BC0EC4 /* Derived Sources */;
                        targetProxy = 37F7407812721F740093869B /* PBXContainerItemProxy */;
                };
-               51A60B2E180CCF1700F3BF50 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 51F7DC3F180CC93600212CA3 /* Databases */;
-                       targetProxy = 51A60B2D180CCF1700F3BF50 /* PBXContainerItemProxy */;
-               };
                BC77F95616D0459100F8F78A /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = BC8283F816B4FDDE00A278FE /* Plugin.32 */;
                        target = E1AC2E2720F7B94C00B0897D /* Unlock Keychain */;
                        targetProxy = E1AC2E3920F7B9A700B0897D /* PBXContainerItemProxy */;
                };
-               E1AC2E3C20F7B9AA00B0897D /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = E1AC2E2720F7B94C00B0897D /* Unlock Keychain */;
-                       targetProxy = E1AC2E3B20F7B9AA00B0897D /* PBXContainerItemProxy */;
-               };
                E1AC2E3E20F7B9C000B0897D /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = E1AC2E2720F7B94C00B0897D /* Unlock Keychain */;
                        };
                        name = Production;
                };
-               51F7DC47180CC93600212CA3 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */;
-                       buildSettings = {
-                       };
-                       name = Debug;
-               };
-               51F7DC48180CC93600212CA3 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */;
-                       buildSettings = {
-                       };
-                       name = Release;
-               };
-               51F7DC49180CC93600212CA3 /* Production */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */;
-                       buildSettings = {
-                       };
-                       name = Production;
-               };
                5D22D69B11A7534600BF30E5 /* Production */ = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 1A4F976A100E7B6600637A18 /* Base.xcconfig */;
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Production;
                };
-               51F7DC46180CC93600212CA3 /* Build configuration list for PBXNativeTarget "Databases" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               51F7DC47180CC93600212CA3 /* Debug */,
-                               51F7DC48180CC93600212CA3 /* Release */,
-                               51F7DC49180CC93600212CA3 /* Production */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Production;
-               };
                A7AADA1419395CA9003EA1C7 /* Build configuration list for PBXAggregateTarget "Sandbox Profiles" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
index 28c9889..8fe9cb9 100644 (file)
@@ -79,7 +79,7 @@ public:
     void ref() override { RefCounted<WebIDBConnectionToServer>::ref(); }
     void deref() override { RefCounted<WebIDBConnectionToServer>::deref(); }
 
-    // Messages received from StorageProcess
+    // Messages received from Network Process
     void didDeleteDatabase(const WebCore::IDBResultData&);
     void didOpenDatabase(const WebCore::IDBResultData&);
     void didAbortTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&);
index b86055c..0e9e6ca 100644 (file)
@@ -30,8 +30,8 @@
 
 #include "NetworkProcessConnection.h"
 #include "WebProcess.h"
-#include "WebSWServerConnection.h"
 #include "WebSWClientConnection.h"
+#include "WebSWServerConnection.h"
 #include <WebCore/CachedResource.h>
 #include <WebCore/Exception.h>
 #include <WebCore/ExceptionCode.h>
diff --git a/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.cpp b/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.cpp
deleted file mode 100644 (file)
index bc6b86b..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
- *
- */
-
-#include "config.h"
-#include "WebToStorageProcessConnection.h"
-
-
-#include "WebProcess.h"
-
-#include <WebCore/SWContextManager.h>
-
-namespace WebKit {
-using namespace PAL;
-using namespace WebCore;
-
-WebToStorageProcessConnection::WebToStorageProcessConnection(IPC::Connection::Identifier connectionIdentifier)
-    : m_connection(IPC::Connection::createClientConnection(connectionIdentifier, *this))
-{
-    m_connection->open();
-}
-
-WebToStorageProcessConnection::~WebToStorageProcessConnection()
-{
-    m_connection->invalidate();
-}
-
-void WebToStorageProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
-{
-    ASSERT_NOT_REACHED();
-}
-
-void WebToStorageProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
-{
-
-    ASSERT_NOT_REACHED();
-}
-
-void WebToStorageProcessConnection::didClose(IPC::Connection& connection)
-{
-    auto protectedThis = makeRef(*this);
-
-    WebProcess::singleton().webToStorageProcessConnectionClosed(this);
-}
-
-void WebToStorageProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
-{
-}
-
-} // namespace WebKit
diff --git a/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.h b/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.h
deleted file mode 100644 (file)
index 11c1731..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
- *
- */
-
-#pragma once
-
-#include "Connection.h"
-#include "MessageSender.h"
-#include <WebCore/SWServer.h>
-#include <pal/SessionID.h>
-#include <wtf/RefCounted.h>
-
-namespace PAL {
-class SessionID;
-}
-
-namespace WebKit {
-
-class WebToStorageProcessConnection : public RefCounted<WebToStorageProcessConnection>, private IPC::Connection::Client, private IPC::MessageSender {
-public:
-    static Ref<WebToStorageProcessConnection> create(IPC::Connection::Identifier connectionIdentifier)
-    {
-        return adoptRef(*new WebToStorageProcessConnection(connectionIdentifier));
-    }
-    ~WebToStorageProcessConnection();
-    
-    IPC::Connection& connection() { return m_connection.get(); }
-
-private:
-    WebToStorageProcessConnection(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;
-
-    // IPC::MessageSender
-    IPC::Connection* messageSenderConnection() override { return m_connection.ptr(); }
-    uint64_t messageSenderDestinationID() override { return 0; }
-
-    Ref<IPC::Connection> m_connection;
-};
-
-} // namespace WebKit
index 0770726..bed287d 100644 (file)
@@ -43,7 +43,6 @@
 #include "PluginProcessConnectionManager.h"
 #include "SessionTracker.h"
 #include "StatisticsData.h"
-#include "StorageProcessMessages.h"
 #include "UserData.h"
 #include "WebAutomationSessionProxy.h"
 #include "WebCacheStorageProvider.h"
@@ -70,7 +69,6 @@
 #include "WebSWContextManagerConnectionMessages.h"
 #include "WebServiceWorkerProvider.h"
 #include "WebSocketStream.h"
-#include "WebToStorageProcessConnection.h"
 #include "WebsiteData.h"
 #include "WebsiteDataStoreParameters.h"
 #include "WebsiteDataType.h"
@@ -1206,49 +1204,6 @@ WebLoaderStrategy& WebProcess::webLoaderStrategy()
     return m_webLoaderStrategy;
 }
 
-void WebProcess::webToStorageProcessConnectionClosed(WebToStorageProcessConnection* connection)
-{
-    ASSERT(m_webToStorageProcessConnection);
-    ASSERT(m_webToStorageProcessConnection == connection);
-
-    m_webToStorageProcessConnection = nullptr;
-}
-
-WebToStorageProcessConnection& WebProcess::ensureWebToStorageProcessConnection(PAL::SessionID initialSessionID)
-{
-    if (!m_webToStorageProcessConnection) {
-        IPC::Attachment encodedConnectionIdentifier;
-
-        if (!parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetStorageProcessConnection(initialSessionID), Messages::WebProcessProxy::GetStorageProcessConnection::Reply(encodedConnectionIdentifier), 0)) {
-#if PLATFORM(GTK) || PLATFORM(WPE)
-            // GTK+ and WPE ports don't exit on send sync message failure.
-            // In this particular case, the storage process can be terminated by the UI process while the
-            // connection is being done, so we always want to exit instead of crashing.
-            // See https://bugs.webkit.org/show_bug.cgi?id=183348.
-            exit(0);
-#else
-            CRASH();
-#endif
-        }
-
-#if USE(UNIX_DOMAIN_SOCKETS)
-        IPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.releaseFileDescriptor();
-#elif OS(DARWIN)
-        IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
-#elif OS(WINDOWS)
-        IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.handle());
-#else
-        ASSERT_NOT_REACHED();
-#endif
-        if (!IPC::Connection::identifierIsValid(connectionIdentifier))
-            CRASH();
-
-        m_webToStorageProcessConnection = WebToStorageProcessConnection::create(connectionIdentifier);
-
-    }
-    return *m_webToStorageProcessConnection;
-}
-
 void WebProcess::setEnhancedAccessibility(bool flag)
 {
     WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility(flag);
@@ -1701,9 +1656,9 @@ LibWebRTCNetwork& WebProcess::libWebRTCNetwork()
 #if ENABLE(SERVICE_WORKER)
 void WebProcess::establishWorkerContextConnectionToNetworkProcess(uint64_t pageGroupID, uint64_t pageID, const WebPreferencesStore& store, PAL::SessionID initialSessionID)
 {
-    // We are in the Service Worker context process and the call below establishes our connection to the Storage Process
-    // by calling webToStorageProcessConnection. SWContextManager needs to use the same underlying IPC::Connection as the
-    // WebToStorageProcessConnection for synchronization purposes.
+    // We are in the Service Worker context process and the call below establishes our connection to the Network Process
+    // by calling ensureNetworkProcessConnection. SWContextManager needs to use the same underlying IPC::Connection as the
+    // NetworkProcessConnection for synchronization purposes.
     auto& ipcConnection = ensureNetworkProcessConnection().connection();
     SWContextManager::singleton().setConnection(std::make_unique<WebSWContextManagerConnection>(ipcConnection, pageGroupID, pageID, store));
 }
index eb2d82f..638976f 100644 (file)
@@ -97,7 +97,6 @@ class WebLoaderStrategy;
 class WebPage;
 class WebPageGroupProxy;
 class WebProcessSupplement;
-class WebToStorageProcessConnection;
 enum class WebsiteDataType;
 struct WebPageCreationParameters;
 struct WebPageGroupData;
@@ -175,9 +174,6 @@ public:
 
     LibWebRTCNetwork& libWebRTCNetwork();
 
-    void webToStorageProcessConnectionClosed(WebToStorageProcessConnection*);
-    WebToStorageProcessConnection& ensureWebToStorageProcessConnection(PAL::SessionID initialSessionID);
-
     void setCacheModel(uint32_t);
 
     void ensureLegacyPrivateBrowsingSessionInNetworkProcess();
@@ -430,8 +426,6 @@ private:
 
     std::unique_ptr<WebAutomationSessionProxy> m_automationSessionProxy;
 
-    RefPtr<WebToStorageProcessConnection> m_webToStorageProcessConnection;
-
 #if ENABLE(NETSCAPE_PLUGIN_API)
     RefPtr<PluginProcessConnectionManager> m_pluginProcessConnectionManager;
 #endif
index 9d782ac..6a41e5d 100644 (file)
@@ -5,7 +5,6 @@ global:
   WebProcessMainUnix;
   NetworkProcessMainUnix;
   PluginProcessMainUnix;
-  StorageProcessMainUnix;
   extern "C++" {
     "bmalloc::PerProcess<bmalloc::IsoTLSDeallocatorEntry<bmalloc::IsoConfig<40u> > >::s_data";
     "bmalloc::PerProcess<bmalloc::IsoTLSDeallocatorEntry<bmalloc::IsoConfig<40u> > >::s_object";
index b909e85..a1678b3 100644 (file)
@@ -1,3 +1,30 @@
+2018-10-01  Sihui Liu  <sihui_liu@apple.com>
+
+        Remove StorageProcess
+        https://bugs.webkit.org/show_bug.cgi?id=189975
+
+        Reviewed by Geoffrey Garen.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm:
+        (TEST):
+        * TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm:
+        * TestWebKitAPI/Tests/WebKitCocoa/WebProcessKillIDBCleanup.mm:
+        (TEST):
+        * TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm:
+        (TEST):
+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::TestRunner::terminateStorageProcess): Deleted.
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::generatePageConfiguration):
+        (WTR::TestController::databaseProcessName): Deleted.
+        (WTR::TestController::databaseProcessDidCrash): Deleted.
+        (WTR::TestController::terminateStorageProcess): Deleted.
+        * WebKitTestRunner/TestController.h:
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
+
 2018-10-01  Jiewen Tan  <jiewen_tan@apple.com>
 
         [WebAuthN] Import a JS CBOR coder
index 238e77a..3f1a628 100644 (file)
@@ -144,7 +144,6 @@ TEST(ResourceLoadStatistics, ChildProcessesNotLaunched)
     // Ensure the shared process pool exists so the data store operations we're about to do work with it.
     WKProcessPool *sharedProcessPool = [WKProcessPool _sharedProcessPool];
 
-    EXPECT_EQ((pid_t)0, [sharedProcessPool _storageProcessIdentifier]);
     EXPECT_EQ((size_t)0, [sharedProcessPool _pluginProcessCount]);
 
     auto *dataStore = [WKWebsiteDataStore defaultDataStore];
@@ -169,7 +168,6 @@ TEST(ResourceLoadStatistics, ChildProcessesNotLaunched)
 
     EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:targetURL.path]);
 
-    EXPECT_EQ((pid_t)0, [sharedProcessPool _storageProcessIdentifier]);
     EXPECT_EQ((size_t)0, [sharedProcessPool _pluginProcessCount]);
 }
 
index f76242f..a58d203 100644 (file)
@@ -832,7 +832,7 @@ TEST(ServiceWorkers, SWProcessConnectionCreation)
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
     RetainPtr<WKWebView> newRegularPageWebView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
 
-    // Test that a regular page does not trigger a service worker connection to storage process if there is no registered service worker.
+    // Test that a regular page does not trigger a service worker connection to network process if there is no registered service worker.
     NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"sw://host/regularPageWithoutConnection.html"]];
 
     [regularPageWebView loadRequest:request];
@@ -876,47 +876,6 @@ TEST(ServiceWorkers, SWProcessConnectionCreation)
     TestWebKitAPI::Util::run(&done);
 }
 
-TEST(ServiceWorkers, StorageProcessConnectionCreation)
-{
-    ASSERT(mainBytes);
-    ASSERT(scriptBytes);
-
-    [WKWebsiteDataStore _allowWebsiteDataRecordsForAllOrigins];
-
-    RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
-
-    done = false;
-    [[configuration websiteDataStore] removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] modifiedSince:[NSDate distantPast] completionHandler:^() {
-        done = true;
-    }];
-    TestWebKitAPI::Util::run(&done);
-    done = false;
-
-    configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
-    setConfigurationInjectedBundlePath(configuration.get());
-
-    RetainPtr<RegularPageMessageHandler> regularPageMessageHandler = adoptNS([[RegularPageMessageHandler alloc] init]);
-    [[configuration userContentController] addScriptMessageHandler:regularPageMessageHandler.get() name:@"regularPage"];
-
-    RetainPtr<SWSchemes> handler = adoptNS([[SWSchemes alloc] init]);
-    handler->resources.set("sw://host/regularPageWithoutConnection.html", ResourceInfo { @"text/html", regularPageWithoutConnectionBytes });
-    [configuration setURLSchemeHandler:handler.get() forURLScheme:@"SW"];
-
-    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
-
-    EXPECT_EQ(0, webView.get().configuration.processPool._storageProcessIdentifier);
-
-    // Test that a regular page does not trigger a storage process if there is no registered service worker.
-    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"sw://host/regularPageWithoutConnection.html"]];
-
-    [webView loadRequest:request];
-    TestWebKitAPI::Util::run(&done);
-    done = false;
-
-    // Make sure than loading the simple page did not start a storage process.
-    EXPECT_EQ(0, webView.get().configuration.processPool._storageProcessIdentifier);
-}
-
 static const char* mainBytesWithScope = R"SWRESOURCE(
 <script>
 
@@ -1088,9 +1047,6 @@ TEST(ServiceWorkers, HasServiceWorkerRegistrationBit)
     TestWebKitAPI::Util::run(&done);
     done = false;
 
-    // There should be no storage process created.
-    EXPECT_EQ(0, webView.get().configuration.processPool._storageProcessIdentifier);
-
     // Let's use the web site data store that has service worker and load a page.
     newConfiguration.get().websiteDataStore = [configuration websiteDataStore];
 
@@ -1101,9 +1057,6 @@ TEST(ServiceWorkers, HasServiceWorkerRegistrationBit)
     TestWebKitAPI::Util::run(&done);
     done = false;
 
-    // Make sure storage process is not launched.
-    EXPECT_EQ(0, webView.get().configuration.processPool._storageProcessIdentifier);
-
     // Make sure that loading the simple page did not start the service worker process.
     EXPECT_EQ(1u, webView.get().configuration.processPool._webProcessCount);
 
index c5c9c31..a302e3f 100644 (file)
@@ -72,8 +72,6 @@ TEST(IndexedDB, WebProcessKillIDBCleanup)
     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
 
-    [configuration.get().processPool _terminateStorageProcess];
-
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
 
     NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"WebProcessKillIDBCleanup-1" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
index a35fadf..46a02cb 100644 (file)
@@ -136,7 +136,6 @@ TEST(WebKit, WebsiteDataStoreCustomPaths)
     [[[webView configuration] processPool] _syncNetworkProcessCookies];
 
     // Forcibly shut down everything of WebKit that we can.
-    [[[webView configuration] processPool] _terminateStorageProcess];
     auto pid = [webView _webProcessIdentifier];
     if (pid)
         kill(pid, SIGKILL);
@@ -180,7 +179,6 @@ TEST(WebKit, WebsiteDataStoreCustomPaths)
 
     // Data stores can't delete anything unless a WKProcessPool exists, so make sure the shared data store exists.
     auto *processPool = [WKProcessPool _sharedProcessPool];
-    [processPool _terminateStorageProcess];
     RetainPtr<WKWebsiteDataStore> dataStore = [[WKWebsiteDataStore alloc] _initWithConfiguration:websiteDataStoreConfiguration.get()];
     RetainPtr<NSSet> types = adoptNS([[NSSet alloc] initWithObjects:WKWebsiteDataTypeIndexedDBDatabases, nil]);
 
@@ -291,7 +289,6 @@ TEST(WebKit, CustomDataStorePathsVersusCompletionHandlers)
     readyToContinue = false;
 
     // Fetch records again, this time releasing our reference to the data store while the request is in flight.
-    // Without a bug fix, this would crash the StorageProcess and the UI process wouldn't get the info back.
     [dataStore fetchDataRecordsOfTypes:websiteDataTypes.get() completionHandler:^(NSArray<WKWebsiteDataRecord *> *dataRecords) {
         EXPECT_EQ(1U, dataRecords.count);
         readyToContinue = true;
@@ -301,7 +298,6 @@ TEST(WebKit, CustomDataStorePathsVersusCompletionHandlers)
     readyToContinue = false;
 
     // Delete all SW records, releasing our reference to the data store while the request is in flight.
-    // Same as above - We used to crash the storage process and the records weren't actually deleted.
     dataStore = adoptNS([[WKWebsiteDataStore alloc] _initWithConfiguration:websiteDataStoreConfiguration.get()]);
     [dataStore removeDataOfTypes:websiteDataTypes.get() modifiedSince:[NSDate distantPast] completionHandler:^() {
         readyToContinue = true;
@@ -310,7 +306,7 @@ TEST(WebKit, CustomDataStorePathsVersusCompletionHandlers)
     TestWebKitAPI::Util::run(&readyToContinue);
     readyToContinue = false;
 
-    // The StorageProcess should not have crashed, the records should have been deleted, and the callback should have been made.
+    // The records should have been deleted, and the callback should have been made.
     // Now refetch the records to verify they are gone.
     dataStore = adoptNS([[WKWebsiteDataStore alloc] _initWithConfiguration:websiteDataStoreConfiguration.get()]);
     [dataStore fetchDataRecordsOfTypes:websiteDataTypes.get() completionHandler:^(NSArray<WKWebsiteDataRecord *> *dataRecords) {
@@ -403,7 +399,6 @@ TEST(WebKit, WebsiteDataStoreEphemeral)
     [[[webView configuration] processPool] _syncNetworkProcessCookies];
 
     // Forcibly shut down everything of WebKit that we can.
-    [[[webView configuration] processPool] _terminateStorageProcess];
     auto pid = [webView _webProcessIdentifier];
     if (pid)
         kill(pid, SIGKILL);
index bf78851..24d016e 100644 (file)
@@ -330,7 +330,6 @@ interface TestRunner {
 
     void terminateNetworkProcess();
     void terminateServiceWorkerProcess();
-    void terminateStorageProcess();
 
     readonly attribute boolean didCancelClientRedirect;
 
index c18dfc6..5f2767a 100644 (file)
@@ -1252,12 +1252,6 @@ void TestRunner::terminateServiceWorkerProcess()
     WKBundlePagePostSynchronousMessageForTesting(InjectedBundle::singleton().page()->page(), messageName.get(), nullptr, nullptr);
 }
 
-void TestRunner::terminateStorageProcess()
-{
-    WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("TerminateStorageProcess"));
-    WKBundlePagePostSynchronousMessageForTesting(InjectedBundle::singleton().page()->page(), messageName.get(), nullptr, nullptr);
-}
-
 static unsigned nextUIScriptCallbackID()
 {
     static unsigned callbackID = FirstUIScriptCallbackID;
index 75f2dbe..89fed7b 100644 (file)
@@ -443,7 +443,6 @@ public:
 
     void terminateNetworkProcess();
     void terminateServiceWorkerProcess();
-    void terminateStorageProcess();
 
     void removeAllSessionCredentials(JSValueRef);
     void callDidRemoveAllSessionCredentialsCallback();
index 677c7a1..32f2b42 100644 (file)
@@ -484,7 +484,6 @@ WKRetainPtr<WKPageConfigurationRef> TestController::generatePageConfiguration(WK
         networkProcessDidCrash,
         0, // plugInInformationBecameAvailable
         0, // copyWebCryptoMasterKey
-        databaseProcessDidCrash,
     };
     WKContextSetClient(m_context.get(), &contextClient.base);
 
@@ -1055,26 +1054,6 @@ const char* TestController::networkProcessName()
 #endif
 }
 
-const char* TestController::databaseProcessName()
-{
-    // FIXME: Find a way to not hardcode the process name.
-#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
-#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110300
-    return "com.apple.WebKit.Databases";
-#else
-    return "com.apple.WebKit.Storage";
-#endif
-#elif PLATFORM(COCOA)
-    return "com.apple.WebKit.Storage.Development";
-#elif PLATFORM(GTK)
-    return "WebKitStorageProcess";
-#elif PLATFORM(WPE)
-    return "WPEStorageProcess";
-#else
-    return "DatabaseProcess";
-#endif
-}
-
 void TestController::setAllowsAnySSLCertificate(bool allows)
 {
     WKContextSetAllowsAnySSLCertificateForWebSocketTesting(platformContext(), allows);
@@ -1498,11 +1477,6 @@ void TestController::networkProcessDidCrash(WKContextRef context, const void *cl
     static_cast<TestController*>(const_cast<void*>(clientInfo))->networkProcessDidCrash();
 }
 
-void TestController::databaseProcessDidCrash(WKContextRef context, const void *clientInfo)
-{
-    static_cast<TestController*>(const_cast<void*>(clientInfo))->databaseProcessDidCrash();
-}
-
 void TestController::didReceiveKeyDownMessageFromInjectedBundle(WKDictionaryRef messageBodyDictionary, bool synchronous)
 {
     WKRetainPtr<WKStringRef> keyKey = adoptWK(WKStringCreateWithUTF8CString("Key"));
@@ -1836,13 +1810,6 @@ void TestController::networkProcessDidCrash()
     exit(1);
 }
 
-void TestController::databaseProcessDidCrash()
-{
-    pid_t pid = WKContextGetDatabaseProcessIdentifier(m_context.get());
-    fprintf(stderr, "#CRASHED - %s (pid %ld)\n", databaseProcessName(), static_cast<long>(pid));
-    exit(1);
-}
-
 // WKPageNavigationClient
 
 void TestController::didCommitNavigation(WKPageRef page, WKNavigationRef navigation, WKTypeRef, const void* clientInfo)
@@ -2642,11 +2609,6 @@ void TestController::terminateServiceWorkerProcess()
     WKContextTerminateServiceWorkerProcess(platformContext());
 }
 
-void TestController::terminateStorageProcess()
-{
-    WKContextTerminateStorageProcess(platformContext());
-}
-
 #if !PLATFORM(COCOA)
 void TestController::platformWillRunTest(const TestInvocation&)
 {
index 0f25954..045c7cf 100644 (file)
@@ -231,7 +231,6 @@ public:
 
     void terminateNetworkProcess();
     void terminateServiceWorkerProcess();
-    void terminateStorageProcess();
 
     void removeAllSessionCredentials();
 
@@ -329,8 +328,6 @@ private:
     // WKContextClient
     static void networkProcessDidCrash(WKContextRef, const void*);
     void networkProcessDidCrash();
-    static void databaseProcessDidCrash(WKContextRef, const void*);
-    void databaseProcessDidCrash();
 
     // WKPageNavigationClient
     static void didCommitNavigation(WKPageRef, WKNavigationRef, WKTypeRef userData, const void*);
index f1c7418..d7d7f4d 100644 (file)
@@ -1434,12 +1434,6 @@ WKRetainPtr<WKTypeRef> TestInvocation::didReceiveSynchronousMessageFromInjectedB
         return nullptr;
     }
 
-    if (WKStringIsEqualToUTF8CString(messageName, "TerminateStorageProcess")) {
-        ASSERT(!messageBody);
-        TestController::singleton().terminateStorageProcess();
-        return nullptr;
-    }
-
     if (WKStringIsEqualToUTF8CString(messageName, "TerminateNetworkProcess")) {
         ASSERT(!messageBody);
         TestController::singleton().terminateNetworkProcess();