Changeset 219986 in webkit
- Timestamp:
- Jul 27, 2017 4:08:34 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 14 added
- 2 deleted
- 22 edited
- 21 copied
- 7 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r219960 r219986 1 2017-07-27 Brady Eidson <beidson@apple.com> 2 3 Part 1 of: Rename DatabaseProcess to StorageProcess. 4 https://bugs.webkit.org/show_bug.cgi?id=174879 5 6 Reviewed by Andy Estes. 7 8 * Source/cmake/OptionsWPE.cmake: 9 * Source/cmake/gtksymbols.filter: 10 11 1 12 2017-07-26 Brady Eidson <beidson@apple.com> 2 13 -
trunk/Source/WebKit/CMakeLists.txt
r219966 r219986 5 5 set(WebKit2_INCLUDE_DIRECTORIES 6 6 "${WEBKIT2_DIR}" 7 "${WEBKIT2_DIR}/DatabaseProcess"8 "${WEBKIT2_DIR}/DatabaseProcess/IndexedDB"9 7 "${WEBKIT2_DIR}/NetworkProcess" 10 8 "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols" … … 29 27 "${WEBKIT2_DIR}/Shared/Plugins/Netscape" 30 28 "${WEBKIT2_DIR}/Shared/Plugins/Netscape/x11" 29 "${WEBKIT2_DIR}/Shared/Storage" 31 30 "${WEBKIT2_DIR}/Shared/WebsiteData" 31 "${WEBKIT2_DIR}/StorageProcess" 32 "${WEBKIT2_DIR}/StorageProcess/IndexedDB" 32 33 "${WEBKIT2_DIR}/UIProcess" 33 34 "${WEBKIT2_DIR}/UIProcess/API" … … 37 38 "${WEBKIT2_DIR}/UIProcess/Authentication" 38 39 "${WEBKIT2_DIR}/UIProcess/Automation" 39 "${WEBKIT2_DIR}/UIProcess/Databases"40 40 "${WEBKIT2_DIR}/UIProcess/Downloads" 41 41 "${WEBKIT2_DIR}/UIProcess/Gamepad" … … 45 45 "${WEBKIT2_DIR}/UIProcess/Notifications" 46 46 "${WEBKIT2_DIR}/UIProcess/Plugins" 47 "${WEBKIT2_DIR}/UIProcess/Storage" 47 48 "${WEBKIT2_DIR}/UIProcess/UserContent" 48 49 "${WEBKIT2_DIR}/UIProcess/WebStorage" … … 74 75 "${WEBKIT2_DIR}/WebProcess/Plugins/Netscape" 75 76 "${WEBKIT2_DIR}/WebProcess/ResourceCache" 77 "${WEBKIT2_DIR}/WebProcess/Storage" 76 78 "${WEBKIT2_DIR}/WebProcess/UserContent" 77 79 "${WEBKIT2_DIR}/WebProcess/WebCoreSupport" … … 97 99 98 100 set(WebKit2_SOURCES 99 DatabaseProcess/DatabaseProcess.cpp100 DatabaseProcess/DatabaseToWebProcessConnection.cpp101 102 DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp103 104 101 NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp 105 102 … … 255 252 Shared/Authentication/AuthenticationManager.cpp 256 253 257 Shared/Databases/DatabaseProcessCreationParameters.cpp258 259 254 Shared/Databases/IndexedDB/IDBUtilities.cpp 260 255 Shared/Databases/IndexedDB/WebIDBResult.cpp … … 273 268 Shared/Plugins/Netscape/PluginInformation.cpp 274 269 270 Shared/Storage/StorageProcessCreationParameters.cpp 271 275 272 Shared/WebsiteData/WebsiteData.cpp 273 274 StorageProcess/StorageProcess.cpp 275 StorageProcess/StorageToWebProcessConnection.cpp 276 277 StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp 276 278 277 279 UIProcess/BackgroundProcessResponsivenessTimer.cpp … … 406 408 UIProcess/Automation/WebAutomationSession.cpp 407 409 408 UIProcess/Databases/DatabaseProcessProxy.cpp409 410 410 UIProcess/Downloads/DownloadProxy.cpp 411 411 UIProcess/Downloads/DownloadProxyMap.cpp … … 431 431 UIProcess/Plugins/PluginProcessProxy.cpp 432 432 433 UIProcess/Storage/StorageProcessProxy.cpp 434 433 435 UIProcess/UserContent/WebScriptMessageHandler.cpp 434 436 UIProcess/UserContent/WebUserContentControllerProxy.cpp … … 448 450 449 451 WebProcess/Databases/WebDatabaseProvider.cpp 450 WebProcess/Databases/WebToDatabaseProcessConnection.cpp451 452 452 453 WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp … … 527 528 WebProcess/Plugins/Netscape/NetscapePluginNone.cpp 528 529 WebProcess/Plugins/Netscape/NetscapePluginStream.cpp 530 531 WebProcess/Storage/WebToStorageProcessConnection.cpp 529 532 530 533 WebProcess/UserContent/WebUserContentController.cpp … … 580 583 581 584 set(WebKit2_MESSAGES_IN_FILES 582 DatabaseProcess/DatabaseProcess.messages.in583 DatabaseProcess/DatabaseToWebProcessConnection.messages.in584 585 DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in586 587 585 NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in 588 586 … … 606 604 607 605 Shared/Plugins/NPObjectMessageReceiver.messages.in 606 607 StorageProcess/StorageProcess.messages.in 608 StorageProcess/StorageToWebProcessConnection.messages.in 609 610 StorageProcess/IndexedDB/WebIDBConnectionToClient.messages.in 608 611 609 612 UIProcess/DrawingAreaProxy.messages.in … … 622 625 UIProcess/Automation/WebAutomationSession.messages.in 623 626 624 UIProcess/Databases/DatabaseProcessProxy.messages.in625 626 627 UIProcess/Downloads/DownloadProxy.messages.in 627 628 … … 631 632 632 633 UIProcess/Plugins/PluginProcessProxy.messages.in 634 635 UIProcess/Storage/StorageProcessProxy.messages.in 633 636 634 637 UIProcess/UserContent/WebUserContentControllerProxy.messages.in … … 684 687 ) 685 688 686 set( DatabaseProcess_LIBRARIES689 set(StorageProcess_LIBRARIES 687 690 WebKit2 688 691 ) -
trunk/Source/WebKit/ChangeLog
r219985 r219986 1 2017-07-27 Brady Eidson <beidson@apple.com> 2 3 Part 1 of: Rename DatabaseProcess to StorageProcess. 4 https://bugs.webkit.org/show_bug.cgi?id=174879 5 6 Reviewed by Andy Estes. 7 8 This patch is all about renaming source files and renaming the process itself (touching build system files, etc etc). 9 10 Some renaming in actual code did result (Some class/struct names, method names, etc) 11 12 Part 2 (174880) will go through and update all references in code itself from "Database" to "Storage" 13 14 * CMakeLists.txt: 15 * Configurations/Storage-iOS.entitlements: Renamed from Source/WebKit/Configurations/Databases-iOS.entitlements. 16 * Configurations/StorageService.xcconfig: Renamed from Source/WebKit/Configurations/DatabaseService.xcconfig. 17 * Configurations/WebKit.xcconfig: 18 * DerivedSources.make: 19 * Platform/ExtraPrivateSymbolsForTAPI.h: 20 * PlatformGTK.cmake: 21 * PlatformMac.cmake: 22 * PlatformWPE.cmake: 23 24 * Resources/SandboxProfiles/ios/com.apple.WebKit.Storage.sb: Renamed from Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Databases.sb. 25 26 * Shared/Storage/StorageProcessCreationParameters.cpp: Renamed from Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.cpp. 27 (WebKit::StorageProcessCreationParameters::StorageProcessCreationParameters): 28 (WebKit::StorageProcessCreationParameters::encode): 29 (WebKit::StorageProcessCreationParameters::decode): 30 * Shared/Storage/StorageProcessCreationParameters.h: Renamed from Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.h. 31 32 * StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist: Renamed from Source/WebKit/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist. 33 * StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm: Renamed from Source/WebKit/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm. 34 (StorageServiceInitializer): 35 * StorageProcess/EntryPoint/unix/StorageProcessMain.cpp: Renamed from Source/WebKit/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp. 36 (main): 37 38 * StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp: Renamed from Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp. 39 * StorageProcess/IndexedDB/WebIDBConnectionToClient.h: Renamed from Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h. 40 * StorageProcess/IndexedDB/WebIDBConnectionToClient.messages.in: Renamed from Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in. 41 42 * StorageProcess/StorageProcess.cpp: Renamed from Source/WebKit/DatabaseProcess/DatabaseProcess.cpp. 43 * StorageProcess/StorageProcess.h: Renamed from Source/WebKit/DatabaseProcess/DatabaseProcess.h. 44 * StorageProcess/StorageProcess.messages.in: Renamed from Source/WebKit/DatabaseProcess/DatabaseProcess.messages.in. 45 46 * StorageProcess/StorageToWebProcessConnection.cpp: Renamed from Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.cpp. 47 * StorageProcess/StorageToWebProcessConnection.h: Renamed from Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.h. 48 * StorageProcess/StorageToWebProcessConnection.messages.in: Renamed from Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.messages.in. 49 50 * StorageProcess/gtk/StorageProcessMainGtk.cpp: Renamed from Source/WebKit/DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp. 51 (WebKit::StorageProcessMainUnix): 52 * StorageProcess/ios/StorageProcessIOS.mm: Renamed from Source/WebKit/DatabaseProcess/ios/DatabaseProcessIOS.mm. 53 (WebKit::StorageProcess::initializeProcess): 54 (WebKit::StorageProcess::initializeProcessName): 55 (WebKit::StorageProcess::initializeSandbox): 56 * StorageProcess/mac/StorageProcessMac.mm: Renamed from Source/WebKit/DatabaseProcess/mac/DatabaseProcessMac.mm. 57 (WebKit::StorageProcess::initializeProcess): 58 (WebKit::StorageProcess::initializeProcessName): 59 (WebKit::StorageProcess::initializeSandbox): 60 61 * StorageProcess/mac/com.apple.WebKit.Databases.sb.in: Copied from Source/WebKit/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in. 62 * StorageProcess/mac/com.apple.WebKit.Storage.sb.in: Renamed from Source/WebKit/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in. 63 64 * StorageProcess/unix/StorageProcessMainUnix.h: Renamed from Source/WebKit/DatabaseProcess/unix/DatabaseProcessMainUnix.h. 65 66 * UIProcess/Launcher/mac/ProcessLauncherMac.mm: 67 (WebKit::serviceName): 68 69 * UIProcess/Network/NetworkProcessProxy.cpp: 70 (WebKit::NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs): 71 72 * UIProcess/Storage/StorageProcessProxy.cpp: Renamed from Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.cpp. 73 * UIProcess/Storage/StorageProcessProxy.h: Renamed from Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.h. 74 * UIProcess/Storage/StorageProcessProxy.messages.in: Renamed from Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.messages.in. 75 76 * UIProcess/WebContextSupplement.h: 77 (WebKit::WebContextSupplement::processDidClose): 78 79 * UIProcess/WebProcessPool.cpp: 80 (WebKit::WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore): 81 (WebKit::WebProcessPool::databaseProcessCrashed): 82 (WebKit::WebProcessPool::pageAddedToProcess): 83 * UIProcess/WebProcessPool.h: 84 85 * UIProcess/WebsiteData/WebsiteDataStore.cpp: 86 (WebKit::WebsiteDataStore::databaseProcessParameters): 87 * UIProcess/WebsiteData/WebsiteDataStore.h: 88 89 * WebKit.xcodeproj/project.pbxproj: 90 91 * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp: 92 (WebKit::WebIDBConnectionToServer::WebIDBConnectionToServer): 93 (WebKit::WebIDBConnectionToServer::~WebIDBConnectionToServer): 94 * WebProcess/Databases/WebDatabaseProvider.cpp: 95 96 * WebProcess/Storage/WebToStorageProcessConnection.cpp: Renamed from Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.cpp. 97 * WebProcess/Storage/WebToStorageProcessConnection.h: Renamed from Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.h. 98 99 * WebProcess/WebProcess.cpp: 100 1 101 2017-07-27 Tim Horton <timothy_horton@apple.com> 2 102 -
trunk/Source/WebKit/Configurations/Storage-iOS.entitlements
r219985 r219986 5 5 <key>seatbelt-profiles</key> 6 6 <array> 7 <string>com.apple.WebKit. Databases</string>7 <string>com.apple.WebKit.Storage</string> 8 8 </array> 9 9 </dict> -
trunk/Source/WebKit/Configurations/StorageService.xcconfig
r219985 r219986 24 24 #include "BaseXPCService.xcconfig" 25 25 26 WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Databases-iOS;26 WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Storage-iOS; 27 27 28 PRODUCT_NAME = com.apple.WebKit. Databases;28 PRODUCT_NAME = com.apple.WebKit.Storage; 29 29 PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME); 30 INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist;30 INFOPLIST_FILE = StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist; -
trunk/Source/WebKit/Configurations/WebKit.xcconfig
r219055 r219986 71 71 SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order; 72 72 73 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit. Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb com.apple.WebKit.plugin-common.sb PlugInSandboxProfiles/*.sb;73 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; 74 74 75 75 INSTALLHDRS_SCRIPT_PHASE = YES; -
trunk/Source/WebKit/DerivedSources.make
r219966 r219986 23 23 VPATH = \ 24 24 $(WebKit2) \ 25 $(WebKit2)/DatabaseProcess \26 $(WebKit2)/DatabaseProcess/IndexedDB \27 $(WebKit2)/DatabaseProcess/mac \28 25 $(WebKit2)/NetworkProcess \ 29 26 $(WebKit2)/NetworkProcess/CustomProtocols \ … … 37 34 $(WebKit2)/Shared/Authentication \ 38 35 $(WebKit2)/Shared/mac \ 36 $(WebKit2)/StorageProcess \ 37 $(WebKit2)/StorageProcess/IndexedDB \ 38 $(WebKit2)/StorageProcess/mac \ 39 39 $(WebKit2)/WebProcess/ApplePay \ 40 40 $(WebKit2)/WebProcess/ApplicationCache \ … … 73 73 $(WebKit2)/UIProcess/Notifications \ 74 74 $(WebKit2)/UIProcess/Plugins \ 75 $(WebKit2)/UIProcess/Storage \ 75 76 $(WebKit2)/UIProcess/UserContent \ 76 77 $(WebKit2)/UIProcess/WebStorage \ … … 92 93 AuthenticationManager \ 93 94 ChildProcess \ 94 DatabaseProcess \95 DatabaseProcessProxy \96 DatabaseToWebProcessConnection \97 95 DownloadProxy \ 98 96 DrawingArea \ … … 126 124 StorageAreaMap \ 127 125 StorageManager \ 126 StorageProcess \ 127 StorageProcessProxy \ 128 StorageToWebProcessConnection \ 128 129 UserMediaCaptureManager \ 129 130 UserMediaCaptureManagerProxy \ … … 217 218 SANDBOX_PROFILES = \ 218 219 com.apple.WebProcess.sb \ 219 com.apple.WebKit. Databases.sb \220 com.apple.WebKit.Storage.sb \ 220 221 com.apple.WebKit.plugin-common.sb \ 221 222 com.apple.WebKit.NetworkProcess.sb -
trunk/Source/WebKit/Platform/ExtraPrivateSymbolsForTAPI.h
r213427 r219986 31 31 32 32 // FIXME: Remove these after <rdar://problem/30772033> is fixed. 33 void DatabaseServiceInitializer();33 void StorageServiceInitializer(); 34 34 void NetworkServiceInitializer(); 35 35 void PluginServiceInitializer(); -
trunk/Source/WebKit/PlatformGTK.cmake
r219966 r219986 3 3 set(WebKit2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess) 4 4 set(WebKit2_PluginProcess_OUTPUT_NAME WebKitPluginProcess) 5 set(WebKit2_ DatabaseProcess_OUTPUT_NAME WebKitDatabaseProcess)5 set(WebKit2_StorageProcess_OUTPUT_NAME WebKitStorageProcess) 6 6 7 7 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR}) … … 27 27 28 28 list(APPEND WebKit2_SOURCES 29 DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp30 31 29 NetworkProcess/CustomProtocols/soup/LegacyCustomProtocolManagerSoup.cpp 32 30 … … 102 100 103 101 Shared/unix/ChildProcessMain.cpp 102 103 StorageProcess/gtk/StorageProcessMainGtk.cpp 104 104 105 105 UIProcess/AcceleratedDrawingAreaProxy.cpp … … 760 760 list(APPEND WebKit2_INCLUDE_DIRECTORIES 761 761 "${WEBKIT2_DIR}/PluginProcess/unix" 762 "${WEBKIT2_DIR}/DatabaseProcess/unix"763 762 "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup" 764 763 "${WEBKIT2_DIR}/NetworkProcess/Downloads/soup" … … 779 778 "${WEBKIT2_DIR}/Shared/soup" 780 779 "${WEBKIT2_DIR}/Shared/unix" 780 "${WEBKIT2_DIR}/StorageProcess/unix" 781 781 "${WEBKIT2_DIR}/UIProcess/API/C/cairo" 782 782 "${WEBKIT2_DIR}/UIProcess/API/C/gtk" … … 838 838 ) 839 839 840 list(APPEND DatabaseProcess_SOURCES841 DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp840 list(APPEND StorageProcess_SOURCES 841 StorageProcess/EntryPoint/unix/StorageProcessMain.cpp 842 842 ) 843 843 -
trunk/Source/WebKit/PlatformMac.cmake
r219966 r219986 20 20 21 21 list(APPEND WebKit2_SOURCES 22 DatabaseProcess/mac/DatabaseProcessMac.mm23 24 22 NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm 25 23 … … 161 159 Shared/mac/WebHitTestResultData.mm 162 160 Shared/mac/WebMemorySampler.mac.mm 161 162 StorageProcess/mac/StorageProcessMac.mm 163 163 164 164 UIProcess/HighPerformanceGraphicsUsageSampler.cpp … … 452 452 ) 453 453 454 list(APPEND DatabaseProcess_SOURCES455 DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm454 list(APPEND StorageProcess_SOURCES 455 StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm 456 456 ${XPCService_SOURCES} 457 457 ) -
trunk/Source/WebKit/PlatformWPE.cmake
r219966 r219986 48 48 ) 49 49 50 list(APPEND DatabaseProcess_SOURCES51 DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp50 list(APPEND StorageProcess_SOURCES 51 StorageProcess/EntryPoint/unix/StorageProcessMain.cpp 52 52 ) 53 53 … … 262 262 263 263 # FIXME-GWSHARE: 264 DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp264 StorageProcess/gtk/StorageProcessMainGtk.cpp 265 265 ) 266 266 … … 377 377 "${WEBCORE_DIR}/platform/graphics/texmap/coordinated" 378 378 "${WEBCORE_DIR}/platform/network/soup" 379 "${WEBKIT2_DIR}/DatabaseProcess/unix"380 379 "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup" 381 380 "${WEBKIT2_DIR}/NetworkProcess/Downloads/soup" … … 393 392 "${WEBKIT2_DIR}/Shared/unix" 394 393 "${WEBKIT2_DIR}/Shared/wpe" 394 "${WEBKIT2_DIR}/StorageProcess/unix" 395 395 "${WEBKIT2_DIR}/UIProcess/API/C/cairo" 396 396 "${WEBKIT2_DIR}/UIProcess/API/C/wpe" -
trunk/Source/WebKit/Shared/Storage/StorageProcessCreationParameters.cpp
r219985 r219986 25 25 26 26 #include "config.h" 27 #include " DatabaseProcessCreationParameters.h"27 #include "StorageProcessCreationParameters.h" 28 28 29 29 #include "ArgumentCoders.h" … … 31 31 namespace WebKit { 32 32 33 DatabaseProcessCreationParameters::DatabaseProcessCreationParameters()33 StorageProcessCreationParameters::StorageProcessCreationParameters() 34 34 { 35 35 } 36 36 37 void DatabaseProcessCreationParameters::encode(IPC::Encoder& encoder) const37 void StorageProcessCreationParameters::encode(IPC::Encoder& encoder) const 38 38 { 39 39 #if ENABLE(INDEXED_DATABASE) … … 44 44 } 45 45 46 bool DatabaseProcessCreationParameters::decode(IPC::Decoder& decoder, DatabaseProcessCreationParameters& result)46 bool StorageProcessCreationParameters::decode(IPC::Decoder& decoder, StorageProcessCreationParameters& result) 47 47 { 48 48 #if ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/Shared/Storage/StorageProcessCreationParameters.h
r219985 r219986 38 38 namespace WebKit { 39 39 40 struct DatabaseProcessCreationParameters {41 DatabaseProcessCreationParameters();40 struct StorageProcessCreationParameters { 41 StorageProcessCreationParameters(); 42 42 43 43 void encode(IPC::Encoder&) const; 44 static bool decode(IPC::Decoder&, DatabaseProcessCreationParameters&);44 static bool decode(IPC::Decoder&, StorageProcessCreationParameters&); 45 45 46 46 WebCore::SessionID sessionID; -
trunk/Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist
r219985 r219986 26 26 <true/> 27 27 <key>WebKitEntryPoint</key> 28 <string> DatabaseServiceInitializer</string>28 <string>StorageServiceInitializer</string> 29 29 <key>LSUIElement</key> 30 30 <true/> -
trunk/Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm
r219985 r219986 27 27 28 28 #import "EnvironmentUtilities.h" 29 #import " DatabaseProcess.h"29 #import "StorageProcess.h" 30 30 #import "WKBase.h" 31 31 #import "XPCServiceEntryPoint.h" … … 33 33 using namespace WebKit; 34 34 35 extern "C" WK_EXPORT void DatabaseServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage);35 extern "C" WK_EXPORT void StorageServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage); 36 36 37 void DatabaseServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage)37 void StorageServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage) 38 38 { 39 XPCServiceInitializer< DatabaseProcess, XPCServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);39 XPCServiceInitializer<StorageProcess, XPCServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage); 40 40 } -
trunk/Source/WebKit/StorageProcess/EntryPoint/unix/StorageProcessMain.cpp
r219985 r219986 25 25 26 26 #include "config.h" 27 #include " DatabaseProcessMainUnix.h"27 #include "StorageProcessMainUnix.h" 28 28 29 29 using namespace WebKit; … … 31 31 int main(int argc, char** argv) 32 32 { 33 return DatabaseProcessMainUnix(argc, argv);33 return StorageProcessMainUnix(argc, argv); 34 34 } -
trunk/Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp
r219985 r219986 30 30 31 31 #include "DataReference.h" 32 #include " DatabaseProcess.h"32 #include "StorageProcess.h" 33 33 #include "WebCoreArgumentCoders.h" 34 34 #include "WebIDBConnectionToServerMessages.h" … … 46 46 namespace WebKit { 47 47 48 Ref<WebIDBConnectionToClient> WebIDBConnectionToClient::create( DatabaseToWebProcessConnection& connection, uint64_t serverConnectionIdentifier, WebCore::SessionID sessionID)48 Ref<WebIDBConnectionToClient> WebIDBConnectionToClient::create(StorageToWebProcessConnection& connection, uint64_t serverConnectionIdentifier, WebCore::SessionID sessionID) 49 49 { 50 50 return adoptRef(*new WebIDBConnectionToClient(connection, serverConnectionIdentifier, sessionID)); 51 51 } 52 52 53 WebIDBConnectionToClient::WebIDBConnectionToClient( DatabaseToWebProcessConnection& connection, uint64_t serverConnectionIdentifier, WebCore::SessionID sessionID)53 WebIDBConnectionToClient::WebIDBConnectionToClient(StorageToWebProcessConnection& connection, uint64_t serverConnectionIdentifier, WebCore::SessionID sessionID) 54 54 : m_connection(connection) 55 55 , m_identifier(serverConnectionIdentifier) … … 58 58 relaxAdoptionRequirement(); 59 59 m_connectionToClient = IDBServer::IDBConnectionToClient::create(*this); 60 DatabaseProcess::singleton().idbServer(m_sessionID).registerConnection(*m_connectionToClient);60 StorageProcess::singleton().idbServer(m_sessionID).registerConnection(*m_connectionToClient); 61 61 } 62 62 … … 67 67 void WebIDBConnectionToClient::disconnectedFromWebProcess() 68 68 { 69 DatabaseProcess::singleton().idbServer(m_sessionID).unregisterConnection(*m_connectionToClient);69 StorageProcess::singleton().idbServer(m_sessionID).unregisterConnection(*m_connectionToClient); 70 70 } 71 71 … … 160 160 #if ENABLE(SANDBOX_EXTENSIONS) 161 161 RefPtr<WebIDBConnectionToClient> protector(this); 162 DatabaseProcess::singleton().getSandboxExtensionsForBlobFiles(blobFilePaths, [protector, this, resultData](SandboxExtension::HandleArray&& handles) {162 StorageProcess::singleton().getSandboxExtensionsForBlobFiles(blobFilePaths, [protector, this, resultData](SandboxExtension::HandleArray&& handles) { 163 163 send(MessageType({ resultData, WTFMove(handles) })); 164 164 }); … … 225 225 void WebIDBConnectionToClient::deleteDatabase(const IDBRequestData& request) 226 226 { 227 DatabaseProcess::singleton().idbServer(m_sessionID).deleteDatabase(request);227 StorageProcess::singleton().idbServer(m_sessionID).deleteDatabase(request); 228 228 } 229 229 230 230 void WebIDBConnectionToClient::openDatabase(const IDBRequestData& request) 231 231 { 232 DatabaseProcess::singleton().idbServer(m_sessionID).openDatabase(request);232 StorageProcess::singleton().idbServer(m_sessionID).openDatabase(request); 233 233 } 234 234 235 235 void WebIDBConnectionToClient::abortTransaction(const IDBResourceIdentifier& transactionIdentifier) 236 236 { 237 DatabaseProcess::singleton().idbServer(m_sessionID).abortTransaction(transactionIdentifier);237 StorageProcess::singleton().idbServer(m_sessionID).abortTransaction(transactionIdentifier); 238 238 } 239 239 240 240 void WebIDBConnectionToClient::commitTransaction(const IDBResourceIdentifier& transactionIdentifier) 241 241 { 242 DatabaseProcess::singleton().idbServer(m_sessionID).commitTransaction(transactionIdentifier);242 StorageProcess::singleton().idbServer(m_sessionID).commitTransaction(transactionIdentifier); 243 243 } 244 244 245 245 void WebIDBConnectionToClient::didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier) 246 246 { 247 DatabaseProcess::singleton().idbServer(m_sessionID).didFinishHandlingVersionChangeTransaction(databaseConnectionIdentifier, transactionIdentifier);247 StorageProcess::singleton().idbServer(m_sessionID).didFinishHandlingVersionChangeTransaction(databaseConnectionIdentifier, transactionIdentifier); 248 248 } 249 249 250 250 void WebIDBConnectionToClient::createObjectStore(const IDBRequestData& request, const IDBObjectStoreInfo& info) 251 251 { 252 DatabaseProcess::singleton().idbServer(m_sessionID).createObjectStore(request, info);252 StorageProcess::singleton().idbServer(m_sessionID).createObjectStore(request, info); 253 253 } 254 254 255 255 void WebIDBConnectionToClient::deleteObjectStore(const IDBRequestData& request, const String& name) 256 256 { 257 DatabaseProcess::singleton().idbServer(m_sessionID).deleteObjectStore(request, name);257 StorageProcess::singleton().idbServer(m_sessionID).deleteObjectStore(request, name); 258 258 } 259 259 260 260 void WebIDBConnectionToClient::renameObjectStore(const IDBRequestData& request, uint64_t objectStoreIdentifier, const String& newName) 261 261 { 262 DatabaseProcess::singleton().idbServer(m_sessionID).renameObjectStore(request, objectStoreIdentifier, newName);262 StorageProcess::singleton().idbServer(m_sessionID).renameObjectStore(request, objectStoreIdentifier, newName); 263 263 } 264 264 265 265 void WebIDBConnectionToClient::clearObjectStore(const IDBRequestData& request, uint64_t objectStoreIdentifier) 266 266 { 267 DatabaseProcess::singleton().idbServer(m_sessionID).clearObjectStore(request, objectStoreIdentifier);267 StorageProcess::singleton().idbServer(m_sessionID).clearObjectStore(request, objectStoreIdentifier); 268 268 } 269 269 270 270 void WebIDBConnectionToClient::createIndex(const IDBRequestData& request, const IDBIndexInfo& info) 271 271 { 272 DatabaseProcess::singleton().idbServer(m_sessionID).createIndex(request, info);272 StorageProcess::singleton().idbServer(m_sessionID).createIndex(request, info); 273 273 } 274 274 275 275 void WebIDBConnectionToClient::deleteIndex(const IDBRequestData& request, uint64_t objectStoreIdentifier, const String& name) 276 276 { 277 DatabaseProcess::singleton().idbServer(m_sessionID).deleteIndex(request, objectStoreIdentifier, name);277 StorageProcess::singleton().idbServer(m_sessionID).deleteIndex(request, objectStoreIdentifier, name); 278 278 } 279 279 280 280 void WebIDBConnectionToClient::renameIndex(const IDBRequestData& request, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const String& newName) 281 281 { 282 DatabaseProcess::singleton().idbServer(m_sessionID).renameIndex(request, objectStoreIdentifier, indexIdentifier, newName);282 StorageProcess::singleton().idbServer(m_sessionID).renameIndex(request, objectStoreIdentifier, indexIdentifier, newName); 283 283 } 284 284 … … 295 295 IndexedDB::ObjectStoreOverwriteMode mode = static_cast<IndexedDB::ObjectStoreOverwriteMode>(overwriteMode); 296 296 297 DatabaseProcess::singleton().idbServer(m_sessionID).putOrAdd(request, key, value, mode);297 StorageProcess::singleton().idbServer(m_sessionID).putOrAdd(request, key, value, mode); 298 298 } 299 299 300 300 void WebIDBConnectionToClient::getRecord(const IDBRequestData& request, const IDBGetRecordData& getRecordData) 301 301 { 302 DatabaseProcess::singleton().idbServer(m_sessionID).getRecord(request, getRecordData);302 StorageProcess::singleton().idbServer(m_sessionID).getRecord(request, getRecordData); 303 303 } 304 304 305 305 void WebIDBConnectionToClient::getAllRecords(const IDBRequestData& request, const IDBGetAllRecordsData& getAllRecordsData) 306 306 { 307 DatabaseProcess::singleton().idbServer(m_sessionID).getAllRecords(request, getAllRecordsData);307 StorageProcess::singleton().idbServer(m_sessionID).getAllRecords(request, getAllRecordsData); 308 308 } 309 309 310 310 void WebIDBConnectionToClient::getCount(const IDBRequestData& request, const IDBKeyRangeData& range) 311 311 { 312 DatabaseProcess::singleton().idbServer(m_sessionID).getCount(request, range);312 StorageProcess::singleton().idbServer(m_sessionID).getCount(request, range); 313 313 } 314 314 315 315 void WebIDBConnectionToClient::deleteRecord(const IDBRequestData& request, const IDBKeyRangeData& range) 316 316 { 317 DatabaseProcess::singleton().idbServer(m_sessionID).deleteRecord(request, range);317 StorageProcess::singleton().idbServer(m_sessionID).deleteRecord(request, range); 318 318 } 319 319 320 320 void WebIDBConnectionToClient::openCursor(const IDBRequestData& request, const IDBCursorInfo& info) 321 321 { 322 DatabaseProcess::singleton().idbServer(m_sessionID).openCursor(request, info);322 StorageProcess::singleton().idbServer(m_sessionID).openCursor(request, info); 323 323 } 324 324 325 325 void WebIDBConnectionToClient::iterateCursor(const IDBRequestData& request, const IDBIterateCursorData& data) 326 326 { 327 DatabaseProcess::singleton().idbServer(m_sessionID).iterateCursor(request, data);327 StorageProcess::singleton().idbServer(m_sessionID).iterateCursor(request, data); 328 328 } 329 329 330 330 void WebIDBConnectionToClient::establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo& info) 331 331 { 332 DatabaseProcess::singleton().idbServer(m_sessionID).establishTransaction(databaseConnectionIdentifier, info);332 StorageProcess::singleton().idbServer(m_sessionID).establishTransaction(databaseConnectionIdentifier, info); 333 333 } 334 334 335 335 void WebIDBConnectionToClient::databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier) 336 336 { 337 DatabaseProcess::singleton().idbServer(m_sessionID).databaseConnectionPendingClose(databaseConnectionIdentifier);337 StorageProcess::singleton().idbServer(m_sessionID).databaseConnectionPendingClose(databaseConnectionIdentifier); 338 338 } 339 339 340 340 void WebIDBConnectionToClient::databaseConnectionClosed(uint64_t databaseConnectionIdentifier) 341 341 { 342 DatabaseProcess::singleton().idbServer(m_sessionID).databaseConnectionClosed(databaseConnectionIdentifier);342 StorageProcess::singleton().idbServer(m_sessionID).databaseConnectionClosed(databaseConnectionIdentifier); 343 343 } 344 344 345 345 void WebIDBConnectionToClient::abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier) 346 346 { 347 DatabaseProcess::singleton().idbServer(m_sessionID).abortOpenAndUpgradeNeeded(databaseConnectionIdentifier, transactionIdentifier);347 StorageProcess::singleton().idbServer(m_sessionID).abortOpenAndUpgradeNeeded(databaseConnectionIdentifier, transactionIdentifier); 348 348 } 349 349 350 350 void WebIDBConnectionToClient::didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier) 351 351 { 352 DatabaseProcess::singleton().idbServer(m_sessionID).didFireVersionChangeEvent(databaseConnectionIdentifier, transactionIdentifier);352 StorageProcess::singleton().idbServer(m_sessionID).didFireVersionChangeEvent(databaseConnectionIdentifier, transactionIdentifier); 353 353 } 354 354 355 355 void WebIDBConnectionToClient::openDBRequestCancelled(const IDBRequestData& requestData) 356 356 { 357 DatabaseProcess::singleton().idbServer(m_sessionID).openDBRequestCancelled(requestData);357 StorageProcess::singleton().idbServer(m_sessionID).openDBRequestCancelled(requestData); 358 358 } 359 359 360 360 void WebIDBConnectionToClient::confirmDidCloseFromServer(uint64_t databaseConnectionIdentifier) 361 361 { 362 DatabaseProcess::singleton().idbServer(m_sessionID).confirmDidCloseFromServer(databaseConnectionIdentifier);362 StorageProcess::singleton().idbServer(m_sessionID).confirmDidCloseFromServer(databaseConnectionIdentifier); 363 363 } 364 364 365 365 void WebIDBConnectionToClient::getAllDatabaseNames(uint64_t serverConnectionIdentifier, const WebCore::SecurityOriginData& topOrigin, const WebCore::SecurityOriginData& openingOrigin, uint64_t callbackID) 366 366 { 367 DatabaseProcess::singleton().idbServer(m_sessionID).getAllDatabaseNames(serverConnectionIdentifier, topOrigin, openingOrigin, callbackID);367 StorageProcess::singleton().idbServer(m_sessionID).getAllDatabaseNames(serverConnectionIdentifier, topOrigin, openingOrigin, callbackID); 368 368 } 369 369 -
trunk/Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.h
r219985 r219986 28 28 #if ENABLE(INDEXED_DATABASE) 29 29 30 #include "DatabaseToWebProcessConnection.h"31 30 #include "MessageSender.h" 31 #include "StorageToWebProcessConnection.h" 32 32 #include <WebCore/IDBConnectionToClient.h> 33 33 #include <WebCore/SessionID.h> … … 53 53 class WebIDBConnectionToClient final : public WebCore::IDBServer::IDBConnectionToClientDelegate, public IPC::MessageSender, public RefCounted<WebIDBConnectionToClient> { 54 54 public: 55 static Ref<WebIDBConnectionToClient> create( DatabaseToWebProcessConnection&, uint64_t serverConnectionIdentifier, WebCore::SessionID);55 static Ref<WebIDBConnectionToClient> create(StorageToWebProcessConnection&, uint64_t serverConnectionIdentifier, WebCore::SessionID); 56 56 57 57 virtual ~WebIDBConnectionToClient(); … … 127 127 128 128 private: 129 WebIDBConnectionToClient( DatabaseToWebProcessConnection&, uint64_t serverConnectionIdentifier, WebCore::SessionID);129 WebIDBConnectionToClient(StorageToWebProcessConnection&, uint64_t serverConnectionIdentifier, WebCore::SessionID); 130 130 131 131 IPC::Connection* messageSenderConnection() final; … … 133 133 template<class MessageType> void handleGetResult(const WebCore::IDBResultData&); 134 134 135 Ref< DatabaseToWebProcessConnection> m_connection;135 Ref<StorageToWebProcessConnection> m_connection; 136 136 137 137 uint64_t m_identifier; -
trunk/Source/WebKit/StorageProcess/StorageProcess.cpp
r219985 r219986 25 25 26 26 #include "config.h" 27 #include " DatabaseProcess.h"28 29 #include " DatabaseProcessCreationParameters.h"30 #include " DatabaseProcessMessages.h"31 #include " DatabaseProcessProxyMessages.h"32 #include " DatabaseToWebProcessConnection.h"27 #include "StorageProcess.h" 28 29 #include "StorageProcessCreationParameters.h" 30 #include "StorageProcessMessages.h" 31 #include "StorageProcessProxyMessages.h" 32 #include "StorageToWebProcessConnection.h" 33 33 #include "WebCoreArgumentCoders.h" 34 34 #include "WebsiteData.h" … … 45 45 namespace WebKit { 46 46 47 DatabaseProcess& DatabaseProcess::singleton()48 { 49 static NeverDestroyed< DatabaseProcess> databaseProcess;50 return databaseProcess;51 } 52 53 DatabaseProcess::DatabaseProcess()54 : m_queue(WorkQueue::create("com.apple.WebKit. DatabaseProcess"))47 StorageProcess& StorageProcess::singleton() 48 { 49 static NeverDestroyed<StorageProcess> process; 50 return process; 51 } 52 53 StorageProcess::StorageProcess() 54 : m_queue(WorkQueue::create("com.apple.WebKit.StorageProcess")) 55 55 { 56 56 // Make sure the UTF8Encoding encoding and the text encoding maps have been built on the main thread before a background thread needs it. … … 59 59 } 60 60 61 DatabaseProcess::~DatabaseProcess()62 { 63 } 64 65 void DatabaseProcess::initializeConnection(IPC::Connection* connection)61 StorageProcess::~StorageProcess() 62 { 63 } 64 65 void StorageProcess::initializeConnection(IPC::Connection* connection) 66 66 { 67 67 ChildProcess::initializeConnection(connection); 68 68 } 69 69 70 bool DatabaseProcess::shouldTerminate()70 bool StorageProcess::shouldTerminate() 71 71 { 72 72 return true; 73 73 } 74 74 75 void DatabaseProcess::didClose(IPC::Connection&)75 void StorageProcess::didClose(IPC::Connection&) 76 76 { 77 77 stopRunLoop(); 78 78 } 79 79 80 void DatabaseProcess::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)80 void StorageProcess::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder) 81 81 { 82 82 if (messageReceiverMap().dispatchMessage(connection, decoder)) 83 83 return; 84 84 85 if (decoder.messageReceiverName() == Messages:: DatabaseProcess::messageReceiverName()) {86 didReceive DatabaseProcessMessage(connection, decoder);87 return; 88 } 89 } 90 91 #if ENABLE(INDEXED_DATABASE) 92 IDBServer::IDBServer& DatabaseProcess::idbServer(SessionID sessionID)85 if (decoder.messageReceiverName() == Messages::StorageProcess::messageReceiverName()) { 86 didReceiveStorageProcessMessage(connection, decoder); 87 return; 88 } 89 } 90 91 #if ENABLE(INDEXED_DATABASE) 92 IDBServer::IDBServer& StorageProcess::idbServer(SessionID sessionID) 93 93 { 94 94 auto addResult = m_idbServers.add(sessionID, nullptr); … … 103 103 ASSERT(!path.isEmpty()); 104 104 105 addResult.iterator->value = IDBServer::IDBServer::create(path, DatabaseProcess::singleton());105 addResult.iterator->value = IDBServer::IDBServer::create(path, StorageProcess::singleton()); 106 106 return *addResult.iterator->value; 107 107 } 108 108 #endif 109 109 110 void DatabaseProcess::initializeWebsiteDataStore(const DatabaseProcessCreationParameters& parameters)110 void StorageProcess::initializeWebsiteDataStore(const StorageProcessCreationParameters& parameters) 111 111 { 112 112 #if ENABLE(INDEXED_DATABASE) … … 122 122 SandboxExtension::consumePermanently(parameters.indexedDatabaseDirectoryExtensionHandle); 123 123 124 postDatabaseTask(createCrossThreadTask(*this, & DatabaseProcess::ensurePathExists, parameters.indexedDatabaseDirectory));125 #endif 126 } 127 128 void DatabaseProcess::ensurePathExists(const String& path)124 postDatabaseTask(createCrossThreadTask(*this, &StorageProcess::ensurePathExists, parameters.indexedDatabaseDirectory)); 125 #endif 126 } 127 128 void StorageProcess::ensurePathExists(const String& path) 129 129 { 130 130 ASSERT(!RunLoop::isMain()); … … 134 134 } 135 135 136 void DatabaseProcess::postDatabaseTask(CrossThreadTask&& task)136 void StorageProcess::postDatabaseTask(CrossThreadTask&& task) 137 137 { 138 138 ASSERT(RunLoop::isMain()); … … 147 147 } 148 148 149 void DatabaseProcess::performNextDatabaseTask()149 void StorageProcess::performNextDatabaseTask() 150 150 { 151 151 ASSERT(!RunLoop::isMain()); … … 161 161 } 162 162 163 void DatabaseProcess::createDatabaseToWebProcessConnection()163 void StorageProcess::createDatabaseToWebProcessConnection() 164 164 { 165 165 #if USE(UNIX_DOMAIN_SOCKETS) 166 166 IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection(); 167 m_databaseToWebProcessConnections.append( DatabaseToWebProcessConnection::create(socketPair.server));168 parentProcessConnection()->send(Messages:: DatabaseProcessProxy::DidCreateDatabaseToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);167 m_databaseToWebProcessConnections.append(StorageToWebProcessConnection::create(socketPair.server)); 168 parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateDatabaseToWebProcessConnection(IPC::Attachment(socketPair.client)), 0); 169 169 #elif OS(DARWIN) 170 170 // Create the listening port. … … 173 173 174 174 // Create a listening connection. 175 auto connection = DatabaseToWebProcessConnection::create(IPC::Connection::Identifier(listeningPort)); 176 m_databaseToWebProcessConnections.append(WTFMove(connection)); 175 m_databaseToWebProcessConnections.append(StorageToWebProcessConnection::create(IPC::Connection::Identifier(listeningPort))); 177 176 178 177 IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND); 179 parentProcessConnection()->send(Messages:: DatabaseProcessProxy::DidCreateDatabaseToWebProcessConnection(clientPort), 0);178 parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateDatabaseToWebProcessConnection(clientPort), 0); 180 179 #else 181 180 notImplemented(); … … 183 182 } 184 183 185 void DatabaseProcess::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID)184 void StorageProcess::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID) 186 185 { 187 186 #if ENABLE(INDEXED_DATABASE) 188 187 auto completionHandler = [this, callbackID](const WebsiteData& websiteData) { 189 parentProcessConnection()->send(Messages:: DatabaseProcessProxy::DidFetchWebsiteData(callbackID, websiteData), 0);188 parentProcessConnection()->send(Messages::StorageProcessProxy::DidFetchWebsiteData(callbackID, websiteData), 0); 190 189 }; 191 190 … … 211 210 } 212 211 213 void DatabaseProcess::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)212 void StorageProcess::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID) 214 213 { 215 214 #if ENABLE(INDEXED_DATABASE) 216 215 auto completionHandler = [this, callbackID]() { 217 parentProcessConnection()->send(Messages:: DatabaseProcessProxy::DidDeleteWebsiteData(callbackID), 0);216 parentProcessConnection()->send(Messages::StorageProcessProxy::DidDeleteWebsiteData(callbackID), 0); 218 217 }; 219 218 … … 227 226 } 228 227 229 void DatabaseProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<SecurityOriginData>& securityOriginDatas, uint64_t callbackID)228 void StorageProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<SecurityOriginData>& securityOriginDatas, uint64_t callbackID) 230 229 { 231 230 #if ENABLE(INDEXED_DATABASE) 232 231 auto completionHandler = [this, callbackID]() { 233 parentProcessConnection()->send(Messages:: DatabaseProcessProxy::DidDeleteWebsiteDataForOrigins(callbackID), 0);232 parentProcessConnection()->send(Messages::StorageProcessProxy::DidDeleteWebsiteDataForOrigins(callbackID), 0); 234 233 }; 235 234 … … 244 243 245 244 #if ENABLE(SANDBOX_EXTENSIONS) 246 void DatabaseProcess::grantSandboxExtensionsForBlobs(const Vector<String>& paths, const SandboxExtension::HandleArray& handles)245 void StorageProcess::grantSandboxExtensionsForBlobs(const Vector<String>& paths, const SandboxExtension::HandleArray& handles) 247 246 { 248 247 ASSERT(paths.size() == handles.size()); … … 256 255 257 256 #if ENABLE(INDEXED_DATABASE) 258 void DatabaseProcess::prepareForAccessToTemporaryFile(const String& path)257 void StorageProcess::prepareForAccessToTemporaryFile(const String& path) 259 258 { 260 259 if (auto extension = m_blobTemporaryFileSandboxExtensions.get(path)) … … 262 261 } 263 262 264 void DatabaseProcess::accessToTemporaryFileComplete(const String& path)263 void StorageProcess::accessToTemporaryFileComplete(const String& path) 265 264 { 266 265 // We've either hard linked the temporary blob file to the database directory, copied it there, … … 273 272 } 274 273 275 Vector<WebCore::SecurityOriginData> DatabaseProcess::indexedDatabaseOrigins(const String& path)274 Vector<WebCore::SecurityOriginData> StorageProcess::indexedDatabaseOrigins(const String& path) 276 275 { 277 276 if (path.isEmpty()) … … 292 291 293 292 #if ENABLE(SANDBOX_EXTENSIONS) 294 void DatabaseProcess::getSandboxExtensionsForBlobFiles(const Vector<String>& filenames, WTF::Function<void (SandboxExtension::HandleArray&&)>&& completionHandler)293 void StorageProcess::getSandboxExtensionsForBlobFiles(const Vector<String>& filenames, WTF::Function<void (SandboxExtension::HandleArray&&)>&& completionHandler) 295 294 { 296 295 static uint64_t lastRequestID; … … 298 297 uint64_t requestID = ++lastRequestID; 299 298 m_sandboxExtensionForBlobsCompletionHandlers.set(requestID, WTFMove(completionHandler)); 300 parentProcessConnection()->send(Messages:: DatabaseProcessProxy::GetSandboxExtensionsForBlobFiles(requestID, filenames), 0);301 } 302 303 void DatabaseProcess::didGetSandboxExtensionsForBlobFiles(uint64_t requestID, SandboxExtension::HandleArray&& handles)299 parentProcessConnection()->send(Messages::StorageProcessProxy::GetSandboxExtensionsForBlobFiles(requestID, filenames), 0); 300 } 301 302 void StorageProcess::didGetSandboxExtensionsForBlobFiles(uint64_t requestID, SandboxExtension::HandleArray&& handles) 304 303 { 305 304 if (auto handler = m_sandboxExtensionForBlobsCompletionHandlers.take(requestID)) … … 309 308 310 309 #if !PLATFORM(COCOA) 311 void DatabaseProcess::initializeProcess(const ChildProcessInitializationParameters&)312 { 313 } 314 315 void DatabaseProcess::initializeProcessName(const ChildProcessInitializationParameters&)316 { 317 } 318 319 void DatabaseProcess::initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&)310 void StorageProcess::initializeProcess(const ChildProcessInitializationParameters&) 311 { 312 } 313 314 void StorageProcess::initializeProcessName(const ChildProcessInitializationParameters&) 315 { 316 } 317 318 void StorageProcess::initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&) 320 319 { 321 320 } -
trunk/Source/WebKit/StorageProcess/StorageProcess.h
r219985 r219986 41 41 namespace WebKit { 42 42 43 class DatabaseToWebProcessConnection;43 class StorageToWebProcessConnection; 44 44 enum class WebsiteDataType; 45 struct DatabaseProcessCreationParameters;45 struct StorageProcessCreationParameters; 46 46 47 class DatabaseProcess : public ChildProcess47 class StorageProcess : public ChildProcess 48 48 #if ENABLE(INDEXED_DATABASE) 49 49 , public WebCore::IDBServer::IDBBackingStoreTemporaryFileHandler 50 50 #endif 51 51 { 52 WTF_MAKE_NONCOPYABLE( DatabaseProcess);53 friend class NeverDestroyed< DatabaseProcess>;52 WTF_MAKE_NONCOPYABLE(StorageProcess); 53 friend class NeverDestroyed<StorageProcess>; 54 54 public: 55 static DatabaseProcess& singleton();56 ~ DatabaseProcess();55 static StorageProcess& singleton(); 56 ~StorageProcess(); 57 57 58 58 #if ENABLE(INDEXED_DATABASE) … … 75 75 76 76 private: 77 DatabaseProcess();77 StorageProcess(); 78 78 79 79 // ChildProcess … … 87 87 void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override; 88 88 void didClose(IPC::Connection&) override; 89 void didReceive DatabaseProcessMessage(IPC::Connection&, IPC::Decoder&);89 void didReceiveStorageProcessMessage(IPC::Connection&, IPC::Decoder&); 90 90 91 91 // Message Handlers 92 void initializeWebsiteDataStore(const DatabaseProcessCreationParameters&);92 void initializeWebsiteDataStore(const StorageProcessCreationParameters&); 93 93 void createDatabaseToWebProcessConnection(); 94 94 … … 109 109 void ensurePathExists(const String&); 110 110 111 Vector<RefPtr< DatabaseToWebProcessConnection>> m_databaseToWebProcessConnections;111 Vector<RefPtr<StorageToWebProcessConnection>> m_databaseToWebProcessConnections; 112 112 113 113 Ref<WorkQueue> m_queue; -
trunk/Source/WebKit/StorageProcess/StorageProcess.messages.in
r219985 r219986 21 21 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 22 23 messages -> DatabaseProcess LegacyReceiver {24 # Initializes a WebsiteDataStore/Session in the DatabaseProcess with the correct parameters25 InitializeWebsiteDataStore(struct WebKit:: DatabaseProcessCreationParameters processCreationParameters)23 messages -> StorageProcess LegacyReceiver { 24 # Initializes a WebsiteDataStore/Session in the StorageProcess with the correct parameters 25 InitializeWebsiteDataStore(struct WebKit::StorageProcessCreationParameters processCreationParameters) 26 26 27 27 # Creates a connection for communication with a WebProcess -
trunk/Source/WebKit/StorageProcess/StorageToWebProcessConnection.cpp
r219985 r219986 25 25 26 26 #include "config.h" 27 #include " DatabaseToWebProcessConnection.h"27 #include "StorageToWebProcessConnection.h" 28 28 29 #include "DatabaseToWebProcessConnectionMessages.h"30 29 #include "Logging.h" 30 #include "StorageToWebProcessConnectionMessages.h" 31 31 #include "WebIDBConnectionToClient.h" 32 32 #include "WebIDBConnectionToClientMessages.h" … … 35 35 namespace WebKit { 36 36 37 Ref< DatabaseToWebProcessConnection> DatabaseToWebProcessConnection::create(IPC::Connection::Identifier connectionIdentifier)37 Ref<StorageToWebProcessConnection> StorageToWebProcessConnection::create(IPC::Connection::Identifier connectionIdentifier) 38 38 { 39 return adoptRef(*new DatabaseToWebProcessConnection(connectionIdentifier));39 return adoptRef(*new StorageToWebProcessConnection(connectionIdentifier)); 40 40 } 41 41 42 DatabaseToWebProcessConnection::DatabaseToWebProcessConnection(IPC::Connection::Identifier connectionIdentifier)42 StorageToWebProcessConnection::StorageToWebProcessConnection(IPC::Connection::Identifier connectionIdentifier) 43 43 : m_connection(IPC::Connection::createServerConnection(connectionIdentifier, *this)) 44 44 { … … 47 47 } 48 48 49 DatabaseToWebProcessConnection::~DatabaseToWebProcessConnection()49 StorageToWebProcessConnection::~StorageToWebProcessConnection() 50 50 { 51 51 52 52 } 53 53 54 void DatabaseToWebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)54 void StorageToWebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder) 55 55 { 56 if (decoder.messageReceiverName() == Messages:: DatabaseToWebProcessConnection::messageReceiverName()) {57 didReceive DatabaseToWebProcessConnectionMessage(connection, decoder);56 if (decoder.messageReceiverName() == Messages::StorageToWebProcessConnection::messageReceiverName()) { 57 didReceiveStorageToWebProcessConnectionMessage(connection, decoder); 58 58 return; 59 59 } … … 71 71 } 72 72 73 void DatabaseToWebProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)73 void StorageToWebProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder) 74 74 { 75 if (decoder.messageReceiverName() == Messages:: DatabaseToWebProcessConnection::messageReceiverName()) {76 didReceiveSync DatabaseToWebProcessConnectionMessage(connection, decoder, replyEncoder);75 if (decoder.messageReceiverName() == Messages::StorageToWebProcessConnection::messageReceiverName()) { 76 didReceiveSyncStorageToWebProcessConnectionMessage(connection, decoder, replyEncoder); 77 77 return; 78 78 } … … 81 81 } 82 82 83 void DatabaseToWebProcessConnection::didClose(IPC::Connection&)83 void StorageToWebProcessConnection::didClose(IPC::Connection&) 84 84 { 85 85 #if ENABLE(INDEXED_DATABASE) … … 92 92 } 93 93 94 void DatabaseToWebProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)94 void StorageToWebProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) 95 95 { 96 96 … … 106 106 } 107 107 108 void DatabaseToWebProcessConnection::establishIDBConnectionToServer(WebCore::SessionID sessionID, uint64_t& serverConnectionIdentifier)108 void StorageToWebProcessConnection::establishIDBConnectionToServer(WebCore::SessionID sessionID, uint64_t& serverConnectionIdentifier) 109 109 { 110 110 serverConnectionIdentifier = generateConnectionToServerIdentifier(); 111 LOG(IndexedDB, " DatabaseToWebProcessConnection::establishIDBConnectionToServer - %" PRIu64, serverConnectionIdentifier);111 LOG(IndexedDB, "StorageToWebProcessConnection::establishIDBConnectionToServer - %" PRIu64, serverConnectionIdentifier); 112 112 ASSERT(!m_webIDBConnections.contains(serverConnectionIdentifier)); 113 113 … … 115 115 } 116 116 117 void DatabaseToWebProcessConnection::removeIDBConnectionToServer(uint64_t serverConnectionIdentifier)117 void StorageToWebProcessConnection::removeIDBConnectionToServer(uint64_t serverConnectionIdentifier) 118 118 { 119 119 ASSERT(m_webIDBConnections.contains(serverConnectionIdentifier)); -
trunk/Source/WebKit/StorageProcess/StorageToWebProcessConnection.h
r219985 r219986 36 36 class WebIDBConnectionToClient; 37 37 38 class DatabaseToWebProcessConnection : public RefCounted<DatabaseToWebProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender {38 class StorageToWebProcessConnection : public RefCounted<StorageToWebProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender { 39 39 public: 40 static Ref< DatabaseToWebProcessConnection> create(IPC::Connection::Identifier);41 ~ DatabaseToWebProcessConnection();40 static Ref<StorageToWebProcessConnection> create(IPC::Connection::Identifier); 41 ~StorageToWebProcessConnection(); 42 42 43 43 IPC::Connection& connection() { return m_connection.get(); } 44 44 45 45 private: 46 DatabaseToWebProcessConnection(IPC::Connection::Identifier);46 StorageToWebProcessConnection(IPC::Connection::Identifier); 47 47 48 48 // IPC::Connection::Client … … 51 51 void didClose(IPC::Connection&) override; 52 52 void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override; 53 void didReceive DatabaseToWebProcessConnectionMessage(IPC::Connection&, IPC::Decoder&);54 void didReceiveSync DatabaseToWebProcessConnectionMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&);53 void didReceiveStorageToWebProcessConnectionMessage(IPC::Connection&, IPC::Decoder&); 54 void didReceiveSyncStorageToWebProcessConnectionMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&); 55 55 56 56 // IPC::MessageSender -
trunk/Source/WebKit/StorageProcess/StorageToWebProcessConnection.messages.in
r219985 r219986 21 21 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 22 23 messages -> DatabaseToWebProcessConnection LegacyReceiver {23 messages -> StorageToWebProcessConnection LegacyReceiver { 24 24 #if ENABLE(INDEXED_DATABASE) 25 25 # Creates a connection for communication with a WebProcess -
trunk/Source/WebKit/StorageProcess/gtk/StorageProcessMainGtk.cpp
r219985 r219986 25 25 26 26 #include "config.h" 27 #include " DatabaseProcessMainUnix.h"27 #include "StorageProcessMainUnix.h" 28 28 29 29 #include "ChildProcessMain.h" 30 #include " DatabaseProcess.h"30 #include "StorageProcess.h" 31 31 32 32 namespace WebKit { 33 33 34 int DatabaseProcessMainUnix(int argc, char** argv)34 int StorageProcessMainUnix(int argc, char** argv) 35 35 { 36 return ChildProcessMain< DatabaseProcess, ChildProcessMainBase>(argc, argv);36 return ChildProcessMain<StorageProcess, ChildProcessMainBase>(argc, argv); 37 37 } 38 38 -
trunk/Source/WebKit/StorageProcess/ios/StorageProcessIOS.mm
r219985 r219986 28 28 #if PLATFORM(IOS) 29 29 30 #import " DatabaseProcess.h"30 #import "StorageProcess.h" 31 31 32 32 #import "SandboxInitializationParameters.h" … … 42 42 namespace WebKit { 43 43 44 void DatabaseProcess::initializeProcess(const ChildProcessInitializationParameters&)44 void StorageProcess::initializeProcess(const ChildProcessInitializationParameters&) 45 45 { 46 46 } 47 47 48 void DatabaseProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)48 void StorageProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters) 49 49 { 50 50 } 51 51 52 void DatabaseProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)52 void StorageProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters) 53 53 { 54 54 #if ENABLE_MANUAL_DATABASE_SANDBOXING 55 55 // Need to override the default, because service has a different bundle ID. 56 56 NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")]; 57 sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit. Databases" ofType:@"sb"]);57 sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.Storage" ofType:@"sb"]); 58 58 ChildProcess::initializeSandbox(parameters, sandboxParameters); 59 59 #endif -
trunk/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm
r219985 r219986 28 28 #if PLATFORM(MAC) 29 29 30 #import " DatabaseProcess.h"30 #import "StorageProcess.h" 31 31 32 32 #import "SandboxInitializationParameters.h" … … 39 39 namespace WebKit { 40 40 41 void DatabaseProcess::initializeProcess(const ChildProcessInitializationParameters&)41 void StorageProcess::initializeProcess(const ChildProcessInitializationParameters&) 42 42 { 43 43 // Having a window server connection in this process would result in spin logs (<rdar://problem/13239119>). … … 45 45 } 46 46 47 void DatabaseProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)47 void StorageProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters) 48 48 { 49 49 NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Database Storage", "visible name of the database process. The argument is the application name."), (NSString *)parameters.uiProcessName]; … … 51 51 } 52 52 53 void DatabaseProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)53 void StorageProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters) 54 54 { 55 55 // Need to overide the default, because service has a different bundle ID. 56 56 NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")]; 57 sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit. Databases" ofType:@"sb"]);57 sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.Storage" ofType:@"sb"]); 58 58 59 59 ChildProcess::initializeSandbox(parameters, sandboxParameters); -
trunk/Source/WebKit/StorageProcess/unix/StorageProcessMainUnix.h
r219985 r219986 31 31 32 32 extern "C" { 33 WK_EXPORT int DatabaseProcessMainUnix(int argc, char** argv);33 WK_EXPORT int StorageProcessMainUnix(int argc, char** argv); 34 34 } 35 35 -
trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm
r219960 r219986 57 57 return "com.apple.WebKit.Networking"; 58 58 case ProcessLauncher::ProcessType::Database: 59 return "com.apple.WebKit. Databases";59 return "com.apple.WebKit.Storage"; 60 60 #if ENABLE(NETSCAPE_PLUGIN_API) 61 61 case ProcessLauncher::ProcessType::Plugin32: -
trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
r219960 r219986 28 28 29 29 #include "AuthenticationChallengeProxy.h" 30 #include "DatabaseProcessMessages.h"31 30 #include "DownloadProxyMessages.h" 32 31 #include "LegacyCustomProtocolManagerProxyMessages.h" … … 35 34 #include "NetworkProcessMessages.h" 36 35 #include "SandboxExtension.h" 36 #include "StorageProcessMessages.h" 37 37 #include "WebPageProxy.h" 38 38 #include "WebProcessMessages.h" … … 300 300 } 301 301 302 m_processPool.sendToDatabaseProcessRelaunchingIfNecessary(Messages:: DatabaseProcess::GrantSandboxExtensionsForBlobs(paths, extensions));302 m_processPool.sendToDatabaseProcessRelaunchingIfNecessary(Messages::StorageProcess::GrantSandboxExtensionsForBlobs(paths, extensions)); 303 303 #endif 304 304 connection()->send(Messages::NetworkProcess::DidGrantSandboxExtensionsToDatabaseProcessForBlobs(requestID), 0); -
trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp
r219985 r219986 25 25 26 26 #include "config.h" 27 #include "DatabaseProcessProxy.h" 28 29 #include "DatabaseProcessMessages.h" 30 #include "DatabaseProcessProxyMessages.h" 27 #include "StorageProcessProxy.h" 28 31 29 #include "NetworkProcessMessages.h" 30 #include "StorageProcessMessages.h" 31 #include "StorageProcessProxyMessages.h" 32 32 #include "WebProcessPool.h" 33 33 #include "WebsiteData.h" … … 45 45 } 46 46 47 Ref< DatabaseProcessProxy> DatabaseProcessProxy::create(WebProcessPool* processPool)48 { 49 return adoptRef(*new DatabaseProcessProxy(processPool));50 } 51 52 DatabaseProcessProxy::DatabaseProcessProxy(WebProcessPool* processPool)47 Ref<StorageProcessProxy> StorageProcessProxy::create(WebProcessPool* processPool) 48 { 49 return adoptRef(*new StorageProcessProxy(processPool)); 50 } 51 52 StorageProcessProxy::StorageProcessProxy(WebProcessPool* processPool) 53 53 : ChildProcessProxy(processPool->alwaysRunsAtBackgroundPriority()) 54 54 , m_processPool(processPool) … … 58 58 } 59 59 60 DatabaseProcessProxy::~DatabaseProcessProxy()60 StorageProcessProxy::~StorageProcessProxy() 61 61 { 62 62 ASSERT(m_pendingFetchWebsiteDataCallbacks.isEmpty()); … … 65 65 } 66 66 67 void DatabaseProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)67 void StorageProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions) 68 68 { 69 69 launchOptions.processType = ProcessLauncher::ProcessType::Database; … … 71 71 } 72 72 73 void DatabaseProcessProxy::processWillShutDown(IPC::Connection& connection)73 void StorageProcessProxy::processWillShutDown(IPC::Connection& connection) 74 74 { 75 75 ASSERT_UNUSED(connection, this->connection() == &connection); 76 76 } 77 77 78 void DatabaseProcessProxy::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)79 { 80 if (decoder.messageReceiverName() == Messages:: DatabaseProcessProxy::messageReceiverName()) {81 didReceive DatabaseProcessProxyMessage(connection, decoder);78 void StorageProcessProxy::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder) 79 { 80 if (decoder.messageReceiverName() == Messages::StorageProcessProxy::messageReceiverName()) { 81 didReceiveStorageProcessProxyMessage(connection, decoder); 82 82 return; 83 83 } 84 84 } 85 85 86 void DatabaseProcessProxy::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WTF::Function<void (WebsiteData)>&& completionHandler)86 void StorageProcessProxy::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WTF::Function<void (WebsiteData)>&& completionHandler) 87 87 { 88 88 ASSERT(canSendMessage()); … … 91 91 m_pendingFetchWebsiteDataCallbacks.add(callbackID, WTFMove(completionHandler)); 92 92 93 send(Messages:: DatabaseProcess::FetchWebsiteData(sessionID, dataTypes, callbackID), 0);94 } 95 96 void DatabaseProcessProxy::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::chrono::system_clock::time_point modifiedSince, WTF::Function<void ()>&& completionHandler)93 send(Messages::StorageProcess::FetchWebsiteData(sessionID, dataTypes, callbackID), 0); 94 } 95 96 void StorageProcessProxy::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::chrono::system_clock::time_point modifiedSince, WTF::Function<void ()>&& completionHandler) 97 97 { 98 98 auto callbackID = generateCallbackID(); 99 99 100 100 m_pendingDeleteWebsiteDataCallbacks.add(callbackID, WTFMove(completionHandler)); 101 send(Messages:: DatabaseProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);102 } 103 104 void DatabaseProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<WebCore::SecurityOriginData>& origins, WTF::Function<void()>&& completionHandler)101 send(Messages::StorageProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0); 102 } 103 104 void StorageProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<WebCore::SecurityOriginData>& origins, WTF::Function<void()>&& completionHandler) 105 105 { 106 106 ASSERT(canSendMessage()); … … 109 109 m_pendingDeleteWebsiteDataForOriginsCallbacks.add(callbackID, WTFMove(completionHandler)); 110 110 111 send(Messages:: DatabaseProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, origins, callbackID), 0);112 } 113 114 void DatabaseProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)111 send(Messages::StorageProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, origins, callbackID), 0); 112 } 113 114 void StorageProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply) 115 115 { 116 116 m_pendingConnectionReplies.append(WTFMove(reply)); … … 121 121 } 122 122 123 send(Messages:: DatabaseProcess::CreateDatabaseToWebProcessConnection(), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);124 } 125 126 void DatabaseProcessProxy::didClose(IPC::Connection&)123 send(Messages::StorageProcess::CreateDatabaseToWebProcessConnection(), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply); 124 } 125 126 void StorageProcessProxy::didClose(IPC::Connection&) 127 127 { 128 128 // The database process must have crashed or exited, so send any pending sync replies we might have. … … 155 155 } 156 156 157 void DatabaseProcessProxy::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)158 { 159 } 160 161 void DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection(const IPC::Attachment& connectionIdentifier)157 void StorageProcessProxy::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) 158 { 159 } 160 161 void StorageProcessProxy::didCreateDatabaseToWebProcessConnection(const IPC::Attachment& connectionIdentifier) 162 162 { 163 163 ASSERT(!m_pendingConnectionReplies.isEmpty()); … … 174 174 } 175 175 176 void DatabaseProcessProxy::didFetchWebsiteData(uint64_t callbackID, const WebsiteData& websiteData)176 void StorageProcessProxy::didFetchWebsiteData(uint64_t callbackID, const WebsiteData& websiteData) 177 177 { 178 178 auto callback = m_pendingFetchWebsiteDataCallbacks.take(callbackID); … … 180 180 } 181 181 182 void DatabaseProcessProxy::didDeleteWebsiteData(uint64_t callbackID)182 void StorageProcessProxy::didDeleteWebsiteData(uint64_t callbackID) 183 183 { 184 184 auto callback = m_pendingDeleteWebsiteDataCallbacks.take(callbackID); … … 186 186 } 187 187 188 void DatabaseProcessProxy::didDeleteWebsiteDataForOrigins(uint64_t callbackID)188 void StorageProcessProxy::didDeleteWebsiteDataForOrigins(uint64_t callbackID) 189 189 { 190 190 auto callback = m_pendingDeleteWebsiteDataForOriginsCallbacks.take(callbackID); … … 193 193 194 194 #if ENABLE(SANDBOX_EXTENSIONS) 195 void DatabaseProcessProxy::getSandboxExtensionsForBlobFiles(uint64_t requestID, const Vector<String>& paths)195 void StorageProcessProxy::getSandboxExtensionsForBlobFiles(uint64_t requestID, const Vector<String>& paths) 196 196 { 197 197 SandboxExtension::HandleArray extensions; … … 202 202 } 203 203 204 send(Messages:: DatabaseProcess::DidGetSandboxExtensionsForBlobFiles(requestID, extensions), 0);204 send(Messages::StorageProcess::DidGetSandboxExtensionsForBlobFiles(requestID, extensions), 0); 205 205 } 206 206 #endif 207 207 208 void DatabaseProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)208 void StorageProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier) 209 209 { 210 210 ChildProcessProxy::didFinishLaunching(launcher, connectionIdentifier); … … 216 216 217 217 for (unsigned i = 0; i < m_numPendingConnectionRequests; ++i) 218 send(Messages:: DatabaseProcess::CreateDatabaseToWebProcessConnection(), 0);218 send(Messages::StorageProcess::CreateDatabaseToWebProcessConnection(), 0); 219 219 220 220 m_numPendingConnectionRequests = 0; -
trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h
r219985 r219986 44 44 struct WebsiteData; 45 45 46 class DatabaseProcessProxy : public ChildProcessProxy {46 class StorageProcessProxy : public ChildProcessProxy { 47 47 public: 48 static Ref< DatabaseProcessProxy> create(WebProcessPool*);49 ~ DatabaseProcessProxy();48 static Ref<StorageProcessProxy> create(WebProcessPool*); 49 ~StorageProcessProxy(); 50 50 51 51 void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, WTF::Function<void(WebsiteData)>&& completionHandler); … … 56 56 57 57 private: 58 DatabaseProcessProxy(WebProcessPool*);58 StorageProcessProxy(WebProcessPool*); 59 59 60 60 // ChildProcessProxy … … 67 67 void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override; 68 68 69 void didReceive DatabaseProcessProxyMessage(IPC::Connection&, IPC::Decoder&);69 void didReceiveStorageProcessProxyMessage(IPC::Connection&, IPC::Decoder&); 70 70 71 71 // Message handlers -
trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.messages.in
r219985 r219986 21 21 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 22 23 messages -> DatabaseProcessProxy LegacyReceiver {23 messages -> StorageProcessProxy LegacyReceiver { 24 24 DidCreateDatabaseToWebProcessConnection(IPC::Attachment connectionIdentifier) 25 25 -
trunk/Source/WebKit/UIProcess/WebContextSupplement.h
r196732 r219986 29 29 namespace WebKit { 30 30 31 class DatabaseProcessProxy;32 31 class NetworkProcessProxy; 32 class StorageProcessProxy; 33 33 class WebProcessPool; 34 34 class WebProcessProxy; … … 57 57 } 58 58 59 virtual void processDidClose( DatabaseProcessProxy*)59 virtual void processDidClose(StorageProcessProxy*) 60 60 { 61 61 } -
trunk/Source/WebKit/UIProcess/WebProcessPool.cpp
r219960 r219986 36 36 #include "APIPageConfiguration.h" 37 37 #include "APIProcessPoolConfiguration.h" 38 #include "DatabaseProcessCreationParameters.h"39 #include "DatabaseProcessMessages.h"40 38 #include "DownloadProxy.h" 41 39 #include "DownloadProxyMessages.h" … … 50 48 #include "SandboxExtension.h" 51 49 #include "StatisticsData.h" 50 #include "StorageProcessCreationParameters.h" 51 #include "StorageProcessMessages.h" 52 52 #include "TextChecker.h" 53 53 #include "UIGamepad.h" … … 522 522 523 523 if (!m_databaseProcess) { 524 m_databaseProcess = DatabaseProcessProxy::create(this);525 526 DatabaseProcessCreationParameters parameters;524 m_databaseProcess = StorageProcessProxy::create(this); 525 526 StorageProcessCreationParameters parameters; 527 527 #if ENABLE(INDEXED_DATABASE) 528 528 ASSERT(!m_configuration->indexedDBDatabaseDirectory().isEmpty()); … … 534 534 535 535 ASSERT(!parameters.indexedDatabaseDirectory.isEmpty()); 536 m_databaseProcess->send(Messages:: DatabaseProcess::InitializeWebsiteDataStore(parameters), 0);536 m_databaseProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(parameters), 0); 537 537 } 538 538 … … 540 540 return; 541 541 542 m_databaseProcess->send(Messages:: DatabaseProcess::InitializeWebsiteDataStore(relevantDataStore->databaseProcessParameters()), 0);542 m_databaseProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(relevantDataStore->databaseProcessParameters()), 0); 543 543 } 544 544 … … 550 550 } 551 551 552 void WebProcessPool::databaseProcessCrashed( DatabaseProcessProxy* databaseProcessProxy)552 void WebProcessPool::databaseProcessCrashed(StorageProcessProxy* databaseProcessProxy) 553 553 { 554 554 ASSERT(m_databaseProcess); … … 962 962 auto databaseParameters = page.websiteDataStore().databaseProcessParameters(); 963 963 if (!databaseParameters.indexedDatabaseDirectory.isEmpty()) 964 sendToDatabaseProcessRelaunchingIfNecessary(Messages:: DatabaseProcess::InitializeWebsiteDataStore(databaseParameters));964 sendToDatabaseProcessRelaunchingIfNecessary(Messages::StorageProcess::InitializeWebsiteDataStore(databaseParameters)); 965 965 #endif 966 966 } -
trunk/Source/WebKit/UIProcess/WebProcessPool.h
r219960 r219986 30 30 #include "APIProcessPoolConfiguration.h" 31 31 #include "APIWebsiteDataStore.h" 32 #include "DatabaseProcessProxy.h"33 32 #include "DownloadProxyMap.h" 34 33 #include "GenericCallback.h" … … 41 40 #include "ProcessThrottler.h" 42 41 #include "StatisticsRequest.h" 42 #include "StorageProcessProxy.h" 43 43 #include "VisitedLinkStore.h" 44 44 #include "WebContextClient.h" … … 314 314 315 315 void ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore); 316 DatabaseProcessProxy* databaseProcess() { return m_databaseProcess.get(); }316 StorageProcessProxy* databaseProcess() { return m_databaseProcess.get(); } 317 317 void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&); 318 void databaseProcessCrashed( DatabaseProcessProxy*);318 void databaseProcessCrashed(StorageProcessProxy*); 319 319 320 320 #if PLATFORM(COCOA) … … 550 550 bool m_didNetworkProcessCrash; 551 551 RefPtr<NetworkProcessProxy> m_networkProcess; 552 RefPtr< DatabaseProcessProxy> m_databaseProcess;552 RefPtr<StorageProcessProxy> m_databaseProcess; 553 553 554 554 HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks; -
trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
r219974 r219986 29 29 #include "APIProcessPoolConfiguration.h" 30 30 #include "APIWebsiteDataRecord.h" 31 #include "DatabaseProcessCreationParameters.h"32 31 #include "NetworkProcessMessages.h" 33 32 #include "StorageManager.h" 33 #include "StorageProcessCreationParameters.h" 34 34 #include "WebCookieManagerProxy.h" 35 35 #include "WebProcessMessages.h" … … 1316 1316 } 1317 1317 1318 DatabaseProcessCreationParameters WebsiteDataStore::databaseProcessParameters()1318 StorageProcessCreationParameters WebsiteDataStore::databaseProcessParameters() 1319 1319 { 1320 1320 resolveDirectoriesIfNecessary(); 1321 1321 1322 DatabaseProcessCreationParameters parameters;1322 StorageProcessCreationParameters parameters; 1323 1323 1324 1324 parameters.sessionID = m_sessionID; -
trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
r219904 r219986 55 55 enum class WebsiteDataFetchOption; 56 56 enum class WebsiteDataType; 57 struct DatabaseProcessCreationParameters;57 struct StorageProcessCreationParameters; 58 58 struct WebsiteDataRecord; 59 59 struct WebsiteDataStoreParameters; … … 122 122 123 123 WebsiteDataStoreParameters parameters(); 124 DatabaseProcessCreationParameters databaseProcessParameters();124 StorageProcessCreationParameters databaseProcessParameters(); 125 125 126 126 Vector<WebCore::Cookie> pendingCookies() const; -
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
r219966 r219986 916 916 4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F601430155C5A32001FBDE0 /* BlockingResponseMap.h */; }; 917 917 51021E9C12B16788005C033C /* WebContextMenuClientMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51021E9B12B16788005C033C /* WebContextMenuClientMac.mm */; }; 918 51032F18180F73BB00961BB7 /* WebToDatabaseProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51032F16180F73BB00961BB7 /* WebToDatabaseProcessConnection.cpp */; };919 51032F19180F73BB00961BB7 /* WebToDatabaseProcessConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 51032F17180F73BB00961BB7 /* WebToDatabaseProcessConnection.h */; };920 51032F1D180F791700961BB7 /* DatabaseToWebProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51032F1B180F791700961BB7 /* DatabaseToWebProcessConnectionMessageReceiver.cpp */; };921 51032F1E180F791700961BB7 /* DatabaseToWebProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51032F1C180F791700961BB7 /* DatabaseToWebProcessConnectionMessages.h */; };922 918 5104F5A21F19D7D2004CF821 /* CookieStorageUtilsCF.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5104F5A11F19D7CF004CF821 /* CookieStorageUtilsCF.mm */; }; 923 919 5105236F1C739D42007993CB /* WebIDBConnectionToClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5105236D1C7393E9007993CB /* WebIDBConnectionToClient.cpp */; }; … … 938 934 5110AE0C133C16CB0072717A /* WKIconDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5110AE0A133C16CB0072717A /* WKIconDatabase.cpp */; }; 939 935 5110AE0D133C16CB0072717A /* WKIconDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 5110AE0B133C16CB0072717A /* WKIconDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; }; 936 5118E99B1F295266003EF9F5 /* WebToStorageProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5118E9991F295259003EF9F5 /* WebToStorageProcessConnection.cpp */; }; 937 5118E99C1F295266003EF9F5 /* WebToStorageProcessConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 5118E99A1F295259003EF9F5 /* WebToStorageProcessConnection.h */; }; 938 5118E9A01F295326003EF9F5 /* StorageProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5118E99E1F29531F003EF9F5 /* StorageProcessCreationParameters.cpp */; }; 939 5118E9A11F295326003EF9F5 /* StorageProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 5118E99F1F29531F003EF9F5 /* StorageProcessCreationParameters.h */; }; 940 5118E9A81F295977003EF9F5 /* StorageProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5118E9A51F295963003EF9F5 /* StorageProcessMessageReceiver.cpp */; }; 941 5118E9A91F295977003EF9F5 /* StorageProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 5118E9A61F295963003EF9F5 /* StorageProcessMessages.h */; }; 942 5118E9AA1F295977003EF9F5 /* StorageProcessProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5118E9A71F295963003EF9F5 /* StorageProcessProxyMessageReceiver.cpp */; }; 943 5118E9AB1F295977003EF9F5 /* StorageProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 5118E9A21F295963003EF9F5 /* StorageProcessProxyMessages.h */; }; 944 5118E9AC1F295977003EF9F5 /* StorageToWebProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5118E9A31F295963003EF9F5 /* StorageToWebProcessConnectionMessageReceiver.cpp */; }; 945 5118E9AD1F295977003EF9F5 /* StorageToWebProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 5118E9A41F295963003EF9F5 /* StorageToWebProcessConnectionMessages.h */; }; 940 946 511F7D411EB1BCF500E47B83 /* WebsiteDataStoreParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F7D401EB1BCEE00E47B83 /* WebsiteDataStoreParameters.h */; }; 941 947 511F7D421EB1BCF800E47B83 /* WebsiteDataStoreParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511F7D3F1EB1BCEE00E47B83 /* WebsiteDataStoreParameters.cpp */; }; … … 955 961 512935E31288D97800A4B695 /* InjectedBundlePageContextMenuClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512935E11288D97800A4B695 /* InjectedBundlePageContextMenuClient.cpp */; }; 956 962 512935E41288D97800A4B695 /* InjectedBundlePageContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 512935E21288D97800A4B695 /* InjectedBundlePageContextMenuClient.h */; }; 957 512A9760180E031D0039A149 /* DatabaseProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512A975E180E03160039A149 /* DatabaseProcessMessageReceiver.cpp */; };958 512A9761180E031D0039A149 /* DatabaseProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 512A975F180E03160039A149 /* DatabaseProcessMessages.h */; };959 512A9769180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512A9767180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp */; };960 512A976A180E09B80039A149 /* DatabaseProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 512A9768180E09B80039A149 /* DatabaseProcessProxyMessages.h */; };961 963 512E34E4130B4D0500ABD19A /* WKApplicationCacheManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */; }; 962 964 512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 1004 1006 515E7727183DD6F60007203F /* AsyncRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E7725183DD6F60007203F /* AsyncRequest.cpp */; }; 1005 1007 515E7728183DD6F60007203F /* AsyncRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E7726183DD6F60007203F /* AsyncRequest.h */; }; 1006 515E772B184008B90007203F /* DatabaseProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E7729184008B90007203F /* DatabaseProcessCreationParameters.cpp */; };1007 515E772C184008B90007203F /* DatabaseProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E772A184008B90007203F /* DatabaseProcessCreationParameters.h */; };1008 1008 5160BFE113381DF900918999 /* LoggingFoundation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160BFE013381DF900918999 /* LoggingFoundation.mm */; }; 1009 1009 516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */; }; … … 1018 1018 517CF0E3163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */; }; 1019 1019 517CF0E4163A486C00C2950E /* NetworkProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */; }; 1020 517DD5BE180DA7D30081660B /* DatabaseProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517DD5BC180DA7D30081660B /* DatabaseProcessProxy.cpp */; };1021 517DD5BF180DA7D30081660B /* DatabaseProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 517DD5BD180DA7D30081660B /* DatabaseProcessProxy.h */; };1020 517DD5BE180DA7D30081660B /* StorageProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517DD5BC180DA7D30081660B /* StorageProcessProxy.cpp */; }; 1021 517DD5BF180DA7D30081660B /* StorageProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 517DD5BD180DA7D30081660B /* StorageProcessProxy.h */; }; 1022 1022 5183DDEC1630BDFC008BE5C7 /* NetworkProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5105B0D4162F7A7A00E27709 /* NetworkProcessConnection.cpp */; }; 1023 1023 51871B5B127CB89D00F76232 /* WebContextMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51871B59127CB89D00F76232 /* WebContextMenu.cpp */; }; … … 1050 1050 51C0C9741DDD76000032CAD3 /* IconLoadingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C0C9721DDD74F00032CAD3 /* IconLoadingDelegate.h */; }; 1051 1051 51C0C9751DDD76030032CAD3 /* IconLoadingDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51C0C9731DDD74F00032CAD3 /* IconLoadingDelegate.mm */; }; 1052 51C3B2871F2A64C5001427FF /* com.apple.WebKit.Storage.sb in Resources */ = {isa = PBXBuildFile; fileRef = 51C3B2861F2A64AE001427FF /* com.apple.WebKit.Storage.sb */; }; 1052 1053 51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */; }; 1053 1054 51CD1C5E1B3493B400142CA5 /* WKSecurityOriginRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CD1C5A1B3493A900142CA5 /* WKSecurityOriginRef.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 1075 1076 51E351CA180F2CCC00E53BE9 /* IDBUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E351C8180F2CCC00E53BE9 /* IDBUtilities.cpp */; }; 1076 1077 51E351CB180F2CCC00E53BE9 /* IDBUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E351C9180F2CCC00E53BE9 /* IDBUtilities.h */; }; 1077 51E351FF180F5D0F00E53BE9 /* DatabaseProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E351FA180F5D0B00E53BE9 /* DatabaseProcess.cpp */; };1078 51E35200180F5D0F00E53BE9 /* DatabaseToWebProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E351FD180F5D0B00E53BE9 /* DatabaseToWebProcessConnection.cpp */; };1079 51E35202180F5D1E00E53BE9 /* DatabaseProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35201180F5D1E00E53BE9 /* DatabaseProcessMac.mm */; };1080 51E35209180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */; };1078 51E351FF180F5D0F00E53BE9 /* StorageProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E351FA180F5D0B00E53BE9 /* StorageProcess.cpp */; }; 1079 51E35200180F5D0F00E53BE9 /* StorageToWebProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E351FD180F5D0B00E53BE9 /* StorageToWebProcessConnection.cpp */; }; 1080 51E35202180F5D1E00E53BE9 /* StorageProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35201180F5D1E00E53BE9 /* StorageProcessMac.mm */; }; 1081 51E35209180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35208180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm */; }; 1081 1082 51E399061D6F54C7009C8831 /* UIGamepadProviderCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E399051D6F54C5009C8831 /* UIGamepadProviderCocoa.mm */; }; 1082 1083 51E6C1601F29356000FD3437 /* ResourceLoadStatisticsPersistentStorageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E6C15F1F29355100FD3437 /* ResourceLoadStatisticsPersistentStorageIOS.mm */; }; … … 1479 1480 A5D3504E1D78F5B3005124A9 /* RemoteWebInspectorProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorProxyMac.mm */; }; 1480 1481 A5EFD38C16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1481 A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit. Databases.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Databases.sb */; };1482 A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Storage.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Storage.sb */; }; 1482 1483 A78CCDDB193AC9F8005ECC25 /* com.apple.WebKit.Networking.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */; }; 1483 1484 A78CCDDC193AC9FB005ECC25 /* com.apple.WebKit.WebContent.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */; }; … … 1953 1954 DF58C6361371ACA000F9A37C /* NativeWebWheelEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */; }; 1954 1955 E105FE5418D7B9DE008F57A8 /* EditingRange.h in Headers */ = {isa = PBXBuildFile; fileRef = E105FE5318D7B9DE008F57A8 /* EditingRange.h */; }; 1955 E115C714190F89E400ECC516 /* DatabaseProcessIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1FEF39C190F791C00731658 /* DatabaseProcessIOS.mm */; }; 1956 E115C716190F8A2500ECC516 /* com.apple.WebKit.Databases.sb in Resources */ = {isa = PBXBuildFile; fileRef = E115C715190F8A2500ECC516 /* com.apple.WebKit.Databases.sb */; }; 1956 E115C714190F89E400ECC516 /* StorageProcessIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1FEF39C190F791C00731658 /* StorageProcessIOS.mm */; }; 1957 1957 E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */; }; 1958 1958 E14A954916E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14A954716E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp */; }; … … 2189 2189 dstSubfolderSpec = 0; 2190 2190 files = ( 2191 A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Databases.sb in CopyFiles */,2192 2191 A78CCDDB193AC9F8005ECC25 /* com.apple.WebKit.Networking.sb in CopyFiles */, 2192 A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Storage.sb in CopyFiles */, 2193 2193 A78CCDDC193AC9FB005ECC25 /* com.apple.WebKit.WebContent.sb in CopyFiles */, 2194 2194 ); … … 3146 3146 510031F61379CACB00C8DFE4 /* SecItemShim.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = SecItemShim.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 3147 3147 51021E9B12B16788005C033C /* WebContextMenuClientMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMenuClientMac.mm; sourceTree = "<group>"; }; 3148 51032F16180F73BB00961BB7 /* WebToDatabaseProcessConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebToDatabaseProcessConnection.cpp; sourceTree = "<group>"; }; 3149 51032F17180F73BB00961BB7 /* WebToDatabaseProcessConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebToDatabaseProcessConnection.h; sourceTree = "<group>"; }; 3150 51032F1A180F74F100961BB7 /* DatabaseToWebProcessConnection.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = DatabaseToWebProcessConnection.messages.in; sourceTree = "<group>"; }; 3151 51032F1B180F791700961BB7 /* DatabaseToWebProcessConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseToWebProcessConnectionMessageReceiver.cpp; sourceTree = "<group>"; }; 3152 51032F1C180F791700961BB7 /* DatabaseToWebProcessConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseToWebProcessConnectionMessages.h; sourceTree = "<group>"; }; 3148 51032F1A180F74F100961BB7 /* StorageToWebProcessConnection.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageToWebProcessConnection.messages.in; sourceTree = "<group>"; }; 3153 3149 5104F5A11F19D7CF004CF821 /* CookieStorageUtilsCF.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CookieStorageUtilsCF.mm; sourceTree = "<group>"; }; 3154 3150 5105236D1C7393E9007993CB /* WebIDBConnectionToClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIDBConnectionToClient.cpp; sourceTree = "<group>"; }; … … 3176 3172 5110AE0A133C16CB0072717A /* WKIconDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKIconDatabase.cpp; sourceTree = "<group>"; }; 3177 3173 5110AE0B133C16CB0072717A /* WKIconDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKIconDatabase.h; sourceTree = "<group>"; }; 3174 5118E9991F295259003EF9F5 /* WebToStorageProcessConnection.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebToStorageProcessConnection.cpp; sourceTree = "<group>"; }; 3175 5118E99A1F295259003EF9F5 /* WebToStorageProcessConnection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebToStorageProcessConnection.h; sourceTree = "<group>"; }; 3176 5118E99E1F29531F003EF9F5 /* StorageProcessCreationParameters.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StorageProcessCreationParameters.cpp; sourceTree = "<group>"; }; 3177 5118E99F1F29531F003EF9F5 /* StorageProcessCreationParameters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StorageProcessCreationParameters.h; sourceTree = "<group>"; }; 3178 5118E9A21F295963003EF9F5 /* StorageProcessProxyMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StorageProcessProxyMessages.h; sourceTree = "<group>"; }; 3179 5118E9A31F295963003EF9F5 /* StorageToWebProcessConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StorageToWebProcessConnectionMessageReceiver.cpp; sourceTree = "<group>"; }; 3180 5118E9A41F295963003EF9F5 /* StorageToWebProcessConnectionMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StorageToWebProcessConnectionMessages.h; sourceTree = "<group>"; }; 3181 5118E9A51F295963003EF9F5 /* StorageProcessMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StorageProcessMessageReceiver.cpp; sourceTree = "<group>"; }; 3182 5118E9A61F295963003EF9F5 /* StorageProcessMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StorageProcessMessages.h; sourceTree = "<group>"; }; 3183 5118E9A71F295963003EF9F5 /* StorageProcessProxyMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StorageProcessProxyMessageReceiver.cpp; sourceTree = "<group>"; }; 3178 3184 511F7D3F1EB1BCEE00E47B83 /* WebsiteDataStoreParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebsiteDataStoreParameters.cpp; sourceTree = "<group>"; }; 3179 3185 511F7D401EB1BCEE00E47B83 /* WebsiteDataStoreParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsiteDataStoreParameters.h; sourceTree = "<group>"; }; … … 3193 3199 512935E11288D97800A4B695 /* InjectedBundlePageContextMenuClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageContextMenuClient.cpp; sourceTree = "<group>"; }; 3194 3200 512935E21288D97800A4B695 /* InjectedBundlePageContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageContextMenuClient.h; sourceTree = "<group>"; }; 3195 512A975E180E03160039A149 /* DatabaseProcessMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseProcessMessageReceiver.cpp; sourceTree = "<group>"; }; 3196 512A975F180E03160039A149 /* DatabaseProcessMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DatabaseProcessMessages.h; sourceTree = "<group>"; }; 3197 512A9766180E05D20039A149 /* DatabaseProcessProxy.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = DatabaseProcessProxy.messages.in; path = Databases/DatabaseProcessProxy.messages.in; sourceTree = "<group>"; }; 3198 512A9767180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseProcessProxyMessageReceiver.cpp; sourceTree = "<group>"; }; 3199 512A9768180E09B80039A149 /* DatabaseProcessProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseProcessProxyMessages.h; sourceTree = "<group>"; }; 3201 512A9766180E05D20039A149 /* StorageProcessProxy.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageProcessProxy.messages.in; sourceTree = "<group>"; }; 3200 3202 512F588E12A8838800629530 /* AuthenticationChallengeProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationChallengeProxy.cpp; sourceTree = "<group>"; }; 3201 3203 512F588F12A8838800629530 /* AuthenticationChallengeProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeProxy.h; sourceTree = "<group>"; }; … … 3244 3246 515E7725183DD6F60007203F /* AsyncRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncRequest.cpp; sourceTree = "<group>"; }; 3245 3247 515E7726183DD6F60007203F /* AsyncRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncRequest.h; sourceTree = "<group>"; }; 3246 515E7729184008B90007203F /* DatabaseProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseProcessCreationParameters.cpp; sourceTree = "<group>"; };3247 515E772A184008B90007203F /* DatabaseProcessCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseProcessCreationParameters.h; sourceTree = "<group>"; };3248 3248 5160BFE013381DF900918999 /* LoggingFoundation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoggingFoundation.mm; sourceTree = "<group>"; }; 3249 3249 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessProxyMac.mm; path = mac/NetworkProcessProxyMac.mm; sourceTree = "<group>"; }; … … 3254 3254 517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkProcessConnectionMessageReceiver.cpp; sourceTree = "<group>"; }; 3255 3255 517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkProcessConnectionMessages.h; sourceTree = "<group>"; }; 3256 517DD5BC180DA7D30081660B /* DatabaseProcessProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseProcessProxy.cpp; path = Databases/DatabaseProcessProxy.cpp; sourceTree = "<group>"; };3257 517DD5BD180DA7D30081660B /* DatabaseProcessProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseProcessProxy.h; path = Databases/DatabaseProcessProxy.h; sourceTree = "<group>"; };3256 517DD5BC180DA7D30081660B /* StorageProcessProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageProcessProxy.cpp; sourceTree = "<group>"; }; 3257 517DD5BD180DA7D30081660B /* StorageProcessProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageProcessProxy.h; sourceTree = "<group>"; }; 3258 3258 5183B3931379F85C00E8754E /* Shim.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shim.xcconfig; sourceTree = "<group>"; }; 3259 3259 51871B59127CB89D00F76232 /* WebContextMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContextMenu.cpp; sourceTree = "<group>"; }; … … 3276 3276 51A5877E1D1C4CB9004BA9AF /* WebIDBResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIDBResult.cpp; sourceTree = "<group>"; }; 3277 3277 51A5877F1D1C4CB9004BA9AF /* WebIDBResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIDBResult.h; sourceTree = "<group>"; }; 3278 51A60B29180CCD9000F3BF50 /* DatabaseService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DatabaseService.xcconfig; sourceTree = "<group>"; };3278 51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = StorageService.xcconfig; sourceTree = "<group>"; }; 3279 3279 51A728DC1B1BAD2D00102EEE /* WKBundleNavigationActionPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleNavigationActionPrivate.h; sourceTree = "<group>"; }; 3280 3280 51A7F2F2125BF820008AEB1D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = "<group>"; }; … … 3299 3299 51C0C97A1DDD78540032CAD3 /* _WKLinkIconParameters.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKLinkIconParameters.mm; sourceTree = "<group>"; }; 3300 3300 51C0C97B1DDD78540032CAD3 /* _WKLinkIconParametersInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKLinkIconParametersInternal.h; sourceTree = "<group>"; }; 3301 51C3B2861F2A64AE001427FF /* com.apple.WebKit.Storage.sb */ = {isa = PBXFileReference; lastKnownFileType = file; path = com.apple.WebKit.Storage.sb; sourceTree = "<group>"; }; 3301 3302 51C8E19B1F21617200BF731B /* WebIconDatabase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebIconDatabase.h; sourceTree = "<group>"; }; 3302 3303 51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKSecurityOriginRef.cpp; sourceTree = "<group>"; }; … … 3334 3335 51E351C8180F2CCC00E53BE9 /* IDBUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBUtilities.cpp; sourceTree = "<group>"; }; 3335 3336 51E351C9180F2CCC00E53BE9 /* IDBUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBUtilities.h; sourceTree = "<group>"; }; 3336 51E351FA180F5D0B00E53BE9 /* DatabaseProcess.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseProcess.cpp; sourceTree = "<group>"; };3337 51E351FB180F5D0B00E53BE9 /* DatabaseProcess.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DatabaseProcess.h; sourceTree = "<group>"; };3338 51E351FC180F5D0B00E53BE9 /* DatabaseProcess.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = DatabaseProcess.messages.in; sourceTree = "<group>"; };3339 51E351FD180F5D0B00E53BE9 /* DatabaseToWebProcessConnection.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseToWebProcessConnection.cpp; sourceTree = "<group>"; };3340 51E351FE180F5D0B00E53BE9 /* DatabaseToWebProcessConnection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DatabaseToWebProcessConnection.h; sourceTree = "<group>"; };3341 51E35201180F5D1E00E53BE9 /* DatabaseProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DatabaseProcessMac.mm; sourceTree = "<group>"; };3337 51E351FA180F5D0B00E53BE9 /* StorageProcess.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StorageProcess.cpp; sourceTree = "<group>"; }; 3338 51E351FB180F5D0B00E53BE9 /* StorageProcess.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StorageProcess.h; sourceTree = "<group>"; }; 3339 51E351FC180F5D0B00E53BE9 /* StorageProcess.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageProcess.messages.in; sourceTree = "<group>"; }; 3340 51E351FD180F5D0B00E53BE9 /* StorageToWebProcessConnection.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StorageToWebProcessConnection.cpp; sourceTree = "<group>"; }; 3341 51E351FE180F5D0B00E53BE9 /* StorageToWebProcessConnection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StorageToWebProcessConnection.h; sourceTree = "<group>"; }; 3342 51E35201180F5D1E00E53BE9 /* StorageProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StorageProcessMac.mm; sourceTree = "<group>"; }; 3342 3343 51E35207180F5D6100E53BE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 3343 51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DatabaseServiceEntryPoint.mm; sourceTree = "<group>"; };3344 51E35208180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StorageServiceEntryPoint.mm; sourceTree = "<group>"; }; 3344 3345 51E399051D6F54C5009C8831 /* UIGamepadProviderCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIGamepadProviderCocoa.mm; sourceTree = "<group>"; }; 3345 3346 51E6C15F1F29355100FD3437 /* ResourceLoadStatisticsPersistentStorageIOS.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = ResourceLoadStatisticsPersistentStorageIOS.mm; path = ios/ResourceLoadStatisticsPersistentStorageIOS.mm; sourceTree = "<group>"; }; … … 3356 3357 51F060DD1654317500F3282E /* NetworkRTCProviderMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkRTCProviderMessageReceiver.cpp; sourceTree = "<group>"; }; 3357 3358 51F060DE1654317500F3281B /* WebResourceLoaderMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebResourceLoaderMessages.h; sourceTree = "<group>"; }; 3358 51F7DC4A180CC93600212CA3 /* com.apple.WebKit. Databases.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Databases.xpc; sourceTree = BUILT_PRODUCTS_DIR; };3359 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Storage.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Storage.xpc; sourceTree = BUILT_PRODUCTS_DIR; }; 3359 3360 51FA2D541521118600C1BA0B /* WKBundleDOMWindowExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleDOMWindowExtension.h; sourceTree = "<group>"; }; 3360 3361 51FA2D5A15211A1E00C1BA0B /* InjectedBundleDOMWindowExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleDOMWindowExtension.h; sourceTree = "<group>"; }; … … 3778 3779 A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageVisibilityTypes.h; sourceTree = "<group>"; }; 3779 3780 A72D5D7F1236CBA800A88B15 /* APISerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APISerializedScriptValue.h; sourceTree = "<group>"; }; 3780 A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit. Databases.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Databases.sb; sourceTree = "<group>"; };3781 A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Storage.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Storage.sb; sourceTree = "<group>"; }; 3781 3782 A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Networking.sb; sourceTree = "<group>"; }; 3782 3783 A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.WebContent.sb; sourceTree = "<group>"; }; 3783 A7BD9863194653D400D35698 /* Databases-iOS.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Databases-iOS.entitlements"; sourceTree = "<group>"; };3784 A7BD9863194653D400D35698 /* Storage-iOS.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "Storage-iOS.entitlements"; sourceTree = "<group>"; }; 3784 3785 A7D792D41767CB0900881CBE /* ActivityAssertion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ActivityAssertion.h; sourceTree = "<group>"; }; 3785 3786 A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActivityAssertion.cpp; sourceTree = "<group>"; }; … … 4292 4293 DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NativeWebWheelEventMac.mm; sourceTree = "<group>"; }; 4293 4294 E105FE5318D7B9DE008F57A8 /* EditingRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingRange.h; sourceTree = "<group>"; }; 4294 E115C715190F8A2500ECC516 /* com.apple.WebKit.Databases.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.WebKit.Databases.sb; sourceTree = "<group>"; };4295 4295 E133FD891423DD7F00FC7BFB /* WebKit.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = WebKit.icns; path = Resources/WebKit.icns; sourceTree = "<group>"; }; 4296 4296 E14A954716E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessPlatformStrategies.cpp; path = NetworkProcess/NetworkProcessPlatformStrategies.cpp; sourceTree = "<group>"; }; … … 4338 4338 E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageEditorClient.h; sourceTree = "<group>"; }; 4339 4339 E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageEditorClient.cpp; sourceTree = "<group>"; }; 4340 E1FEF39A190F76F300731658 /* com.apple.WebKit. Databases.sb.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Databases.sb.in; sourceTree = "<group>"; };4341 E1FEF39C190F791C00731658 /* DatabaseProcessIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DatabaseProcessIOS.mm; sourceTree = "<group>"; };4340 E1FEF39A190F76F300731658 /* com.apple.WebKit.Storage.sb.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Storage.sb.in; sourceTree = "<group>"; }; 4341 E1FEF39C190F791C00731658 /* StorageProcessIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StorageProcessIOS.mm; sourceTree = "<group>"; }; 4342 4342 E413F59B1AC1ADB600345360 /* NetworkCacheEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheEntry.h; sourceTree = "<group>"; }; 4343 4343 E413F59E1AC1AF9D00345360 /* NetworkCacheEntry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheEntry.cpp; sourceTree = "<group>"; }; … … 4469 4469 isa = PBXGroup; 4470 4470 children = ( 4471 51F7DC4A180CC93600212CA3 /* com.apple.WebKit. Databases.xpc */,4471 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Storage.xpc */, 4472 4472 BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */, 4473 4473 BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.xpc */, … … 4496 4496 BC032DC310F438260058C15A /* UIProcess */, 4497 4497 BC032D5C10F436D50058C15A /* WebProcess */, 4498 51F7DC0A180CC41100212CA3 /* DatabaseProcess */,4498 51F7DC0A180CC41100212CA3 /* StorageProcess */, 4499 4499 510CC7DA16138E0100D03ED3 /* NetworkProcess */, 4500 4500 1A0EC6B0124BBD36007EF4A5 /* PluginProcess */, … … 4731 4731 5DAD73F1116FF90C00EE5396 /* BaseTarget.xcconfig */, 4732 4732 BCACC40D16B0B7BE00B6E092 /* BaseXPCService.xcconfig */, 4733 A7BD9863194653D400D35698 /* Databases-iOS.entitlements */,4734 51A60B29180CCD9000F3BF50 /* DatabaseService.xcconfig */,4735 4733 1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */, 4736 4734 1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */, … … 4744 4742 A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */, 4745 4743 5183B3931379F85C00E8754E /* Shim.xcconfig */, 4744 A7BD9863194653D400D35698 /* Storage-iOS.entitlements */, 4745 51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */, 4746 4746 1A4F976E100E7B6600637A18 /* Version.xcconfig */, 4747 4747 7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */, … … 4892 4892 1AAE058C1279DCD400852418 /* Plugins */, 4893 4893 0F5947A0187B3B7100437857 /* Scrolling */, 4894 5118E99D1F29531F003EF9F5 /* Storage */, 4894 4895 1ABF43781A368035003FB0E6 /* WebsiteData */, 4895 4896 A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */, … … 5164 5165 isa = PBXGroup; 5165 5166 children = ( 5166 517DD5BB180DA7C40081660B /* Databases */,5167 5167 99C81D551C20DFBE005C4C82 /* AutomationClient.h */, 5168 5168 99C81D561C20DFBE005C4C82 /* AutomationClient.mm */, … … 5986 5986 sourceTree = "<group>"; 5987 5987 }; 5988 5118E9981F295259003EF9F5 /* Storage */ = { 5989 isa = PBXGroup; 5990 children = ( 5991 5118E9991F295259003EF9F5 /* WebToStorageProcessConnection.cpp */, 5992 5118E99A1F295259003EF9F5 /* WebToStorageProcessConnection.h */, 5993 ); 5994 path = Storage; 5995 sourceTree = "<group>"; 5996 }; 5997 5118E99D1F29531F003EF9F5 /* Storage */ = { 5998 isa = PBXGroup; 5999 children = ( 6000 5118E99E1F29531F003EF9F5 /* StorageProcessCreationParameters.cpp */, 6001 5118E99F1F29531F003EF9F5 /* StorageProcessCreationParameters.h */, 6002 ); 6003 path = Storage; 6004 sourceTree = "<group>"; 6005 }; 5988 6006 511F8EDA180881660047DA96 /* IndexedDB */ = { 5989 6007 isa = PBXGroup; … … 6019 6037 1AA83F6A1A5B63FF00026EC6 /* WebDatabaseProvider.cpp */, 6020 6038 1AA83F6B1A5B63FF00026EC6 /* WebDatabaseProvider.h */, 6021 51032F16180F73BB00961BB7 /* WebToDatabaseProcessConnection.cpp */,6022 51032F17180F73BB00961BB7 /* WebToDatabaseProcessConnection.h */,6023 6039 ); 6024 6040 path = Databases; … … 6091 6107 sourceTree = "<group>"; 6092 6108 }; 6093 517DD5BB180DA7C40081660B /* Databases */ = { 6094 isa = PBXGroup; 6095 children = ( 6096 517DD5BC180DA7D30081660B /* DatabaseProcessProxy.cpp */, 6097 517DD5BD180DA7D30081660B /* DatabaseProcessProxy.h */, 6098 512A9766180E05D20039A149 /* DatabaseProcessProxy.messages.in */, 6099 ); 6100 name = Databases; 6101 path = ..; 6109 517DD5BB180DA7C40081660B /* Storage */ = { 6110 isa = PBXGroup; 6111 children = ( 6112 517DD5BC180DA7D30081660B /* StorageProcessProxy.cpp */, 6113 517DD5BD180DA7D30081660B /* StorageProcessProxy.h */, 6114 512A9766180E05D20039A149 /* StorageProcessProxy.messages.in */, 6115 ); 6116 path = Storage; 6102 6117 sourceTree = "<group>"; 6103 6118 }; … … 6105 6120 isa = PBXGroup; 6106 6121 children = ( 6107 E1FEF39A190F76F300731658 /* com.apple.WebKit. Databases.sb.in */,6108 51E35201180F5D1E00E53BE9 /* DatabaseProcessMac.mm */,6122 E1FEF39A190F76F300731658 /* com.apple.WebKit.Storage.sb.in */, 6123 51E35201180F5D1E00E53BE9 /* StorageProcessMac.mm */, 6109 6124 ); 6110 6125 path = mac; … … 6145 6160 children = ( 6146 6161 51E351C3180F2C8A00E53BE9 /* IndexedDB */, 6147 515E7729184008B90007203F /* DatabaseProcessCreationParameters.cpp */,6148 515E772A184008B90007203F /* DatabaseProcessCreationParameters.h */,6149 6162 ); 6150 6163 path = Databases; … … 6188 6201 sourceTree = "<group>"; 6189 6202 }; 6190 51F7DC0A180CC41100212CA3 /* DatabaseProcess */ = {6203 51F7DC0A180CC41100212CA3 /* StorageProcess */ = { 6191 6204 isa = PBXGroup; 6192 6205 children = ( … … 6195 6208 E1FEF39B190F791C00731658 /* ios */, 6196 6209 517DD5C0180DB7AA0081660B /* mac */, 6197 51E351FA180F5D0B00E53BE9 /* DatabaseProcess.cpp */,6198 51E351FB180F5D0B00E53BE9 /* DatabaseProcess.h */,6199 51E351FC180F5D0B00E53BE9 /* DatabaseProcess.messages.in */,6200 51E351FD180F5D0B00E53BE9 /* DatabaseToWebProcessConnection.cpp */,6201 51E351FE180F5D0B00E53BE9 /* DatabaseToWebProcessConnection.h */,6202 51032F1A180F74F100961BB7 /* DatabaseToWebProcessConnection.messages.in */,6203 ); 6204 path = DatabaseProcess;6210 51E351FA180F5D0B00E53BE9 /* StorageProcess.cpp */, 6211 51E351FB180F5D0B00E53BE9 /* StorageProcess.h */, 6212 51E351FC180F5D0B00E53BE9 /* StorageProcess.messages.in */, 6213 51E351FD180F5D0B00E53BE9 /* StorageToWebProcessConnection.cpp */, 6214 51E351FE180F5D0B00E53BE9 /* StorageToWebProcessConnection.h */, 6215 51032F1A180F74F100961BB7 /* StorageToWebProcessConnection.messages.in */, 6216 ); 6217 path = StorageProcess; 6205 6218 sourceTree = "<group>"; 6206 6219 }; … … 6216 6229 isa = PBXGroup; 6217 6230 children = ( 6218 51F7DC0D180CC43800212CA3 /* DatabaseService */,6219 51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */,6231 51F7DC0D180CC43800212CA3 /* StorageService */, 6232 51E35208180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm */, 6220 6233 ); 6221 6234 name = XPCService; … … 6223 6236 sourceTree = "<group>"; 6224 6237 }; 6225 51F7DC0D180CC43800212CA3 /* DatabaseService */ = {6238 51F7DC0D180CC43800212CA3 /* StorageService */ = { 6226 6239 isa = PBXGroup; 6227 6240 children = ( 6228 6241 51E35207180F5D6100E53BE9 /* Info.plist */, 6229 6242 ); 6230 path = DatabaseService;6243 path = StorageService; 6231 6244 sourceTree = "<group>"; 6232 6245 }; … … 6488 6501 isa = PBXGroup; 6489 6502 children = ( 6490 A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit. Databases.sb */,6503 A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Storage.sb */, 6491 6504 A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */, 6492 6505 A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */, … … 6538 6551 1A6FB7AA11E64B4900DB1371 /* Plugins */, 6539 6552 0F59478C187B3B2A00437857 /* Scrolling */, 6553 5118E9981F295259003EF9F5 /* Storage */, 6540 6554 1AAF08AA1926930B00B6390C /* UserContent */, 6541 6555 BC032D5D10F437220058C15A /* WebCoreSupport */, … … 6688 6702 1AEFCC0511D01F34008219D3 /* Plugins */, 6689 6703 0F594793187B3B4C00437857 /* Scrolling */, 6704 517DD5BB180DA7C40081660B /* Storage */, 6690 6705 1AAF089E192681AC00B6390C /* UserContent */, 6691 6706 1A44B95816B73F8C00B7BBD8 /* WebStorage */, … … 7740 7755 51FAEC361B0657310009C4E7 /* ChildProcessMessageReceiver.cpp */, 7741 7756 51FAEC371B0657310009C4E7 /* ChildProcessMessages.h */, 7742 E115C715190F8A2500ECC516 /* com.apple.WebKit.Databases.sb */,7743 7757 E17AE2C216B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb */, 7758 51C3B2861F2A64AE001427FF /* com.apple.WebKit.Storage.sb */, 7744 7759 7A1506721DD56298001F4B58 /* com.apple.WebKit.plugin-common.sb */, 7745 7760 E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */, 7746 512A975E180E03160039A149 /* DatabaseProcessMessageReceiver.cpp */,7747 512A975F180E03160039A149 /* DatabaseProcessMessages.h */,7748 512A9767180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp */,7749 512A9768180E09B80039A149 /* DatabaseProcessProxyMessages.h */,7750 51032F1B180F791700961BB7 /* DatabaseToWebProcessConnectionMessageReceiver.cpp */,7751 51032F1C180F791700961BB7 /* DatabaseToWebProcessConnectionMessages.h */,7752 7761 1AB7D6171288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp */, 7753 7762 1AB7D6181288B9D900CFD08C /* DownloadProxyMessages.h */, … … 7808 7817 1AB31A9416BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp */, 7809 7818 1AB31A9516BC688100F6DBC9 /* StorageManagerMessages.h */, 7819 5118E9A51F295963003EF9F5 /* StorageProcessMessageReceiver.cpp */, 7820 5118E9A61F295963003EF9F5 /* StorageProcessMessages.h */, 7821 5118E9A71F295963003EF9F5 /* StorageProcessProxyMessageReceiver.cpp */, 7822 5118E9A21F295963003EF9F5 /* StorageProcessProxyMessages.h */, 7823 5118E9A31F295963003EF9F5 /* StorageToWebProcessConnectionMessageReceiver.cpp */, 7824 5118E9A41F295963003EF9F5 /* StorageToWebProcessConnectionMessages.h */, 7810 7825 CD491B0B1E732E4D00009066 /* UserMediaCaptureManagerMessageReceiver.cpp */, 7811 7826 CD491B0C1E732E4D00009066 /* UserMediaCaptureManagerMessages.h */, … … 8036 8051 isa = PBXGroup; 8037 8052 children = ( 8038 E1FEF39C190F791C00731658 /* DatabaseProcessIOS.mm */,8053 E1FEF39C190F791C00731658 /* StorageProcessIOS.mm */, 8039 8054 ); 8040 8055 path = ios; … … 8287 8302 37C21CAE1E994C0C0029D5F9 /* CorePredictionSPI.h in Headers */, 8288 8303 B878B615133428DC006888E9 /* CorrectionPanel.h in Headers */, 8289 515E772C184008B90007203F /* DatabaseProcessCreationParameters.h in Headers */, 8290 512A9761180E031D0039A149 /* DatabaseProcessMessages.h in Headers */, 8291 517DD5BF180DA7D30081660B /* DatabaseProcessProxy.h in Headers */, 8292 512A976A180E09B80039A149 /* DatabaseProcessProxyMessages.h in Headers */, 8293 51032F1E180F791700961BB7 /* DatabaseToWebProcessConnectionMessages.h in Headers */, 8304 517DD5BF180DA7D30081660B /* StorageProcessProxy.h in Headers */, 8294 8305 C55F91711C59676E0029E92D /* DataDetectionResult.h in Headers */, 8295 8306 1AC75380183BE50F0072CB15 /* DataReference.h in Headers */, … … 8392 8403 C0E3AA7C1209E83C00A49D01 /* Module.h in Headers */, 8393 8404 2D50366B1BCDE17900E20BB3 /* NativeWebGestureEvent.h in Headers */, 8405 5118E99C1F295266003EF9F5 /* WebToStorageProcessConnection.h in Headers */, 8394 8406 263172CF18B469490065B9C3 /* NativeWebTouchEvent.h in Headers */, 8395 8407 1ADCB86B189831B30022EE5A /* NavigationActionData.h in Headers */, … … 8417 8429 530258411DCBBD2200DA89C2 /* NetworkCaptureManager.h in Headers */, 8418 8430 530258431DCBBD2200DA89C2 /* NetworkCaptureRecorder.h in Headers */, 8431 5118E9A91F295977003EF9F5 /* StorageProcessMessages.h in Headers */, 8419 8432 530258451DCBBD2200DA89C2 /* NetworkCaptureReplayer.h in Headers */, 8420 8433 5302583C1DCBBD2200DA89C2 /* NetworkCaptureResource.h in Headers */, … … 8614 8627 3F87B9C0158940D80090FF62 /* WebColorPicker.h in Headers */, 8615 8628 728E86F11795188C0087879E /* WebColorPickerMac.h in Headers */, 8629 5118E9AB1F295977003EF9F5 /* StorageProcessProxyMessages.h in Headers */, 8616 8630 7C4ABED11AA8E9F00088AA37 /* WebCompiledContentRuleList.h in Headers */, 8617 8631 7C4ABED51AA8FCB80088AA37 /* WebCompiledContentRuleListData.h in Headers */, … … 8733 8747 BC5744F012638FB3006F0F12 /* WebPopupItem.h in Headers */, 8734 8748 D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */, 8749 5118E9A11F295326003EF9F5 /* StorageProcessCreationParameters.h in Headers */, 8735 8750 BC574E631267D080006F0F12 /* WebPopupMenuProxy.h in Headers */, 8736 8751 BC5750971268F3C6006F0F12 /* WebPopupMenuProxyMac.h in Headers */, … … 8773 8788 1A52C0F81A38CDC70016160A /* WebStorageNamespaceProvider.h in Headers */, 8774 8789 BCC5715B115ADAEF001CCAF9 /* WebSystemInterface.h in Headers */, 8775 51032F19180F73BB00961BB7 /* WebToDatabaseProcessConnection.h in Headers */,8776 8790 BCA0EF7F12331E78007D3CFB /* WebUndoStep.h in Headers */, 8777 8791 1AAF08AE1926936700B6390C /* WebUserContentController.h in Headers */, … … 8923 8937 BC0E619812D6CD120012A72A /* WKGeolocationPosition.h in Headers */, 8924 8938 0FCB4E4F18BBE044000FCFC9 /* WKGeolocationProviderIOS.h in Headers */, 8939 5118E9AD1F295977003EF9F5 /* StorageToWebProcessConnectionMessages.h in Headers */, 8925 8940 BCC8B374125FB69000DE46A4 /* WKGeometry.h in Headers */, 8926 8941 1A422F8B18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h in Headers */, … … 9183 9198 productType = "com.apple.product-type.library.dynamic"; 9184 9199 }; 9185 51F7DC3F180CC93600212CA3 /* Databases*/ = {9200 51F7DC3F180CC93600212CA3 /* Storage */ = { 9186 9201 isa = PBXNativeTarget; 9187 buildConfigurationList = 51F7DC46180CC93600212CA3 /* Build configuration list for PBXNativeTarget " Databases" */;9202 buildConfigurationList = 51F7DC46180CC93600212CA3 /* Build configuration list for PBXNativeTarget "Storage" */; 9188 9203 buildPhases = ( 9189 9204 51F7DC40180CC93600212CA3 /* Sources */, … … 9196 9211 375E0627191EA8CC004E3CAF /* PBXTargetDependency */, 9197 9212 ); 9198 name = Databases;9199 productName = Networking;9200 productReference = 51F7DC4A180CC93600212CA3 /* com.apple.WebKit. Databases.xpc */;9213 name = Storage; 9214 productName = Storage; 9215 productReference = 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Storage.xpc */; 9201 9216 productType = "com.apple.product-type.xpc-service"; 9202 9217 }; … … 9364 9379 BC8283F816B4FDDE00A278FE /* Plugin.32 */, 9365 9380 BC82841E16B4FDF600A278FE /* Plugin.64 */, 9366 51F7DC3F180CC93600212CA3 /* Databases*/,9381 51F7DC3F180CC93600212CA3 /* Storage */, 9367 9382 A7AADA1019395CA9003EA1C7 /* Sandbox Profiles */, 9368 9383 ); … … 9382 9397 buildActionMask = 2147483647; 9383 9398 files = ( 9384 E115C716190F8A2500ECC516 /* com.apple.WebKit.Databases.sb in Resources */,9399 51C3B2871F2A64C5001427FF /* com.apple.WebKit.Storage.sb in Resources */, 9385 9400 E17AE2C316B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb in Resources */, 9386 9401 E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */, … … 9566 9581 ); 9567 9582 inputPaths = ( 9568 "$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.Databases.sb",9569 9583 "$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb", 9584 "$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.Storage.sb", 9570 9585 "$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb", 9571 9586 ); … … 9662 9677 "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.32.xpc", 9663 9678 "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.64.xpc", 9664 "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit. Databases.xpc",9679 "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Storage.xpc", 9665 9680 ); 9666 9681 name = "Copy XPC services for engineering builds"; … … 9670 9685 "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc", 9671 9686 "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc", 9672 "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit. Databases.xpc",9687 "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Storage.xpc", 9673 9688 ); 9674 9689 runOnlyForDeploymentPostprocessing = 0; 9675 9690 shellPath = /bin/sh; 9676 shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit. Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\nfi\n";9691 shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Storage.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Storage.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\nfi\n"; 9677 9692 }; 9678 9693 C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = { … … 9831 9846 5104F5A21F19D7D2004CF821 /* CookieStorageUtilsCF.mm in Sources */, 9832 9847 B878B616133428DC006888E9 /* CorrectionPanel.mm in Sources */, 9833 51E351FF180F5D0F00E53BE9 /* DatabaseProcess.cpp in Sources */, 9834 515E772B184008B90007203F /* DatabaseProcessCreationParameters.cpp in Sources */, 9835 E115C714190F89E400ECC516 /* DatabaseProcessIOS.mm in Sources */, 9836 51E35202180F5D1E00E53BE9 /* DatabaseProcessMac.mm in Sources */, 9837 512A9760180E031D0039A149 /* DatabaseProcessMessageReceiver.cpp in Sources */, 9838 517DD5BE180DA7D30081660B /* DatabaseProcessProxy.cpp in Sources */, 9839 512A9769180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp in Sources */, 9840 51E35209180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm in Sources */, 9841 51E35200180F5D0F00E53BE9 /* DatabaseToWebProcessConnection.cpp in Sources */, 9842 51032F1D180F791700961BB7 /* DatabaseToWebProcessConnectionMessageReceiver.cpp in Sources */, 9848 51E351FF180F5D0F00E53BE9 /* StorageProcess.cpp in Sources */, 9849 E115C714190F89E400ECC516 /* StorageProcessIOS.mm in Sources */, 9850 51E35202180F5D1E00E53BE9 /* StorageProcessMac.mm in Sources */, 9851 517DD5BE180DA7D30081660B /* StorageProcessProxy.cpp in Sources */, 9852 51E35209180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm in Sources */, 9853 51E35200180F5D0F00E53BE9 /* StorageToWebProcessConnection.cpp in Sources */, 9843 9854 C55F91701C595F630029E92D /* DataDetectionResult.mm in Sources */, 9844 9855 1AC7537F183BE50F0072CB15 /* DataReference.cpp in Sources */, … … 10004 10015 5C20CB9D1BB0DCFA00895BB1 /* NetworkSessionCocoa.mm in Sources */, 10005 10016 5C0B17811E7C8C2600E9123C /* NetworkSocketStream.cpp in Sources */, 10017 5118E99B1F295266003EF9F5 /* WebToStorageProcessConnection.cpp in Sources */, 10006 10018 5C0B17781E7C880E00E9123C /* NetworkSocketStreamMessageReceiver.cpp in Sources */, 10007 10019 31A2EC551489982E00810D71 /* NotificationPermissionRequest.cpp in Sources */, … … 10112 10124 51D130551382EAC000351EDD /* SecItemResponseData.cpp in Sources */, 10113 10125 E179088D169BAA62006904C7 /* SecItemShim.cpp in Sources */, 10126 5118E9A01F295326003EF9F5 /* StorageProcessCreationParameters.cpp in Sources */, 10114 10127 E18E690B169B563F009B6670 /* SecItemShimProxy.cpp in Sources */, 10115 10128 E18E6917169B667B009B6670 /* SecItemShimProxyMessageReceiver.cpp in Sources */, … … 10342 10355 1A08FEE41D593E2A008BA8CB /* WebPluginInfoProvider.cpp in Sources */, 10343 10356 BC5744EF12638FB3006F0F12 /* WebPopupItem.cpp in Sources */, 10357 5118E9A81F295977003EF9F5 /* StorageProcessMessageReceiver.cpp in Sources */, 10344 10358 D3B9484611FF4B6500032B39 /* WebPopupMenu.cpp in Sources */, 10345 10359 BCC43AC7127B99DE00317F16 /* WebPopupMenuMac.mm in Sources */, … … 10385 10399 D3B9484811FF4B6500032B39 /* WebSearchPopupMenu.cpp in Sources */, 10386 10400 1A4832D61A9CDF96008B4DFE /* WebsiteData.cpp in Sources */, 10401 5118E9AA1F295977003EF9F5 /* StorageProcessProxyMessageReceiver.cpp in Sources */, 10387 10402 1A4832D91A9D1FD2008B4DFE /* WebsiteDataRecord.cpp in Sources */, 10388 10403 1A53C2A91A32572B004E8C70 /* WebsiteDataStore.cpp in Sources */, … … 10395 10410 1A52C0F71A38CDC70016160A /* WebStorageNamespaceProvider.cpp in Sources */, 10396 10411 BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.mm in Sources */, 10397 51032F18180F73BB00961BB7 /* WebToDatabaseProcessConnection.cpp in Sources */,10398 10412 C0337DD8127A51B6008FF4F4 /* WebTouchEvent.cpp in Sources */, 10399 10413 2DA944A31884E4F000ED86DB /* WebTouchEventIOS.cpp in Sources */, … … 10574 10588 0FCB4E5518BBE044000FCFC9 /* WKScrollView.mm in Sources */, 10575 10589 51CD1C661B34B9DC00142CA5 /* WKSecurityOrigin.mm in Sources */, 10590 5118E9AC1F295977003EF9F5 /* StorageToWebProcessConnectionMessageReceiver.cpp in Sources */, 10576 10591 51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */, 10577 10592 BC407603124FF0270068F20A /* WKSerializedScriptValue.cpp in Sources */, … … 10720 10735 51A60B2E180CCF1700F3BF50 /* PBXTargetDependency */ = { 10721 10736 isa = PBXTargetDependency; 10722 target = 51F7DC3F180CC93600212CA3 /* Databases*/;10737 target = 51F7DC3F180CC93600212CA3 /* Storage */; 10723 10738 targetProxy = 51A60B2D180CCF1700F3BF50 /* PBXContainerItemProxy */; 10724 10739 }; … … 10873 10888 51F7DC47180CC93600212CA3 /* Debug */ = { 10874 10889 isa = XCBuildConfiguration; 10875 baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* DatabaseService.xcconfig */;10890 baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */; 10876 10891 buildSettings = { 10877 10892 }; … … 10880 10895 51F7DC48180CC93600212CA3 /* Release */ = { 10881 10896 isa = XCBuildConfiguration; 10882 baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* DatabaseService.xcconfig */;10897 baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */; 10883 10898 buildSettings = { 10884 10899 }; … … 10887 10902 51F7DC49180CC93600212CA3 /* Production */ = { 10888 10903 isa = XCBuildConfiguration; 10889 baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* DatabaseService.xcconfig */;10904 baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */; 10890 10905 buildSettings = { 10891 10906 }; … … 11132 11147 defaultConfigurationName = Production; 11133 11148 }; 11134 51F7DC46180CC93600212CA3 /* Build configuration list for PBXNativeTarget " Databases" */ = {11149 51F7DC46180CC93600212CA3 /* Build configuration list for PBXNativeTarget "Storage" */ = { 11135 11150 isa = XCConfigurationList; 11136 11151 buildConfigurations = ( -
trunk/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp
r219901 r219986 30 30 31 31 #include "DataReference.h" 32 #include "DatabaseToWebProcessConnectionMessages.h"33 32 #include "NetworkConnectionToWebProcessMessages.h" 34 33 #include "NetworkProcessConnection.h" 34 #include "StorageToWebProcessConnectionMessages.h" 35 35 #include "WebCoreArgumentCoders.h" 36 36 #include "WebIDBConnectionToClientMessages.h" 37 37 #include "WebIDBResult.h" 38 38 #include "WebProcess.h" 39 #include "WebTo DatabaseProcessConnection.h"39 #include "WebToStorageProcessConnection.h" 40 40 #include <WebCore/IDBConnectionToServer.h> 41 41 #include <WebCore/IDBCursorInfo.h> … … 66 66 relaxAdoptionRequirement(); 67 67 68 m_isOpenInServer = sendSync(Messages:: DatabaseToWebProcessConnection::EstablishIDBConnectionToServer(sessionID), Messages::DatabaseToWebProcessConnection::EstablishIDBConnectionToServer::Reply(m_identifier));68 m_isOpenInServer = sendSync(Messages::StorageToWebProcessConnection::EstablishIDBConnectionToServer(sessionID), Messages::StorageToWebProcessConnection::EstablishIDBConnectionToServer::Reply(m_identifier)); 69 69 m_connectionToServer = IDBClient::IDBConnectionToServer::create(*this); 70 70 } … … 73 73 { 74 74 if (m_isOpenInServer) 75 send(Messages:: DatabaseToWebProcessConnection::RemoveIDBConnectionToServer(m_identifier));75 send(Messages::StorageToWebProcessConnection::RemoveIDBConnectionToServer(m_identifier)); 76 76 } 77 77 -
trunk/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp
r197131 r219986 28 28 29 29 #include "WebProcess.h" 30 #include "WebTo DatabaseProcessConnection.h"30 #include "WebToStorageProcessConnection.h" 31 31 #include <WebCore/SessionID.h> 32 32 #include <wtf/HashMap.h> -
trunk/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.cpp
r219985 r219986 26 26 27 27 #include "config.h" 28 #include "WebTo DatabaseProcessConnection.h"28 #include "WebToStorageProcessConnection.h" 29 29 30 #include " DatabaseToWebProcessConnectionMessages.h"30 #include "StorageToWebProcessConnectionMessages.h" 31 31 #include "WebIDBConnectionToServerMessages.h" 32 32 #include "WebProcess.h" -
trunk/Source/WebKit/WebProcess/WebProcess.cpp
r219960 r219986 65 65 #include "WebResourceLoadStatisticsStoreMessages.h" 66 66 #include "WebSocketStream.h" 67 #include "WebTo DatabaseProcessConnection.h"67 #include "WebToStorageProcessConnection.h" 68 68 #include "WebsiteData.h" 69 69 #include "WebsiteDataType.h" -
trunk/Source/cmake/OptionsWPE.cmake
r219960 r219986 56 56 set(WebKit2_WebProcess_OUTPUT_NAME WPEWebProcess) 57 57 set(WebKit2_NetworkProcess_OUTPUT_NAME WPENetworkProcess) 58 set(WebKit2_ DatabaseProcess_OUTPUT_NAME WPEDatabaseProcess)58 set(WebKit2_StorageProcess_OUTPUT_NAME WPEStorageProcess) 59 59 60 60 find_package(ICU REQUIRED) -
trunk/Source/cmake/gtksymbols.filter
r218628 r219986 5 5 NetworkProcessMainUnix; 6 6 PluginProcessMainUnix; 7 DatabaseProcessMainUnix;7 StorageProcessMainUnix; 8 8 _ZN6WebKit22WebKitExtensionManager10initializeEPNS_14InjectedBundleEPN3API6ObjectE; 9 9 _ZN6WebKit22WebKitExtensionManager9singletonEv;
Note: See TracChangeset
for help on using the changeset viewer.