Changeset 219986 in webkit


Ignore:
Timestamp:
Jul 27, 2017 4:08:34 PM (7 years ago)
Author:
beidson@apple.com
Message:

Part 1 of: Rename DatabaseProcess to StorageProcess.
https://bugs.webkit.org/show_bug.cgi?id=174879

Reviewed by Andy Estes.

.:

  • Source/cmake/OptionsWPE.cmake:
  • Source/cmake/gtksymbols.filter:

Source/WebKit:

This patch is all about renaming source files and renaming the process itself (touching build system files, etc etc).

Some renaming in actual code did result (Some class/struct names, method names, etc)

Part 2 (174880) will go through and update all references in code itself from "Database" to "Storage"

  • CMakeLists.txt:
  • Configurations/Storage-iOS.entitlements: Renamed from Source/WebKit/Configurations/Databases-iOS.entitlements.
  • Configurations/StorageService.xcconfig: Renamed from Source/WebKit/Configurations/DatabaseService.xcconfig.
  • Configurations/WebKit.xcconfig:
  • DerivedSources.make:
  • Platform/ExtraPrivateSymbolsForTAPI.h:
  • PlatformGTK.cmake:
  • PlatformMac.cmake:
  • PlatformWPE.cmake:
  • Resources/SandboxProfiles/ios/com.apple.WebKit.Storage.sb: Renamed from Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Databases.sb.
  • Shared/Storage/StorageProcessCreationParameters.cpp: Renamed from Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.cpp.

(WebKit::StorageProcessCreationParameters::StorageProcessCreationParameters):
(WebKit::StorageProcessCreationParameters::encode):
(WebKit::StorageProcessCreationParameters::decode):

  • Shared/Storage/StorageProcessCreationParameters.h: Renamed from Source/WebKit/Shared/Databases/DatabaseProcessCreationParameters.h.
  • StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist: Renamed from Source/WebKit/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist.
  • StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm: Renamed from Source/WebKit/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm.

(StorageServiceInitializer):

  • StorageProcess/EntryPoint/unix/StorageProcessMain.cpp: Renamed from Source/WebKit/DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp.

(main):

  • StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp: Renamed from Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp.
  • StorageProcess/IndexedDB/WebIDBConnectionToClient.h: Renamed from Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h.
  • StorageProcess/IndexedDB/WebIDBConnectionToClient.messages.in: Renamed from Source/WebKit/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in.
  • StorageProcess/StorageProcess.cpp: Renamed from Source/WebKit/DatabaseProcess/DatabaseProcess.cpp.
  • StorageProcess/StorageProcess.h: Renamed from Source/WebKit/DatabaseProcess/DatabaseProcess.h.
  • StorageProcess/StorageProcess.messages.in: Renamed from Source/WebKit/DatabaseProcess/DatabaseProcess.messages.in.
  • StorageProcess/StorageToWebProcessConnection.cpp: Renamed from Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.cpp.
  • StorageProcess/StorageToWebProcessConnection.h: Renamed from Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.h.
  • StorageProcess/StorageToWebProcessConnection.messages.in: Renamed from Source/WebKit/DatabaseProcess/DatabaseToWebProcessConnection.messages.in.
  • StorageProcess/gtk/StorageProcessMainGtk.cpp: Renamed from Source/WebKit/DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp.

(WebKit::StorageProcessMainUnix):

  • StorageProcess/ios/StorageProcessIOS.mm: Renamed from Source/WebKit/DatabaseProcess/ios/DatabaseProcessIOS.mm.

(WebKit::StorageProcess::initializeProcess):
(WebKit::StorageProcess::initializeProcessName):
(WebKit::StorageProcess::initializeSandbox):

  • StorageProcess/mac/StorageProcessMac.mm: Renamed from Source/WebKit/DatabaseProcess/mac/DatabaseProcessMac.mm.

(WebKit::StorageProcess::initializeProcess):
(WebKit::StorageProcess::initializeProcessName):
(WebKit::StorageProcess::initializeSandbox):

  • StorageProcess/mac/com.apple.WebKit.Databases.sb.in: Copied from Source/WebKit/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in.
  • StorageProcess/mac/com.apple.WebKit.Storage.sb.in: Renamed from Source/WebKit/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in.
  • StorageProcess/unix/StorageProcessMainUnix.h: Renamed from Source/WebKit/DatabaseProcess/unix/DatabaseProcessMainUnix.h.
  • UIProcess/Launcher/mac/ProcessLauncherMac.mm:

(WebKit::serviceName):

  • UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs):

  • UIProcess/Storage/StorageProcessProxy.cpp: Renamed from Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.cpp.
  • UIProcess/Storage/StorageProcessProxy.h: Renamed from Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.h.
  • UIProcess/Storage/StorageProcessProxy.messages.in: Renamed from Source/WebKit/UIProcess/Databases/DatabaseProcessProxy.messages.in.
  • UIProcess/WebContextSupplement.h:

(WebKit::WebContextSupplement::processDidClose):

  • UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore):
(WebKit::WebProcessPool::databaseProcessCrashed):
(WebKit::WebProcessPool::pageAddedToProcess):

  • UIProcess/WebProcessPool.h:
  • UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::databaseProcessParameters):

  • UIProcess/WebsiteData/WebsiteDataStore.h:
  • WebKit.xcodeproj/project.pbxproj:
  • WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:

(WebKit::WebIDBConnectionToServer::WebIDBConnectionToServer):
(WebKit::WebIDBConnectionToServer::~WebIDBConnectionToServer):

  • WebProcess/Databases/WebDatabaseProvider.cpp:
  • WebProcess/Storage/WebToStorageProcessConnection.cpp: Renamed from Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.cpp.
  • WebProcess/Storage/WebToStorageProcessConnection.h: Renamed from Source/WebKit/WebProcess/Databases/WebToDatabaseProcessConnection.h.
  • WebProcess/WebProcess.cpp:
Location:
trunk
Files:
14 added
2 deleted
22 edited
21 copied
7 moved

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r219960 r219986  
     12017-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
    1122017-07-26  Brady Eidson  <beidson@apple.com>
    213
  • trunk/Source/WebKit/CMakeLists.txt

    r219966 r219986  
    55set(WebKit2_INCLUDE_DIRECTORIES
    66    "${WEBKIT2_DIR}"
    7     "${WEBKIT2_DIR}/DatabaseProcess"
    8     "${WEBKIT2_DIR}/DatabaseProcess/IndexedDB"
    97    "${WEBKIT2_DIR}/NetworkProcess"
    108    "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols"
     
    2927    "${WEBKIT2_DIR}/Shared/Plugins/Netscape"
    3028    "${WEBKIT2_DIR}/Shared/Plugins/Netscape/x11"
     29    "${WEBKIT2_DIR}/Shared/Storage"
    3130    "${WEBKIT2_DIR}/Shared/WebsiteData"
     31    "${WEBKIT2_DIR}/StorageProcess"
     32    "${WEBKIT2_DIR}/StorageProcess/IndexedDB"
    3233    "${WEBKIT2_DIR}/UIProcess"
    3334    "${WEBKIT2_DIR}/UIProcess/API"
     
    3738    "${WEBKIT2_DIR}/UIProcess/Authentication"
    3839    "${WEBKIT2_DIR}/UIProcess/Automation"
    39     "${WEBKIT2_DIR}/UIProcess/Databases"
    4040    "${WEBKIT2_DIR}/UIProcess/Downloads"
    4141    "${WEBKIT2_DIR}/UIProcess/Gamepad"
     
    4545    "${WEBKIT2_DIR}/UIProcess/Notifications"
    4646    "${WEBKIT2_DIR}/UIProcess/Plugins"
     47    "${WEBKIT2_DIR}/UIProcess/Storage"
    4748    "${WEBKIT2_DIR}/UIProcess/UserContent"
    4849    "${WEBKIT2_DIR}/UIProcess/WebStorage"
     
    7475    "${WEBKIT2_DIR}/WebProcess/Plugins/Netscape"
    7576    "${WEBKIT2_DIR}/WebProcess/ResourceCache"
     77    "${WEBKIT2_DIR}/WebProcess/Storage"
    7678    "${WEBKIT2_DIR}/WebProcess/UserContent"
    7779    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport"
     
    9799
    98100set(WebKit2_SOURCES
    99     DatabaseProcess/DatabaseProcess.cpp
    100     DatabaseProcess/DatabaseToWebProcessConnection.cpp
    101 
    102     DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp
    103 
    104101    NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
    105102
     
    255252    Shared/Authentication/AuthenticationManager.cpp
    256253
    257     Shared/Databases/DatabaseProcessCreationParameters.cpp
    258 
    259254    Shared/Databases/IndexedDB/IDBUtilities.cpp
    260255    Shared/Databases/IndexedDB/WebIDBResult.cpp
     
    273268    Shared/Plugins/Netscape/PluginInformation.cpp
    274269
     270    Shared/Storage/StorageProcessCreationParameters.cpp
     271
    275272    Shared/WebsiteData/WebsiteData.cpp
     273
     274    StorageProcess/StorageProcess.cpp
     275    StorageProcess/StorageToWebProcessConnection.cpp
     276
     277    StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp
    276278
    277279    UIProcess/BackgroundProcessResponsivenessTimer.cpp
     
    406408    UIProcess/Automation/WebAutomationSession.cpp
    407409
    408     UIProcess/Databases/DatabaseProcessProxy.cpp
    409 
    410410    UIProcess/Downloads/DownloadProxy.cpp
    411411    UIProcess/Downloads/DownloadProxyMap.cpp
     
    431431    UIProcess/Plugins/PluginProcessProxy.cpp
    432432
     433    UIProcess/Storage/StorageProcessProxy.cpp
     434
    433435    UIProcess/UserContent/WebScriptMessageHandler.cpp
    434436    UIProcess/UserContent/WebUserContentControllerProxy.cpp
     
    448450
    449451    WebProcess/Databases/WebDatabaseProvider.cpp
    450     WebProcess/Databases/WebToDatabaseProcessConnection.cpp
    451452
    452453    WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp
     
    527528    WebProcess/Plugins/Netscape/NetscapePluginNone.cpp
    528529    WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
     530
     531    WebProcess/Storage/WebToStorageProcessConnection.cpp
    529532
    530533    WebProcess/UserContent/WebUserContentController.cpp
     
    580583
    581584set(WebKit2_MESSAGES_IN_FILES
    582     DatabaseProcess/DatabaseProcess.messages.in
    583     DatabaseProcess/DatabaseToWebProcessConnection.messages.in
    584 
    585     DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in
    586 
    587585    NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in
    588586
     
    606604
    607605    Shared/Plugins/NPObjectMessageReceiver.messages.in
     606
     607    StorageProcess/StorageProcess.messages.in
     608    StorageProcess/StorageToWebProcessConnection.messages.in
     609
     610    StorageProcess/IndexedDB/WebIDBConnectionToClient.messages.in
    608611
    609612    UIProcess/DrawingAreaProxy.messages.in
     
    622625    UIProcess/Automation/WebAutomationSession.messages.in
    623626
    624     UIProcess/Databases/DatabaseProcessProxy.messages.in
    625 
    626627    UIProcess/Downloads/DownloadProxy.messages.in
    627628
     
    631632
    632633    UIProcess/Plugins/PluginProcessProxy.messages.in
     634
     635    UIProcess/Storage/StorageProcessProxy.messages.in
    633636
    634637    UIProcess/UserContent/WebUserContentControllerProxy.messages.in
     
    684687)
    685688
    686 set(DatabaseProcess_LIBRARIES
     689set(StorageProcess_LIBRARIES
    687690    WebKit2
    688691)
  • trunk/Source/WebKit/ChangeLog

    r219985 r219986  
     12017-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
    11012017-07-27  Tim Horton  <timothy_horton@apple.com>
    2102
  • trunk/Source/WebKit/Configurations/Storage-iOS.entitlements

    r219985 r219986  
    55        <key>seatbelt-profiles</key>
    66        <array>
    7                 <string>com.apple.WebKit.Databases</string>
     7                <string>com.apple.WebKit.Storage</string>
    88        </array>
    99</dict>
  • trunk/Source/WebKit/Configurations/StorageService.xcconfig

    r219985 r219986  
    2424#include "BaseXPCService.xcconfig"
    2525
    26 WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Databases-iOS;
     26WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = Storage-iOS;
    2727
    28 PRODUCT_NAME = com.apple.WebKit.Databases;
     28PRODUCT_NAME = com.apple.WebKit.Storage;
    2929PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NAME);
    30 INFOPLIST_FILE = DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist;
     30INFOPLIST_FILE = StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist;
  • trunk/Source/WebKit/Configurations/WebKit.xcconfig

    r219055 r219986  
    7171SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order;
    7272
    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;
     73EXCLUDED_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;
    7474
    7575INSTALLHDRS_SCRIPT_PHASE = YES;
  • trunk/Source/WebKit/DerivedSources.make

    r219966 r219986  
    2323VPATH = \
    2424    $(WebKit2) \
    25     $(WebKit2)/DatabaseProcess \
    26     $(WebKit2)/DatabaseProcess/IndexedDB \
    27     $(WebKit2)/DatabaseProcess/mac \
    2825    $(WebKit2)/NetworkProcess \
    2926    $(WebKit2)/NetworkProcess/CustomProtocols \
     
    3734    $(WebKit2)/Shared/Authentication \
    3835    $(WebKit2)/Shared/mac \
     36    $(WebKit2)/StorageProcess \
     37    $(WebKit2)/StorageProcess/IndexedDB \
     38    $(WebKit2)/StorageProcess/mac \
    3939    $(WebKit2)/WebProcess/ApplePay \
    4040    $(WebKit2)/WebProcess/ApplicationCache \
     
    7373    $(WebKit2)/UIProcess/Notifications \
    7474    $(WebKit2)/UIProcess/Plugins \
     75    $(WebKit2)/UIProcess/Storage \
    7576    $(WebKit2)/UIProcess/UserContent \
    7677    $(WebKit2)/UIProcess/WebStorage \
     
    9293    AuthenticationManager \
    9394    ChildProcess \
    94     DatabaseProcess \
    95     DatabaseProcessProxy \
    96     DatabaseToWebProcessConnection \
    9795    DownloadProxy \
    9896    DrawingArea \
     
    126124    StorageAreaMap \
    127125    StorageManager \
     126    StorageProcess \
     127    StorageProcessProxy \
     128    StorageToWebProcessConnection \
    128129    UserMediaCaptureManager \
    129130    UserMediaCaptureManagerProxy \
     
    217218SANDBOX_PROFILES = \
    218219        com.apple.WebProcess.sb \
    219         com.apple.WebKit.Databases.sb \
     220        com.apple.WebKit.Storage.sb \
    220221        com.apple.WebKit.plugin-common.sb \
    221222        com.apple.WebKit.NetworkProcess.sb
  • trunk/Source/WebKit/Platform/ExtraPrivateSymbolsForTAPI.h

    r213427 r219986  
    3131
    3232// FIXME: Remove these after <rdar://problem/30772033> is fixed.
    33 void DatabaseServiceInitializer();
     33void StorageServiceInitializer();
    3434void NetworkServiceInitializer();
    3535void PluginServiceInitializer();
  • trunk/Source/WebKit/PlatformGTK.cmake

    r219966 r219986  
    33set(WebKit2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
    44set(WebKit2_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
    5 set(WebKit2_DatabaseProcess_OUTPUT_NAME WebKitDatabaseProcess)
     5set(WebKit2_StorageProcess_OUTPUT_NAME WebKitStorageProcess)
    66
    77file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
     
    2727
    2828list(APPEND WebKit2_SOURCES
    29     DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp
    30 
    3129    NetworkProcess/CustomProtocols/soup/LegacyCustomProtocolManagerSoup.cpp
    3230
     
    102100
    103101    Shared/unix/ChildProcessMain.cpp
     102
     103    StorageProcess/gtk/StorageProcessMainGtk.cpp
    104104
    105105    UIProcess/AcceleratedDrawingAreaProxy.cpp
     
    760760list(APPEND WebKit2_INCLUDE_DIRECTORIES
    761761    "${WEBKIT2_DIR}/PluginProcess/unix"
    762     "${WEBKIT2_DIR}/DatabaseProcess/unix"
    763762    "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
    764763    "${WEBKIT2_DIR}/NetworkProcess/Downloads/soup"
     
    779778    "${WEBKIT2_DIR}/Shared/soup"
    780779    "${WEBKIT2_DIR}/Shared/unix"
     780    "${WEBKIT2_DIR}/StorageProcess/unix"
    781781    "${WEBKIT2_DIR}/UIProcess/API/C/cairo"
    782782    "${WEBKIT2_DIR}/UIProcess/API/C/gtk"
     
    838838)
    839839
    840 list(APPEND DatabaseProcess_SOURCES
    841     DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp
     840list(APPEND StorageProcess_SOURCES
     841    StorageProcess/EntryPoint/unix/StorageProcessMain.cpp
    842842)
    843843
  • trunk/Source/WebKit/PlatformMac.cmake

    r219966 r219986  
    2020
    2121list(APPEND WebKit2_SOURCES
    22     DatabaseProcess/mac/DatabaseProcessMac.mm
    23 
    2422    NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm
    2523
     
    161159    Shared/mac/WebHitTestResultData.mm
    162160    Shared/mac/WebMemorySampler.mac.mm
     161
     162    StorageProcess/mac/StorageProcessMac.mm
    163163
    164164    UIProcess/HighPerformanceGraphicsUsageSampler.cpp
     
    452452)
    453453
    454 list(APPEND DatabaseProcess_SOURCES
    455     DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm
     454list(APPEND StorageProcess_SOURCES
     455    StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm
    456456    ${XPCService_SOURCES}
    457457)
  • trunk/Source/WebKit/PlatformWPE.cmake

    r219966 r219986  
    4848)
    4949
    50 list(APPEND DatabaseProcess_SOURCES
    51     DatabaseProcess/EntryPoint/unix/DatabaseProcessMain.cpp
     50list(APPEND StorageProcess_SOURCES
     51    StorageProcess/EntryPoint/unix/StorageProcessMain.cpp
    5252)
    5353
     
    262262
    263263    # FIXME-GWSHARE:
    264     DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp
     264    StorageProcess/gtk/StorageProcessMainGtk.cpp
    265265)
    266266
     
    377377    "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
    378378    "${WEBCORE_DIR}/platform/network/soup"
    379     "${WEBKIT2_DIR}/DatabaseProcess/unix"
    380379    "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
    381380    "${WEBKIT2_DIR}/NetworkProcess/Downloads/soup"
     
    393392    "${WEBKIT2_DIR}/Shared/unix"
    394393    "${WEBKIT2_DIR}/Shared/wpe"
     394    "${WEBKIT2_DIR}/StorageProcess/unix"
    395395    "${WEBKIT2_DIR}/UIProcess/API/C/cairo"
    396396    "${WEBKIT2_DIR}/UIProcess/API/C/wpe"
  • trunk/Source/WebKit/Shared/Storage/StorageProcessCreationParameters.cpp

    r219985 r219986  
    2525
    2626#include "config.h"
    27 #include "DatabaseProcessCreationParameters.h"
     27#include "StorageProcessCreationParameters.h"
    2828
    2929#include "ArgumentCoders.h"
     
    3131namespace WebKit {
    3232
    33 DatabaseProcessCreationParameters::DatabaseProcessCreationParameters()
     33StorageProcessCreationParameters::StorageProcessCreationParameters()
    3434{
    3535}
    3636
    37 void DatabaseProcessCreationParameters::encode(IPC::Encoder& encoder) const
     37void StorageProcessCreationParameters::encode(IPC::Encoder& encoder) const
    3838{
    3939#if ENABLE(INDEXED_DATABASE)
     
    4444}
    4545
    46 bool DatabaseProcessCreationParameters::decode(IPC::Decoder& decoder, DatabaseProcessCreationParameters& result)
     46bool StorageProcessCreationParameters::decode(IPC::Decoder& decoder, StorageProcessCreationParameters& result)
    4747{
    4848#if ENABLE(INDEXED_DATABASE)
  • trunk/Source/WebKit/Shared/Storage/StorageProcessCreationParameters.h

    r219985 r219986  
    3838namespace WebKit {
    3939
    40 struct DatabaseProcessCreationParameters {
    41     DatabaseProcessCreationParameters();
     40struct StorageProcessCreationParameters {
     41    StorageProcessCreationParameters();
    4242
    4343    void encode(IPC::Encoder&) const;
    44     static bool decode(IPC::Decoder&, DatabaseProcessCreationParameters&);
     44    static bool decode(IPC::Decoder&, StorageProcessCreationParameters&);
    4545
    4646    WebCore::SessionID sessionID;
  • trunk/Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageService/Info.plist

    r219985 r219986  
    2626        <true/>
    2727        <key>WebKitEntryPoint</key>
    28         <string>DatabaseServiceInitializer</string>
     28        <string>StorageServiceInitializer</string>
    2929        <key>LSUIElement</key>
    3030        <true/>
  • trunk/Source/WebKit/StorageProcess/EntryPoint/mac/XPCService/StorageServiceEntryPoint.mm

    r219985 r219986  
    2727
    2828#import "EnvironmentUtilities.h"
    29 #import "DatabaseProcess.h"
     29#import "StorageProcess.h"
    3030#import "WKBase.h"
    3131#import "XPCServiceEntryPoint.h"
     
    3333using namespace WebKit;
    3434
    35 extern "C" WK_EXPORT void DatabaseServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage);
     35extern "C" WK_EXPORT void StorageServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage);
    3636
    37 void DatabaseServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage)
     37void StorageServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage)
    3838{
    39     XPCServiceInitializer<DatabaseProcess, XPCServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);
     39    XPCServiceInitializer<StorageProcess, XPCServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);
    4040}
  • trunk/Source/WebKit/StorageProcess/EntryPoint/unix/StorageProcessMain.cpp

    r219985 r219986  
    2525
    2626#include "config.h"
    27 #include "DatabaseProcessMainUnix.h"
     27#include "StorageProcessMainUnix.h"
    2828
    2929using namespace WebKit;
     
    3131int main(int argc, char** argv)
    3232{
    33     return DatabaseProcessMainUnix(argc, argv);
     33    return StorageProcessMainUnix(argc, argv);
    3434}
  • trunk/Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp

    r219985 r219986  
    3030
    3131#include "DataReference.h"
    32 #include "DatabaseProcess.h"
     32#include "StorageProcess.h"
    3333#include "WebCoreArgumentCoders.h"
    3434#include "WebIDBConnectionToServerMessages.h"
     
    4646namespace WebKit {
    4747
    48 Ref<WebIDBConnectionToClient> WebIDBConnectionToClient::create(DatabaseToWebProcessConnection& connection, uint64_t serverConnectionIdentifier, WebCore::SessionID sessionID)
     48Ref<WebIDBConnectionToClient> WebIDBConnectionToClient::create(StorageToWebProcessConnection& connection, uint64_t serverConnectionIdentifier, WebCore::SessionID sessionID)
    4949{
    5050    return adoptRef(*new WebIDBConnectionToClient(connection, serverConnectionIdentifier, sessionID));
    5151}
    5252
    53 WebIDBConnectionToClient::WebIDBConnectionToClient(DatabaseToWebProcessConnection& connection, uint64_t serverConnectionIdentifier, WebCore::SessionID sessionID)
     53WebIDBConnectionToClient::WebIDBConnectionToClient(StorageToWebProcessConnection& connection, uint64_t serverConnectionIdentifier, WebCore::SessionID sessionID)
    5454    : m_connection(connection)
    5555    , m_identifier(serverConnectionIdentifier)
     
    5858    relaxAdoptionRequirement();
    5959    m_connectionToClient = IDBServer::IDBConnectionToClient::create(*this);
    60     DatabaseProcess::singleton().idbServer(m_sessionID).registerConnection(*m_connectionToClient);
     60    StorageProcess::singleton().idbServer(m_sessionID).registerConnection(*m_connectionToClient);
    6161}
    6262
     
    6767void WebIDBConnectionToClient::disconnectedFromWebProcess()
    6868{
    69     DatabaseProcess::singleton().idbServer(m_sessionID).unregisterConnection(*m_connectionToClient);
     69    StorageProcess::singleton().idbServer(m_sessionID).unregisterConnection(*m_connectionToClient);
    7070}
    7171
     
    160160#if ENABLE(SANDBOX_EXTENSIONS)
    161161    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) {
    163163        send(MessageType({ resultData, WTFMove(handles) }));
    164164    });
     
    225225void WebIDBConnectionToClient::deleteDatabase(const IDBRequestData& request)
    226226{
    227     DatabaseProcess::singleton().idbServer(m_sessionID).deleteDatabase(request);
     227    StorageProcess::singleton().idbServer(m_sessionID).deleteDatabase(request);
    228228}
    229229
    230230void WebIDBConnectionToClient::openDatabase(const IDBRequestData& request)
    231231{
    232     DatabaseProcess::singleton().idbServer(m_sessionID).openDatabase(request);
     232    StorageProcess::singleton().idbServer(m_sessionID).openDatabase(request);
    233233}
    234234
    235235void WebIDBConnectionToClient::abortTransaction(const IDBResourceIdentifier& transactionIdentifier)
    236236{
    237     DatabaseProcess::singleton().idbServer(m_sessionID).abortTransaction(transactionIdentifier);
     237    StorageProcess::singleton().idbServer(m_sessionID).abortTransaction(transactionIdentifier);
    238238}
    239239
    240240void WebIDBConnectionToClient::commitTransaction(const IDBResourceIdentifier& transactionIdentifier)
    241241{
    242     DatabaseProcess::singleton().idbServer(m_sessionID).commitTransaction(transactionIdentifier);
     242    StorageProcess::singleton().idbServer(m_sessionID).commitTransaction(transactionIdentifier);
    243243}
    244244
    245245void WebIDBConnectionToClient::didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
    246246{
    247     DatabaseProcess::singleton().idbServer(m_sessionID).didFinishHandlingVersionChangeTransaction(databaseConnectionIdentifier, transactionIdentifier);
     247    StorageProcess::singleton().idbServer(m_sessionID).didFinishHandlingVersionChangeTransaction(databaseConnectionIdentifier, transactionIdentifier);
    248248}
    249249
    250250void WebIDBConnectionToClient::createObjectStore(const IDBRequestData& request, const IDBObjectStoreInfo& info)
    251251{
    252     DatabaseProcess::singleton().idbServer(m_sessionID).createObjectStore(request, info);
     252    StorageProcess::singleton().idbServer(m_sessionID).createObjectStore(request, info);
    253253}
    254254
    255255void WebIDBConnectionToClient::deleteObjectStore(const IDBRequestData& request, const String& name)
    256256{
    257     DatabaseProcess::singleton().idbServer(m_sessionID).deleteObjectStore(request, name);
     257    StorageProcess::singleton().idbServer(m_sessionID).deleteObjectStore(request, name);
    258258}
    259259
    260260void WebIDBConnectionToClient::renameObjectStore(const IDBRequestData& request, uint64_t objectStoreIdentifier, const String& newName)
    261261{
    262     DatabaseProcess::singleton().idbServer(m_sessionID).renameObjectStore(request, objectStoreIdentifier, newName);
     262    StorageProcess::singleton().idbServer(m_sessionID).renameObjectStore(request, objectStoreIdentifier, newName);
    263263}
    264264
    265265void WebIDBConnectionToClient::clearObjectStore(const IDBRequestData& request, uint64_t objectStoreIdentifier)
    266266{
    267     DatabaseProcess::singleton().idbServer(m_sessionID).clearObjectStore(request, objectStoreIdentifier);
     267    StorageProcess::singleton().idbServer(m_sessionID).clearObjectStore(request, objectStoreIdentifier);
    268268}
    269269
    270270void WebIDBConnectionToClient::createIndex(const IDBRequestData& request, const IDBIndexInfo& info)
    271271{
    272     DatabaseProcess::singleton().idbServer(m_sessionID).createIndex(request, info);
     272    StorageProcess::singleton().idbServer(m_sessionID).createIndex(request, info);
    273273}
    274274
    275275void WebIDBConnectionToClient::deleteIndex(const IDBRequestData& request, uint64_t objectStoreIdentifier, const String& name)
    276276{
    277     DatabaseProcess::singleton().idbServer(m_sessionID).deleteIndex(request, objectStoreIdentifier, name);
     277    StorageProcess::singleton().idbServer(m_sessionID).deleteIndex(request, objectStoreIdentifier, name);
    278278}
    279279
    280280void WebIDBConnectionToClient::renameIndex(const IDBRequestData& request, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const String& newName)
    281281{
    282     DatabaseProcess::singleton().idbServer(m_sessionID).renameIndex(request, objectStoreIdentifier, indexIdentifier, newName);
     282    StorageProcess::singleton().idbServer(m_sessionID).renameIndex(request, objectStoreIdentifier, indexIdentifier, newName);
    283283}
    284284
     
    295295    IndexedDB::ObjectStoreOverwriteMode mode = static_cast<IndexedDB::ObjectStoreOverwriteMode>(overwriteMode);
    296296
    297     DatabaseProcess::singleton().idbServer(m_sessionID).putOrAdd(request, key, value, mode);
     297    StorageProcess::singleton().idbServer(m_sessionID).putOrAdd(request, key, value, mode);
    298298}
    299299
    300300void WebIDBConnectionToClient::getRecord(const IDBRequestData& request, const IDBGetRecordData& getRecordData)
    301301{
    302     DatabaseProcess::singleton().idbServer(m_sessionID).getRecord(request, getRecordData);
     302    StorageProcess::singleton().idbServer(m_sessionID).getRecord(request, getRecordData);
    303303}
    304304
    305305void WebIDBConnectionToClient::getAllRecords(const IDBRequestData& request, const IDBGetAllRecordsData& getAllRecordsData)
    306306{
    307     DatabaseProcess::singleton().idbServer(m_sessionID).getAllRecords(request, getAllRecordsData);
     307    StorageProcess::singleton().idbServer(m_sessionID).getAllRecords(request, getAllRecordsData);
    308308}
    309309
    310310void WebIDBConnectionToClient::getCount(const IDBRequestData& request, const IDBKeyRangeData& range)
    311311{
    312     DatabaseProcess::singleton().idbServer(m_sessionID).getCount(request, range);
     312    StorageProcess::singleton().idbServer(m_sessionID).getCount(request, range);
    313313}
    314314
    315315void WebIDBConnectionToClient::deleteRecord(const IDBRequestData& request, const IDBKeyRangeData& range)
    316316{
    317     DatabaseProcess::singleton().idbServer(m_sessionID).deleteRecord(request, range);
     317    StorageProcess::singleton().idbServer(m_sessionID).deleteRecord(request, range);
    318318}
    319319
    320320void WebIDBConnectionToClient::openCursor(const IDBRequestData& request, const IDBCursorInfo& info)
    321321{
    322     DatabaseProcess::singleton().idbServer(m_sessionID).openCursor(request, info);
     322    StorageProcess::singleton().idbServer(m_sessionID).openCursor(request, info);
    323323}
    324324
    325325void WebIDBConnectionToClient::iterateCursor(const IDBRequestData& request, const IDBIterateCursorData& data)
    326326{
    327     DatabaseProcess::singleton().idbServer(m_sessionID).iterateCursor(request, data);
     327    StorageProcess::singleton().idbServer(m_sessionID).iterateCursor(request, data);
    328328}
    329329
    330330void WebIDBConnectionToClient::establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo& info)
    331331{
    332     DatabaseProcess::singleton().idbServer(m_sessionID).establishTransaction(databaseConnectionIdentifier, info);
     332    StorageProcess::singleton().idbServer(m_sessionID).establishTransaction(databaseConnectionIdentifier, info);
    333333}
    334334
    335335void WebIDBConnectionToClient::databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier)
    336336{
    337     DatabaseProcess::singleton().idbServer(m_sessionID).databaseConnectionPendingClose(databaseConnectionIdentifier);
     337    StorageProcess::singleton().idbServer(m_sessionID).databaseConnectionPendingClose(databaseConnectionIdentifier);
    338338}
    339339
    340340void WebIDBConnectionToClient::databaseConnectionClosed(uint64_t databaseConnectionIdentifier)
    341341{
    342     DatabaseProcess::singleton().idbServer(m_sessionID).databaseConnectionClosed(databaseConnectionIdentifier);
     342    StorageProcess::singleton().idbServer(m_sessionID).databaseConnectionClosed(databaseConnectionIdentifier);
    343343}
    344344
    345345void WebIDBConnectionToClient::abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
    346346{
    347     DatabaseProcess::singleton().idbServer(m_sessionID).abortOpenAndUpgradeNeeded(databaseConnectionIdentifier, transactionIdentifier);
     347    StorageProcess::singleton().idbServer(m_sessionID).abortOpenAndUpgradeNeeded(databaseConnectionIdentifier, transactionIdentifier);
    348348}
    349349
    350350void WebIDBConnectionToClient::didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
    351351{
    352     DatabaseProcess::singleton().idbServer(m_sessionID).didFireVersionChangeEvent(databaseConnectionIdentifier, transactionIdentifier);
     352    StorageProcess::singleton().idbServer(m_sessionID).didFireVersionChangeEvent(databaseConnectionIdentifier, transactionIdentifier);
    353353}
    354354
    355355void WebIDBConnectionToClient::openDBRequestCancelled(const IDBRequestData& requestData)
    356356{
    357     DatabaseProcess::singleton().idbServer(m_sessionID).openDBRequestCancelled(requestData);
     357    StorageProcess::singleton().idbServer(m_sessionID).openDBRequestCancelled(requestData);
    358358}
    359359
    360360void WebIDBConnectionToClient::confirmDidCloseFromServer(uint64_t databaseConnectionIdentifier)
    361361{
    362     DatabaseProcess::singleton().idbServer(m_sessionID).confirmDidCloseFromServer(databaseConnectionIdentifier);
     362    StorageProcess::singleton().idbServer(m_sessionID).confirmDidCloseFromServer(databaseConnectionIdentifier);
    363363}
    364364
    365365void WebIDBConnectionToClient::getAllDatabaseNames(uint64_t serverConnectionIdentifier, const WebCore::SecurityOriginData& topOrigin, const WebCore::SecurityOriginData& openingOrigin, uint64_t callbackID)
    366366{
    367     DatabaseProcess::singleton().idbServer(m_sessionID).getAllDatabaseNames(serverConnectionIdentifier, topOrigin, openingOrigin, callbackID);
     367    StorageProcess::singleton().idbServer(m_sessionID).getAllDatabaseNames(serverConnectionIdentifier, topOrigin, openingOrigin, callbackID);
    368368}
    369369
  • trunk/Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.h

    r219985 r219986  
    2828#if ENABLE(INDEXED_DATABASE)
    2929
    30 #include "DatabaseToWebProcessConnection.h"
    3130#include "MessageSender.h"
     31#include "StorageToWebProcessConnection.h"
    3232#include <WebCore/IDBConnectionToClient.h>
    3333#include <WebCore/SessionID.h>
     
    5353class WebIDBConnectionToClient final : public WebCore::IDBServer::IDBConnectionToClientDelegate, public IPC::MessageSender, public RefCounted<WebIDBConnectionToClient> {
    5454public:
    55     static Ref<WebIDBConnectionToClient> create(DatabaseToWebProcessConnection&, uint64_t serverConnectionIdentifier, WebCore::SessionID);
     55    static Ref<WebIDBConnectionToClient> create(StorageToWebProcessConnection&, uint64_t serverConnectionIdentifier, WebCore::SessionID);
    5656
    5757    virtual ~WebIDBConnectionToClient();
     
    127127
    128128private:
    129     WebIDBConnectionToClient(DatabaseToWebProcessConnection&, uint64_t serverConnectionIdentifier, WebCore::SessionID);
     129    WebIDBConnectionToClient(StorageToWebProcessConnection&, uint64_t serverConnectionIdentifier, WebCore::SessionID);
    130130
    131131    IPC::Connection* messageSenderConnection() final;
     
    133133    template<class MessageType> void handleGetResult(const WebCore::IDBResultData&);
    134134
    135     Ref<DatabaseToWebProcessConnection> m_connection;
     135    Ref<StorageToWebProcessConnection> m_connection;
    136136
    137137    uint64_t m_identifier;
  • trunk/Source/WebKit/StorageProcess/StorageProcess.cpp

    r219985 r219986  
    2525
    2626#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"
    3333#include "WebCoreArgumentCoders.h"
    3434#include "WebsiteData.h"
     
    4545namespace WebKit {
    4646
    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"))
     47StorageProcess& StorageProcess::singleton()
     48{
     49    static NeverDestroyed<StorageProcess> process;
     50    return process;
     51}
     52
     53StorageProcess::StorageProcess()
     54    : m_queue(WorkQueue::create("com.apple.WebKit.StorageProcess"))
    5555{
    5656    // Make sure the UTF8Encoding encoding and the text encoding maps have been built on the main thread before a background thread needs it.
     
    5959}
    6060
    61 DatabaseProcess::~DatabaseProcess()
    62 {
    63 }
    64 
    65 void DatabaseProcess::initializeConnection(IPC::Connection* connection)
     61StorageProcess::~StorageProcess()
     62{
     63}
     64
     65void StorageProcess::initializeConnection(IPC::Connection* connection)
    6666{
    6767    ChildProcess::initializeConnection(connection);
    6868}
    6969
    70 bool DatabaseProcess::shouldTerminate()
     70bool StorageProcess::shouldTerminate()
    7171{
    7272    return true;
    7373}
    7474
    75 void DatabaseProcess::didClose(IPC::Connection&)
     75void StorageProcess::didClose(IPC::Connection&)
    7676{
    7777    stopRunLoop();
    7878}
    7979
    80 void DatabaseProcess::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
     80void StorageProcess::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
    8181{
    8282    if (messageReceiverMap().dispatchMessage(connection, decoder))
    8383        return;
    8484
    85     if (decoder.messageReceiverName() == Messages::DatabaseProcess::messageReceiverName()) {
    86         didReceiveDatabaseProcessMessage(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)
     92IDBServer::IDBServer& StorageProcess::idbServer(SessionID sessionID)
    9393{
    9494    auto addResult = m_idbServers.add(sessionID, nullptr);
     
    103103    ASSERT(!path.isEmpty());
    104104
    105     addResult.iterator->value = IDBServer::IDBServer::create(path, DatabaseProcess::singleton());
     105    addResult.iterator->value = IDBServer::IDBServer::create(path, StorageProcess::singleton());
    106106    return *addResult.iterator->value;
    107107}
    108108#endif
    109109
    110 void DatabaseProcess::initializeWebsiteDataStore(const DatabaseProcessCreationParameters& parameters)
     110void StorageProcess::initializeWebsiteDataStore(const StorageProcessCreationParameters& parameters)
    111111{
    112112#if ENABLE(INDEXED_DATABASE)
     
    122122    SandboxExtension::consumePermanently(parameters.indexedDatabaseDirectoryExtensionHandle);
    123123
    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
     128void StorageProcess::ensurePathExists(const String& path)
    129129{
    130130    ASSERT(!RunLoop::isMain());
     
    134134}
    135135
    136 void DatabaseProcess::postDatabaseTask(CrossThreadTask&& task)
     136void StorageProcess::postDatabaseTask(CrossThreadTask&& task)
    137137{
    138138    ASSERT(RunLoop::isMain());
     
    147147}
    148148
    149 void DatabaseProcess::performNextDatabaseTask()
     149void StorageProcess::performNextDatabaseTask()
    150150{
    151151    ASSERT(!RunLoop::isMain());
     
    161161}
    162162
    163 void DatabaseProcess::createDatabaseToWebProcessConnection()
     163void StorageProcess::createDatabaseToWebProcessConnection()
    164164{
    165165#if USE(UNIX_DOMAIN_SOCKETS)
    166166    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);
    169169#elif OS(DARWIN)
    170170    // Create the listening port.
     
    173173
    174174    // 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)));
    177176
    178177    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);
    180179#else
    181180    notImplemented();
     
    183182}
    184183
    185 void DatabaseProcess::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID)
     184void StorageProcess::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID)
    186185{
    187186#if ENABLE(INDEXED_DATABASE)
    188187    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);
    190189    };
    191190
     
    211210}
    212211
    213 void DatabaseProcess::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
     212void StorageProcess::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
    214213{
    215214#if ENABLE(INDEXED_DATABASE)
    216215    auto completionHandler = [this, callbackID]() {
    217         parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidDeleteWebsiteData(callbackID), 0);
     216        parentProcessConnection()->send(Messages::StorageProcessProxy::DidDeleteWebsiteData(callbackID), 0);
    218217    };
    219218
     
    227226}
    228227
    229 void DatabaseProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<SecurityOriginData>& securityOriginDatas, uint64_t callbackID)
     228void StorageProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<SecurityOriginData>& securityOriginDatas, uint64_t callbackID)
    230229{
    231230#if ENABLE(INDEXED_DATABASE)
    232231    auto completionHandler = [this, callbackID]() {
    233         parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidDeleteWebsiteDataForOrigins(callbackID), 0);
     232        parentProcessConnection()->send(Messages::StorageProcessProxy::DidDeleteWebsiteDataForOrigins(callbackID), 0);
    234233    };
    235234
     
    244243
    245244#if ENABLE(SANDBOX_EXTENSIONS)
    246 void DatabaseProcess::grantSandboxExtensionsForBlobs(const Vector<String>& paths, const SandboxExtension::HandleArray& handles)
     245void StorageProcess::grantSandboxExtensionsForBlobs(const Vector<String>& paths, const SandboxExtension::HandleArray& handles)
    247246{
    248247    ASSERT(paths.size() == handles.size());
     
    256255
    257256#if ENABLE(INDEXED_DATABASE)
    258 void DatabaseProcess::prepareForAccessToTemporaryFile(const String& path)
     257void StorageProcess::prepareForAccessToTemporaryFile(const String& path)
    259258{
    260259    if (auto extension = m_blobTemporaryFileSandboxExtensions.get(path))
     
    262261}
    263262
    264 void DatabaseProcess::accessToTemporaryFileComplete(const String& path)
     263void StorageProcess::accessToTemporaryFileComplete(const String& path)
    265264{
    266265    // We've either hard linked the temporary blob file to the database directory, copied it there,
     
    273272}
    274273
    275 Vector<WebCore::SecurityOriginData> DatabaseProcess::indexedDatabaseOrigins(const String& path)
     274Vector<WebCore::SecurityOriginData> StorageProcess::indexedDatabaseOrigins(const String& path)
    276275{
    277276    if (path.isEmpty())
     
    292291
    293292#if ENABLE(SANDBOX_EXTENSIONS)
    294 void DatabaseProcess::getSandboxExtensionsForBlobFiles(const Vector<String>& filenames, WTF::Function<void (SandboxExtension::HandleArray&&)>&& completionHandler)
     293void StorageProcess::getSandboxExtensionsForBlobFiles(const Vector<String>& filenames, WTF::Function<void (SandboxExtension::HandleArray&&)>&& completionHandler)
    295294{
    296295    static uint64_t lastRequestID;
     
    298297    uint64_t requestID = ++lastRequestID;
    299298    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
     302void StorageProcess::didGetSandboxExtensionsForBlobFiles(uint64_t requestID, SandboxExtension::HandleArray&& handles)
    304303{
    305304    if (auto handler = m_sandboxExtensionForBlobsCompletionHandlers.take(requestID))
     
    309308
    310309#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&)
     310void StorageProcess::initializeProcess(const ChildProcessInitializationParameters&)
     311{
     312}
     313
     314void StorageProcess::initializeProcessName(const ChildProcessInitializationParameters&)
     315{
     316}
     317
     318void StorageProcess::initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&)
    320319{
    321320}
  • trunk/Source/WebKit/StorageProcess/StorageProcess.h

    r219985 r219986  
    4141namespace WebKit {
    4242
    43 class DatabaseToWebProcessConnection;
     43class StorageToWebProcessConnection;
    4444enum class WebsiteDataType;
    45 struct DatabaseProcessCreationParameters;
     45struct StorageProcessCreationParameters;
    4646
    47 class DatabaseProcess : public ChildProcess
     47class StorageProcess : public ChildProcess
    4848#if ENABLE(INDEXED_DATABASE)
    4949    , public WebCore::IDBServer::IDBBackingStoreTemporaryFileHandler
    5050#endif
    5151{
    52     WTF_MAKE_NONCOPYABLE(DatabaseProcess);
    53     friend class NeverDestroyed<DatabaseProcess>;
     52    WTF_MAKE_NONCOPYABLE(StorageProcess);
     53    friend class NeverDestroyed<StorageProcess>;
    5454public:
    55     static DatabaseProcess& singleton();
    56     ~DatabaseProcess();
     55    static StorageProcess& singleton();
     56    ~StorageProcess();
    5757
    5858#if ENABLE(INDEXED_DATABASE)
     
    7575
    7676private:
    77     DatabaseProcess();
     77    StorageProcess();
    7878
    7979    // ChildProcess
     
    8787    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
    8888    void didClose(IPC::Connection&) override;
    89     void didReceiveDatabaseProcessMessage(IPC::Connection&, IPC::Decoder&);
     89    void didReceiveStorageProcessMessage(IPC::Connection&, IPC::Decoder&);
    9090
    9191    // Message Handlers
    92     void initializeWebsiteDataStore(const DatabaseProcessCreationParameters&);
     92    void initializeWebsiteDataStore(const StorageProcessCreationParameters&);
    9393    void createDatabaseToWebProcessConnection();
    9494
     
    109109    void ensurePathExists(const String&);
    110110
    111     Vector<RefPtr<DatabaseToWebProcessConnection>> m_databaseToWebProcessConnections;
     111    Vector<RefPtr<StorageToWebProcessConnection>> m_databaseToWebProcessConnections;
    112112
    113113    Ref<WorkQueue> m_queue;
  • trunk/Source/WebKit/StorageProcess/StorageProcess.messages.in

    r219985 r219986  
    2121# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2222
    23 messages -> DatabaseProcess LegacyReceiver {
    24     # Initializes a WebsiteDataStore/Session in the DatabaseProcess with the correct parameters
    25     InitializeWebsiteDataStore(struct WebKit::DatabaseProcessCreationParameters processCreationParameters)
     23messages -> StorageProcess LegacyReceiver {
     24    # Initializes a WebsiteDataStore/Session in the StorageProcess with the correct parameters
     25    InitializeWebsiteDataStore(struct WebKit::StorageProcessCreationParameters processCreationParameters)
    2626
    2727    # Creates a connection for communication with a WebProcess
  • trunk/Source/WebKit/StorageProcess/StorageToWebProcessConnection.cpp

    r219985 r219986  
    2525
    2626#include "config.h"
    27 #include "DatabaseToWebProcessConnection.h"
     27#include "StorageToWebProcessConnection.h"
    2828
    29 #include "DatabaseToWebProcessConnectionMessages.h"
    3029#include "Logging.h"
     30#include "StorageToWebProcessConnectionMessages.h"
    3131#include "WebIDBConnectionToClient.h"
    3232#include "WebIDBConnectionToClientMessages.h"
     
    3535namespace WebKit {
    3636
    37 Ref<DatabaseToWebProcessConnection> DatabaseToWebProcessConnection::create(IPC::Connection::Identifier connectionIdentifier)
     37Ref<StorageToWebProcessConnection> StorageToWebProcessConnection::create(IPC::Connection::Identifier connectionIdentifier)
    3838{
    39     return adoptRef(*new DatabaseToWebProcessConnection(connectionIdentifier));
     39    return adoptRef(*new StorageToWebProcessConnection(connectionIdentifier));
    4040}
    4141
    42 DatabaseToWebProcessConnection::DatabaseToWebProcessConnection(IPC::Connection::Identifier connectionIdentifier)
     42StorageToWebProcessConnection::StorageToWebProcessConnection(IPC::Connection::Identifier connectionIdentifier)
    4343    : m_connection(IPC::Connection::createServerConnection(connectionIdentifier, *this))
    4444{
     
    4747}
    4848
    49 DatabaseToWebProcessConnection::~DatabaseToWebProcessConnection()
     49StorageToWebProcessConnection::~StorageToWebProcessConnection()
    5050{
    5151
    5252}
    5353
    54 void DatabaseToWebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
     54void StorageToWebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
    5555{
    56     if (decoder.messageReceiverName() == Messages::DatabaseToWebProcessConnection::messageReceiverName()) {
    57         didReceiveDatabaseToWebProcessConnectionMessage(connection, decoder);
     56    if (decoder.messageReceiverName() == Messages::StorageToWebProcessConnection::messageReceiverName()) {
     57        didReceiveStorageToWebProcessConnectionMessage(connection, decoder);
    5858        return;
    5959    }
     
    7171}
    7272
    73 void DatabaseToWebProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
     73void StorageToWebProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& replyEncoder)
    7474{
    75     if (decoder.messageReceiverName() == Messages::DatabaseToWebProcessConnection::messageReceiverName()) {
    76         didReceiveSyncDatabaseToWebProcessConnectionMessage(connection, decoder, replyEncoder);
     75    if (decoder.messageReceiverName() == Messages::StorageToWebProcessConnection::messageReceiverName()) {
     76        didReceiveSyncStorageToWebProcessConnectionMessage(connection, decoder, replyEncoder);
    7777        return;
    7878    }
     
    8181}
    8282
    83 void DatabaseToWebProcessConnection::didClose(IPC::Connection&)
     83void StorageToWebProcessConnection::didClose(IPC::Connection&)
    8484{
    8585#if ENABLE(INDEXED_DATABASE)
     
    9292}
    9393
    94 void DatabaseToWebProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
     94void StorageToWebProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
    9595{
    9696
     
    106106}
    107107
    108 void DatabaseToWebProcessConnection::establishIDBConnectionToServer(WebCore::SessionID sessionID, uint64_t& serverConnectionIdentifier)
     108void StorageToWebProcessConnection::establishIDBConnectionToServer(WebCore::SessionID sessionID, uint64_t& serverConnectionIdentifier)
    109109{
    110110    serverConnectionIdentifier = generateConnectionToServerIdentifier();
    111     LOG(IndexedDB, "DatabaseToWebProcessConnection::establishIDBConnectionToServer - %" PRIu64, serverConnectionIdentifier);
     111    LOG(IndexedDB, "StorageToWebProcessConnection::establishIDBConnectionToServer - %" PRIu64, serverConnectionIdentifier);
    112112    ASSERT(!m_webIDBConnections.contains(serverConnectionIdentifier));
    113113
     
    115115}
    116116
    117 void DatabaseToWebProcessConnection::removeIDBConnectionToServer(uint64_t serverConnectionIdentifier)
     117void StorageToWebProcessConnection::removeIDBConnectionToServer(uint64_t serverConnectionIdentifier)
    118118{
    119119    ASSERT(m_webIDBConnections.contains(serverConnectionIdentifier));
  • trunk/Source/WebKit/StorageProcess/StorageToWebProcessConnection.h

    r219985 r219986  
    3636class WebIDBConnectionToClient;
    3737
    38 class DatabaseToWebProcessConnection : public RefCounted<DatabaseToWebProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender {
     38class StorageToWebProcessConnection : public RefCounted<StorageToWebProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender {
    3939public:
    40     static Ref<DatabaseToWebProcessConnection> create(IPC::Connection::Identifier);
    41     ~DatabaseToWebProcessConnection();
     40    static Ref<StorageToWebProcessConnection> create(IPC::Connection::Identifier);
     41    ~StorageToWebProcessConnection();
    4242
    4343    IPC::Connection& connection() { return m_connection.get(); }
    4444
    4545private:
    46     DatabaseToWebProcessConnection(IPC::Connection::Identifier);
     46    StorageToWebProcessConnection(IPC::Connection::Identifier);
    4747
    4848    // IPC::Connection::Client
     
    5151    void didClose(IPC::Connection&) override;
    5252    void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
    53     void didReceiveDatabaseToWebProcessConnectionMessage(IPC::Connection&, IPC::Decoder&);
    54     void didReceiveSyncDatabaseToWebProcessConnectionMessage(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>&);
    5555
    5656    // IPC::MessageSender
  • trunk/Source/WebKit/StorageProcess/StorageToWebProcessConnection.messages.in

    r219985 r219986  
    2121# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2222
    23 messages -> DatabaseToWebProcessConnection LegacyReceiver {
     23messages -> StorageToWebProcessConnection LegacyReceiver {
    2424#if ENABLE(INDEXED_DATABASE)
    2525    # Creates a connection for communication with a WebProcess
  • trunk/Source/WebKit/StorageProcess/gtk/StorageProcessMainGtk.cpp

    r219985 r219986  
    2525
    2626#include "config.h"
    27 #include "DatabaseProcessMainUnix.h"
     27#include "StorageProcessMainUnix.h"
    2828
    2929#include "ChildProcessMain.h"
    30 #include "DatabaseProcess.h"
     30#include "StorageProcess.h"
    3131
    3232namespace WebKit {
    3333
    34 int DatabaseProcessMainUnix(int argc, char** argv)
     34int StorageProcessMainUnix(int argc, char** argv)
    3535{
    36     return ChildProcessMain<DatabaseProcess, ChildProcessMainBase>(argc, argv);
     36    return ChildProcessMain<StorageProcess, ChildProcessMainBase>(argc, argv);
    3737}
    3838
  • trunk/Source/WebKit/StorageProcess/ios/StorageProcessIOS.mm

    r219985 r219986  
    2828#if PLATFORM(IOS)
    2929
    30 #import "DatabaseProcess.h"
     30#import "StorageProcess.h"
    3131
    3232#import "SandboxInitializationParameters.h"
     
    4242namespace WebKit {
    4343
    44 void DatabaseProcess::initializeProcess(const ChildProcessInitializationParameters&)
     44void StorageProcess::initializeProcess(const ChildProcessInitializationParameters&)
    4545{
    4646}
    4747
    48 void DatabaseProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
     48void StorageProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
    4949{
    5050}
    5151
    52 void DatabaseProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
     52void StorageProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
    5353{
    5454#if ENABLE_MANUAL_DATABASE_SANDBOXING
    5555    // Need to override the default, because service has a different bundle ID.
    5656    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"]);
    5858    ChildProcess::initializeSandbox(parameters, sandboxParameters);
    5959#endif
  • trunk/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm

    r219985 r219986  
    2828#if PLATFORM(MAC)
    2929
    30 #import "DatabaseProcess.h"
     30#import "StorageProcess.h"
    3131
    3232#import "SandboxInitializationParameters.h"
     
    3939namespace WebKit {
    4040
    41 void DatabaseProcess::initializeProcess(const ChildProcessInitializationParameters&)
     41void StorageProcess::initializeProcess(const ChildProcessInitializationParameters&)
    4242{
    4343    // Having a window server connection in this process would result in spin logs (<rdar://problem/13239119>).
     
    4545}
    4646
    47 void DatabaseProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
     47void StorageProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
    4848{
    4949    NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Database Storage", "visible name of the database process. The argument is the application name."), (NSString *)parameters.uiProcessName];
     
    5151}
    5252
    53 void DatabaseProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
     53void StorageProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
    5454{
    5555    // Need to overide the default, because service has a different bundle ID.
    5656    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"]);
    5858
    5959    ChildProcess::initializeSandbox(parameters, sandboxParameters);
  • trunk/Source/WebKit/StorageProcess/unix/StorageProcessMainUnix.h

    r219985 r219986  
    3131
    3232extern "C" {
    33 WK_EXPORT int DatabaseProcessMainUnix(int argc, char** argv);
     33WK_EXPORT int StorageProcessMainUnix(int argc, char** argv);
    3434}
    3535
  • trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm

    r219960 r219986  
    5757        return "com.apple.WebKit.Networking";
    5858    case ProcessLauncher::ProcessType::Database:
    59         return "com.apple.WebKit.Databases";
     59        return "com.apple.WebKit.Storage";
    6060#if ENABLE(NETSCAPE_PLUGIN_API)
    6161    case ProcessLauncher::ProcessType::Plugin32:
  • trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

    r219960 r219986  
    2828
    2929#include "AuthenticationChallengeProxy.h"
    30 #include "DatabaseProcessMessages.h"
    3130#include "DownloadProxyMessages.h"
    3231#include "LegacyCustomProtocolManagerProxyMessages.h"
     
    3534#include "NetworkProcessMessages.h"
    3635#include "SandboxExtension.h"
     36#include "StorageProcessMessages.h"
    3737#include "WebPageProxy.h"
    3838#include "WebProcessMessages.h"
     
    300300    }
    301301
    302     m_processPool.sendToDatabaseProcessRelaunchingIfNecessary(Messages::DatabaseProcess::GrantSandboxExtensionsForBlobs(paths, extensions));
     302    m_processPool.sendToDatabaseProcessRelaunchingIfNecessary(Messages::StorageProcess::GrantSandboxExtensionsForBlobs(paths, extensions));
    303303#endif
    304304    connection()->send(Messages::NetworkProcess::DidGrantSandboxExtensionsToDatabaseProcessForBlobs(requestID), 0);
  • trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp

    r219985 r219986  
    2525
    2626#include "config.h"
    27 #include "DatabaseProcessProxy.h"
    28 
    29 #include "DatabaseProcessMessages.h"
    30 #include "DatabaseProcessProxyMessages.h"
     27#include "StorageProcessProxy.h"
     28
    3129#include "NetworkProcessMessages.h"
     30#include "StorageProcessMessages.h"
     31#include "StorageProcessProxyMessages.h"
    3232#include "WebProcessPool.h"
    3333#include "WebsiteData.h"
     
    4545}
    4646
    47 Ref<DatabaseProcessProxy> DatabaseProcessProxy::create(WebProcessPool* processPool)
    48 {
    49     return adoptRef(*new DatabaseProcessProxy(processPool));
    50 }
    51 
    52 DatabaseProcessProxy::DatabaseProcessProxy(WebProcessPool* processPool)
     47Ref<StorageProcessProxy> StorageProcessProxy::create(WebProcessPool* processPool)
     48{
     49    return adoptRef(*new StorageProcessProxy(processPool));
     50}
     51
     52StorageProcessProxy::StorageProcessProxy(WebProcessPool* processPool)
    5353    : ChildProcessProxy(processPool->alwaysRunsAtBackgroundPriority())
    5454    , m_processPool(processPool)
     
    5858}
    5959
    60 DatabaseProcessProxy::~DatabaseProcessProxy()
     60StorageProcessProxy::~StorageProcessProxy()
    6161{
    6262    ASSERT(m_pendingFetchWebsiteDataCallbacks.isEmpty());
     
    6565}
    6666
    67 void DatabaseProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
     67void StorageProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
    6868{
    6969    launchOptions.processType = ProcessLauncher::ProcessType::Database;
     
    7171}
    7272
    73 void DatabaseProcessProxy::processWillShutDown(IPC::Connection& connection)
     73void StorageProcessProxy::processWillShutDown(IPC::Connection& connection)
    7474{
    7575    ASSERT_UNUSED(connection, this->connection() == &connection);
    7676}
    7777
    78 void DatabaseProcessProxy::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
    79 {
    80     if (decoder.messageReceiverName() == Messages::DatabaseProcessProxy::messageReceiverName()) {
    81         didReceiveDatabaseProcessProxyMessage(connection, decoder);
     78void StorageProcessProxy::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
     79{
     80    if (decoder.messageReceiverName() == Messages::StorageProcessProxy::messageReceiverName()) {
     81        didReceiveStorageProcessProxyMessage(connection, decoder);
    8282        return;
    8383    }
    8484}
    8585
    86 void DatabaseProcessProxy::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WTF::Function<void (WebsiteData)>&& completionHandler)
     86void StorageProcessProxy::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WTF::Function<void (WebsiteData)>&& completionHandler)
    8787{
    8888    ASSERT(canSendMessage());
     
    9191    m_pendingFetchWebsiteDataCallbacks.add(callbackID, WTFMove(completionHandler));
    9292
    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
     96void StorageProcessProxy::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::chrono::system_clock::time_point modifiedSince, WTF::Function<void ()>&& completionHandler)
    9797{
    9898    auto callbackID = generateCallbackID();
    9999
    100100    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
     104void StorageProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<WebCore::SecurityOriginData>& origins, WTF::Function<void()>&& completionHandler)
    105105{
    106106    ASSERT(canSendMessage());
     
    109109    m_pendingDeleteWebsiteDataForOriginsCallbacks.add(callbackID, WTFMove(completionHandler));
    110110
    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
     114void StorageProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
    115115{
    116116    m_pendingConnectionReplies.append(WTFMove(reply));
     
    121121    }
    122122
    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
     126void StorageProcessProxy::didClose(IPC::Connection&)
    127127{
    128128    // The database process must have crashed or exited, so send any pending sync replies we might have.
     
    155155}
    156156
    157 void DatabaseProcessProxy::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
    158 {
    159 }
    160 
    161 void DatabaseProcessProxy::didCreateDatabaseToWebProcessConnection(const IPC::Attachment& connectionIdentifier)
     157void StorageProcessProxy::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
     158{
     159}
     160
     161void StorageProcessProxy::didCreateDatabaseToWebProcessConnection(const IPC::Attachment& connectionIdentifier)
    162162{
    163163    ASSERT(!m_pendingConnectionReplies.isEmpty());
     
    174174}
    175175
    176 void DatabaseProcessProxy::didFetchWebsiteData(uint64_t callbackID, const WebsiteData& websiteData)
     176void StorageProcessProxy::didFetchWebsiteData(uint64_t callbackID, const WebsiteData& websiteData)
    177177{
    178178    auto callback = m_pendingFetchWebsiteDataCallbacks.take(callbackID);
     
    180180}
    181181
    182 void DatabaseProcessProxy::didDeleteWebsiteData(uint64_t callbackID)
     182void StorageProcessProxy::didDeleteWebsiteData(uint64_t callbackID)
    183183{
    184184    auto callback = m_pendingDeleteWebsiteDataCallbacks.take(callbackID);
     
    186186}
    187187
    188 void DatabaseProcessProxy::didDeleteWebsiteDataForOrigins(uint64_t callbackID)
     188void StorageProcessProxy::didDeleteWebsiteDataForOrigins(uint64_t callbackID)
    189189{
    190190    auto callback = m_pendingDeleteWebsiteDataForOriginsCallbacks.take(callbackID);
     
    193193
    194194#if ENABLE(SANDBOX_EXTENSIONS)
    195 void DatabaseProcessProxy::getSandboxExtensionsForBlobFiles(uint64_t requestID, const Vector<String>& paths)
     195void StorageProcessProxy::getSandboxExtensionsForBlobFiles(uint64_t requestID, const Vector<String>& paths)
    196196{
    197197    SandboxExtension::HandleArray extensions;
     
    202202    }
    203203
    204     send(Messages::DatabaseProcess::DidGetSandboxExtensionsForBlobFiles(requestID, extensions), 0);
     204    send(Messages::StorageProcess::DidGetSandboxExtensionsForBlobFiles(requestID, extensions), 0);
    205205}
    206206#endif
    207207
    208 void DatabaseProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
     208void StorageProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
    209209{
    210210    ChildProcessProxy::didFinishLaunching(launcher, connectionIdentifier);
     
    216216
    217217    for (unsigned i = 0; i < m_numPendingConnectionRequests; ++i)
    218         send(Messages::DatabaseProcess::CreateDatabaseToWebProcessConnection(), 0);
     218        send(Messages::StorageProcess::CreateDatabaseToWebProcessConnection(), 0);
    219219   
    220220    m_numPendingConnectionRequests = 0;
  • trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h

    r219985 r219986  
    4444struct WebsiteData;
    4545
    46 class DatabaseProcessProxy : public ChildProcessProxy {
     46class StorageProcessProxy : public ChildProcessProxy {
    4747public:
    48     static Ref<DatabaseProcessProxy> create(WebProcessPool*);
    49     ~DatabaseProcessProxy();
     48    static Ref<StorageProcessProxy> create(WebProcessPool*);
     49    ~StorageProcessProxy();
    5050
    5151    void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, WTF::Function<void(WebsiteData)>&& completionHandler);
     
    5656
    5757private:
    58     DatabaseProcessProxy(WebProcessPool*);
     58    StorageProcessProxy(WebProcessPool*);
    5959
    6060    // ChildProcessProxy
     
    6767    void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
    6868
    69     void didReceiveDatabaseProcessProxyMessage(IPC::Connection&, IPC::Decoder&);
     69    void didReceiveStorageProcessProxyMessage(IPC::Connection&, IPC::Decoder&);
    7070
    7171    // Message handlers
  • trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.messages.in

    r219985 r219986  
    2121# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2222
    23 messages -> DatabaseProcessProxy LegacyReceiver {
     23messages -> StorageProcessProxy LegacyReceiver {
    2424    DidCreateDatabaseToWebProcessConnection(IPC::Attachment connectionIdentifier)
    2525
  • trunk/Source/WebKit/UIProcess/WebContextSupplement.h

    r196732 r219986  
    2929namespace WebKit {
    3030
    31 class DatabaseProcessProxy;
    3231class NetworkProcessProxy;
     32class StorageProcessProxy;
    3333class WebProcessPool;
    3434class WebProcessProxy;
     
    5757    }
    5858
    59     virtual void processDidClose(DatabaseProcessProxy*)
     59    virtual void processDidClose(StorageProcessProxy*)
    6060    {
    6161    }
  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r219960 r219986  
    3636#include "APIPageConfiguration.h"
    3737#include "APIProcessPoolConfiguration.h"
    38 #include "DatabaseProcessCreationParameters.h"
    39 #include "DatabaseProcessMessages.h"
    4038#include "DownloadProxy.h"
    4139#include "DownloadProxyMessages.h"
     
    5048#include "SandboxExtension.h"
    5149#include "StatisticsData.h"
     50#include "StorageProcessCreationParameters.h"
     51#include "StorageProcessMessages.h"
    5252#include "TextChecker.h"
    5353#include "UIGamepad.h"
     
    522522
    523523    if (!m_databaseProcess) {
    524         m_databaseProcess = DatabaseProcessProxy::create(this);
    525 
    526         DatabaseProcessCreationParameters parameters;
     524        m_databaseProcess = StorageProcessProxy::create(this);
     525
     526        StorageProcessCreationParameters parameters;
    527527#if ENABLE(INDEXED_DATABASE)
    528528        ASSERT(!m_configuration->indexedDBDatabaseDirectory().isEmpty());
     
    534534
    535535        ASSERT(!parameters.indexedDatabaseDirectory.isEmpty());
    536         m_databaseProcess->send(Messages::DatabaseProcess::InitializeWebsiteDataStore(parameters), 0);
     536        m_databaseProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(parameters), 0);
    537537    }
    538538
     
    540540        return;
    541541
    542     m_databaseProcess->send(Messages::DatabaseProcess::InitializeWebsiteDataStore(relevantDataStore->databaseProcessParameters()), 0);
     542    m_databaseProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(relevantDataStore->databaseProcessParameters()), 0);
    543543}
    544544
     
    550550}
    551551
    552 void WebProcessPool::databaseProcessCrashed(DatabaseProcessProxy* databaseProcessProxy)
     552void WebProcessPool::databaseProcessCrashed(StorageProcessProxy* databaseProcessProxy)
    553553{
    554554    ASSERT(m_databaseProcess);
     
    962962        auto databaseParameters = page.websiteDataStore().databaseProcessParameters();
    963963        if (!databaseParameters.indexedDatabaseDirectory.isEmpty())
    964             sendToDatabaseProcessRelaunchingIfNecessary(Messages::DatabaseProcess::InitializeWebsiteDataStore(databaseParameters));
     964            sendToDatabaseProcessRelaunchingIfNecessary(Messages::StorageProcess::InitializeWebsiteDataStore(databaseParameters));
    965965#endif
    966966    }
  • trunk/Source/WebKit/UIProcess/WebProcessPool.h

    r219960 r219986  
    3030#include "APIProcessPoolConfiguration.h"
    3131#include "APIWebsiteDataStore.h"
    32 #include "DatabaseProcessProxy.h"
    3332#include "DownloadProxyMap.h"
    3433#include "GenericCallback.h"
     
    4140#include "ProcessThrottler.h"
    4241#include "StatisticsRequest.h"
     42#include "StorageProcessProxy.h"
    4343#include "VisitedLinkStore.h"
    4444#include "WebContextClient.h"
     
    314314
    315315    void ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore);
    316     DatabaseProcessProxy* databaseProcess() { return m_databaseProcess.get(); }
     316    StorageProcessProxy* databaseProcess() { return m_databaseProcess.get(); }
    317317    void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
    318     void databaseProcessCrashed(DatabaseProcessProxy*);
     318    void databaseProcessCrashed(StorageProcessProxy*);
    319319
    320320#if PLATFORM(COCOA)
     
    550550    bool m_didNetworkProcessCrash;
    551551    RefPtr<NetworkProcessProxy> m_networkProcess;
    552     RefPtr<DatabaseProcessProxy> m_databaseProcess;
     552    RefPtr<StorageProcessProxy> m_databaseProcess;
    553553
    554554    HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks;
  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

    r219974 r219986  
    2929#include "APIProcessPoolConfiguration.h"
    3030#include "APIWebsiteDataRecord.h"
    31 #include "DatabaseProcessCreationParameters.h"
    3231#include "NetworkProcessMessages.h"
    3332#include "StorageManager.h"
     33#include "StorageProcessCreationParameters.h"
    3434#include "WebCookieManagerProxy.h"
    3535#include "WebProcessMessages.h"
     
    13161316}
    13171317
    1318 DatabaseProcessCreationParameters WebsiteDataStore::databaseProcessParameters()
     1318StorageProcessCreationParameters WebsiteDataStore::databaseProcessParameters()
    13191319{
    13201320    resolveDirectoriesIfNecessary();
    13211321
    1322     DatabaseProcessCreationParameters parameters;
     1322    StorageProcessCreationParameters parameters;
    13231323
    13241324    parameters.sessionID = m_sessionID;
  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

    r219904 r219986  
    5555enum class WebsiteDataFetchOption;
    5656enum class WebsiteDataType;
    57 struct DatabaseProcessCreationParameters;
     57struct StorageProcessCreationParameters;
    5858struct WebsiteDataRecord;
    5959struct WebsiteDataStoreParameters;
     
    122122
    123123    WebsiteDataStoreParameters parameters();
    124     DatabaseProcessCreationParameters databaseProcessParameters();
     124    StorageProcessCreationParameters databaseProcessParameters();
    125125
    126126    Vector<WebCore::Cookie> pendingCookies() const;
  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r219966 r219986  
    916916                4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F601430155C5A32001FBDE0 /* BlockingResponseMap.h */; };
    917917                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 */; };
    922918                5104F5A21F19D7D2004CF821 /* CookieStorageUtilsCF.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5104F5A11F19D7CF004CF821 /* CookieStorageUtilsCF.mm */; };
    923919                5105236F1C739D42007993CB /* WebIDBConnectionToClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5105236D1C7393E9007993CB /* WebIDBConnectionToClient.cpp */; };
     
    938934                5110AE0C133C16CB0072717A /* WKIconDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5110AE0A133C16CB0072717A /* WKIconDatabase.cpp */; };
    939935                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 */; };
    940946                511F7D411EB1BCF500E47B83 /* WebsiteDataStoreParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F7D401EB1BCEE00E47B83 /* WebsiteDataStoreParameters.h */; };
    941947                511F7D421EB1BCF800E47B83 /* WebsiteDataStoreParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511F7D3F1EB1BCEE00E47B83 /* WebsiteDataStoreParameters.cpp */; };
     
    955961                512935E31288D97800A4B695 /* InjectedBundlePageContextMenuClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512935E11288D97800A4B695 /* InjectedBundlePageContextMenuClient.cpp */; };
    956962                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 */; };
    961963                512E34E4130B4D0500ABD19A /* WKApplicationCacheManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */; };
    962964                512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    10041006                515E7727183DD6F60007203F /* AsyncRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E7725183DD6F60007203F /* AsyncRequest.cpp */; };
    10051007                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 */; };
    10081008                5160BFE113381DF900918999 /* LoggingFoundation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160BFE013381DF900918999 /* LoggingFoundation.mm */; };
    10091009                516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */; };
     
    10181018                517CF0E3163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */; };
    10191019                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 */; };
    10221022                5183DDEC1630BDFC008BE5C7 /* NetworkProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5105B0D4162F7A7A00E27709 /* NetworkProcessConnection.cpp */; };
    10231023                51871B5B127CB89D00F76232 /* WebContextMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51871B59127CB89D00F76232 /* WebContextMenu.cpp */; };
     
    10501050                51C0C9741DDD76000032CAD3 /* IconLoadingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C0C9721DDD74F00032CAD3 /* IconLoadingDelegate.h */; };
    10511051                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 */; };
    10521053                51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */; };
    10531054                51CD1C5E1B3493B400142CA5 /* WKSecurityOriginRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CD1C5A1B3493A900142CA5 /* WKSecurityOriginRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    10751076                51E351CA180F2CCC00E53BE9 /* IDBUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E351C8180F2CCC00E53BE9 /* IDBUtilities.cpp */; };
    10761077                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 */; };
    10811082                51E399061D6F54C7009C8831 /* UIGamepadProviderCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E399051D6F54C5009C8831 /* UIGamepadProviderCocoa.mm */; };
    10821083                51E6C1601F29356000FD3437 /* ResourceLoadStatisticsPersistentStorageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E6C15F1F29355100FD3437 /* ResourceLoadStatisticsPersistentStorageIOS.mm */; };
     
    14791480                A5D3504E1D78F5B3005124A9 /* RemoteWebInspectorProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorProxyMac.mm */; };
    14801481                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 */; };
    14821483                A78CCDDB193AC9F8005ECC25 /* com.apple.WebKit.Networking.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */; };
    14831484                A78CCDDC193AC9FB005ECC25 /* com.apple.WebKit.WebContent.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */; };
     
    19531954                DF58C6361371ACA000F9A37C /* NativeWebWheelEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */; };
    19541955                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 */; };
    19571957                E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */; };
    19581958                E14A954916E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14A954716E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp */; };
     
    21892189                        dstSubfolderSpec = 0;
    21902190                        files = (
    2191                                 A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Databases.sb in CopyFiles */,
    21922191                                A78CCDDB193AC9F8005ECC25 /* com.apple.WebKit.Networking.sb in CopyFiles */,
     2192                                A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Storage.sb in CopyFiles */,
    21932193                                A78CCDDC193AC9FB005ECC25 /* com.apple.WebKit.WebContent.sb in CopyFiles */,
    21942194                        );
     
    31463146                510031F61379CACB00C8DFE4 /* SecItemShim.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = SecItemShim.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
    31473147                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>"; };
    31533149                5104F5A11F19D7CF004CF821 /* CookieStorageUtilsCF.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CookieStorageUtilsCF.mm; sourceTree = "<group>"; };
    31543150                5105236D1C7393E9007993CB /* WebIDBConnectionToClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIDBConnectionToClient.cpp; sourceTree = "<group>"; };
     
    31763172                5110AE0A133C16CB0072717A /* WKIconDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKIconDatabase.cpp; sourceTree = "<group>"; };
    31773173                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>"; };
    31783184                511F7D3F1EB1BCEE00E47B83 /* WebsiteDataStoreParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebsiteDataStoreParameters.cpp; sourceTree = "<group>"; };
    31793185                511F7D401EB1BCEE00E47B83 /* WebsiteDataStoreParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsiteDataStoreParameters.h; sourceTree = "<group>"; };
     
    31933199                512935E11288D97800A4B695 /* InjectedBundlePageContextMenuClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageContextMenuClient.cpp; sourceTree = "<group>"; };
    31943200                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>"; };
    32003202                512F588E12A8838800629530 /* AuthenticationChallengeProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationChallengeProxy.cpp; sourceTree = "<group>"; };
    32013203                512F588F12A8838800629530 /* AuthenticationChallengeProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeProxy.h; sourceTree = "<group>"; };
     
    32443246                515E7725183DD6F60007203F /* AsyncRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncRequest.cpp; sourceTree = "<group>"; };
    32453247                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>"; };
    32483248                5160BFE013381DF900918999 /* LoggingFoundation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoggingFoundation.mm; sourceTree = "<group>"; };
    32493249                516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessProxyMac.mm; path = mac/NetworkProcessProxyMac.mm; sourceTree = "<group>"; };
     
    32543254                517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkProcessConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
    32553255                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>"; };
    32583258                5183B3931379F85C00E8754E /* Shim.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shim.xcconfig; sourceTree = "<group>"; };
    32593259                51871B59127CB89D00F76232 /* WebContextMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContextMenu.cpp; sourceTree = "<group>"; };
     
    32763276                51A5877E1D1C4CB9004BA9AF /* WebIDBResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIDBResult.cpp; sourceTree = "<group>"; };
    32773277                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>"; };
    32793279                51A728DC1B1BAD2D00102EEE /* WKBundleNavigationActionPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleNavigationActionPrivate.h; sourceTree = "<group>"; };
    32803280                51A7F2F2125BF820008AEB1D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = "<group>"; };
     
    32993299                51C0C97A1DDD78540032CAD3 /* _WKLinkIconParameters.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKLinkIconParameters.mm; sourceTree = "<group>"; };
    33003300                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>"; };
    33013302                51C8E19B1F21617200BF731B /* WebIconDatabase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebIconDatabase.h; sourceTree = "<group>"; };
    33023303                51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKSecurityOriginRef.cpp; sourceTree = "<group>"; };
     
    33343335                51E351C8180F2CCC00E53BE9 /* IDBUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBUtilities.cpp; sourceTree = "<group>"; };
    33353336                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>"; };
    33423343                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>"; };
    33443345                51E399051D6F54C5009C8831 /* UIGamepadProviderCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIGamepadProviderCocoa.mm; sourceTree = "<group>"; };
    33453346                51E6C15F1F29355100FD3437 /* ResourceLoadStatisticsPersistentStorageIOS.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = ResourceLoadStatisticsPersistentStorageIOS.mm; path = ios/ResourceLoadStatisticsPersistentStorageIOS.mm; sourceTree = "<group>"; };
     
    33563357                51F060DD1654317500F3282E /* NetworkRTCProviderMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkRTCProviderMessageReceiver.cpp; sourceTree = "<group>"; };
    33573358                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; };
    33593360                51FA2D541521118600C1BA0B /* WKBundleDOMWindowExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleDOMWindowExtension.h; sourceTree = "<group>"; };
    33603361                51FA2D5A15211A1E00C1BA0B /* InjectedBundleDOMWindowExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleDOMWindowExtension.h; sourceTree = "<group>"; };
     
    37783779                A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageVisibilityTypes.h; sourceTree = "<group>"; };
    37793780                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>"; };
    37813782                A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Networking.sb; sourceTree = "<group>"; };
    37823783                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>"; };
    37843785                A7D792D41767CB0900881CBE /* ActivityAssertion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ActivityAssertion.h; sourceTree = "<group>"; };
    37853786                A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActivityAssertion.cpp; sourceTree = "<group>"; };
     
    42924293                DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NativeWebWheelEventMac.mm; sourceTree = "<group>"; };
    42934294                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>"; };
    42954295                E133FD891423DD7F00FC7BFB /* WebKit.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = WebKit.icns; path = Resources/WebKit.icns; sourceTree = "<group>"; };
    42964296                E14A954716E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessPlatformStrategies.cpp; path = NetworkProcess/NetworkProcessPlatformStrategies.cpp; sourceTree = "<group>"; };
     
    43384338                E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageEditorClient.h; sourceTree = "<group>"; };
    43394339                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>"; };
    43424342                E413F59B1AC1ADB600345360 /* NetworkCacheEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheEntry.h; sourceTree = "<group>"; };
    43434343                E413F59E1AC1AF9D00345360 /* NetworkCacheEntry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheEntry.cpp; sourceTree = "<group>"; };
     
    44694469                        isa = PBXGroup;
    44704470                        children = (
    4471                                 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.xpc */,
     4471                                51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Storage.xpc */,
    44724472                                BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */,
    44734473                                BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.xpc */,
     
    44964496                                BC032DC310F438260058C15A /* UIProcess */,
    44974497                                BC032D5C10F436D50058C15A /* WebProcess */,
    4498                                 51F7DC0A180CC41100212CA3 /* DatabaseProcess */,
     4498                                51F7DC0A180CC41100212CA3 /* StorageProcess */,
    44994499                                510CC7DA16138E0100D03ED3 /* NetworkProcess */,
    45004500                                1A0EC6B0124BBD36007EF4A5 /* PluginProcess */,
     
    47314731                                5DAD73F1116FF90C00EE5396 /* BaseTarget.xcconfig */,
    47324732                                BCACC40D16B0B7BE00B6E092 /* BaseXPCService.xcconfig */,
    4733                                 A7BD9863194653D400D35698 /* Databases-iOS.entitlements */,
    4734                                 51A60B29180CCD9000F3BF50 /* DatabaseService.xcconfig */,
    47354733                                1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */,
    47364734                                1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */,
     
    47444742                                A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */,
    47454743                                5183B3931379F85C00E8754E /* Shim.xcconfig */,
     4744                                A7BD9863194653D400D35698 /* Storage-iOS.entitlements */,
     4745                                51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */,
    47464746                                1A4F976E100E7B6600637A18 /* Version.xcconfig */,
    47474747                                7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */,
     
    48924892                                1AAE058C1279DCD400852418 /* Plugins */,
    48934893                                0F5947A0187B3B7100437857 /* Scrolling */,
     4894                                5118E99D1F29531F003EF9F5 /* Storage */,
    48944895                                1ABF43781A368035003FB0E6 /* WebsiteData */,
    48954896                                A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */,
     
    51645165                        isa = PBXGroup;
    51655166                        children = (
    5166                                 517DD5BB180DA7C40081660B /* Databases */,
    51675167                                99C81D551C20DFBE005C4C82 /* AutomationClient.h */,
    51685168                                99C81D561C20DFBE005C4C82 /* AutomationClient.mm */,
     
    59865986                        sourceTree = "<group>";
    59875987                };
     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                };
    59886006                511F8EDA180881660047DA96 /* IndexedDB */ = {
    59896007                        isa = PBXGroup;
     
    60196037                                1AA83F6A1A5B63FF00026EC6 /* WebDatabaseProvider.cpp */,
    60206038                                1AA83F6B1A5B63FF00026EC6 /* WebDatabaseProvider.h */,
    6021                                 51032F16180F73BB00961BB7 /* WebToDatabaseProcessConnection.cpp */,
    6022                                 51032F17180F73BB00961BB7 /* WebToDatabaseProcessConnection.h */,
    60236039                        );
    60246040                        path = Databases;
     
    60916107                        sourceTree = "<group>";
    60926108                };
    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;
    61026117                        sourceTree = "<group>";
    61036118                };
     
    61056120                        isa = PBXGroup;
    61066121                        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 */,
    61096124                        );
    61106125                        path = mac;
     
    61456160                        children = (
    61466161                                51E351C3180F2C8A00E53BE9 /* IndexedDB */,
    6147                                 515E7729184008B90007203F /* DatabaseProcessCreationParameters.cpp */,
    6148                                 515E772A184008B90007203F /* DatabaseProcessCreationParameters.h */,
    61496162                        );
    61506163                        path = Databases;
     
    61886201                        sourceTree = "<group>";
    61896202                };
    6190                 51F7DC0A180CC41100212CA3 /* DatabaseProcess */ = {
     6203                51F7DC0A180CC41100212CA3 /* StorageProcess */ = {
    61916204                        isa = PBXGroup;
    61926205                        children = (
     
    61956208                                E1FEF39B190F791C00731658 /* ios */,
    61966209                                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;
    62056218                        sourceTree = "<group>";
    62066219                };
     
    62166229                        isa = PBXGroup;
    62176230                        children = (
    6218                                 51F7DC0D180CC43800212CA3 /* DatabaseService */,
    6219                                 51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */,
     6231                                51F7DC0D180CC43800212CA3 /* StorageService */,
     6232                                51E35208180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm */,
    62206233                        );
    62216234                        name = XPCService;
     
    62236236                        sourceTree = "<group>";
    62246237                };
    6225                 51F7DC0D180CC43800212CA3 /* DatabaseService */ = {
     6238                51F7DC0D180CC43800212CA3 /* StorageService */ = {
    62266239                        isa = PBXGroup;
    62276240                        children = (
    62286241                                51E35207180F5D6100E53BE9 /* Info.plist */,
    62296242                        );
    6230                         path = DatabaseService;
     6243                        path = StorageService;
    62316244                        sourceTree = "<group>";
    62326245                };
     
    64886501                        isa = PBXGroup;
    64896502                        children = (
    6490                                 A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Databases.sb */,
     6503                                A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Storage.sb */,
    64916504                                A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */,
    64926505                                A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */,
     
    65386551                                1A6FB7AA11E64B4900DB1371 /* Plugins */,
    65396552                                0F59478C187B3B2A00437857 /* Scrolling */,
     6553                                5118E9981F295259003EF9F5 /* Storage */,
    65406554                                1AAF08AA1926930B00B6390C /* UserContent */,
    65416555                                BC032D5D10F437220058C15A /* WebCoreSupport */,
     
    66886702                                1AEFCC0511D01F34008219D3 /* Plugins */,
    66896703                                0F594793187B3B4C00437857 /* Scrolling */,
     6704                                517DD5BB180DA7C40081660B /* Storage */,
    66906705                                1AAF089E192681AC00B6390C /* UserContent */,
    66916706                                1A44B95816B73F8C00B7BBD8 /* WebStorage */,
     
    77407755                                51FAEC361B0657310009C4E7 /* ChildProcessMessageReceiver.cpp */,
    77417756                                51FAEC371B0657310009C4E7 /* ChildProcessMessages.h */,
    7742                                 E115C715190F8A2500ECC516 /* com.apple.WebKit.Databases.sb */,
    77437757                                E17AE2C216B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb */,
     7758                                51C3B2861F2A64AE001427FF /* com.apple.WebKit.Storage.sb */,
    77447759                                7A1506721DD56298001F4B58 /* com.apple.WebKit.plugin-common.sb */,
    77457760                                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 */,
    77527761                                1AB7D6171288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp */,
    77537762                                1AB7D6181288B9D900CFD08C /* DownloadProxyMessages.h */,
     
    78087817                                1AB31A9416BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp */,
    78097818                                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 */,
    78107825                                CD491B0B1E732E4D00009066 /* UserMediaCaptureManagerMessageReceiver.cpp */,
    78117826                                CD491B0C1E732E4D00009066 /* UserMediaCaptureManagerMessages.h */,
     
    80368051                        isa = PBXGroup;
    80378052                        children = (
    8038                                 E1FEF39C190F791C00731658 /* DatabaseProcessIOS.mm */,
     8053                                E1FEF39C190F791C00731658 /* StorageProcessIOS.mm */,
    80398054                        );
    80408055                        path = ios;
     
    82878302                                37C21CAE1E994C0C0029D5F9 /* CorePredictionSPI.h in Headers */,
    82888303                                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 */,
    82948305                                C55F91711C59676E0029E92D /* DataDetectionResult.h in Headers */,
    82958306                                1AC75380183BE50F0072CB15 /* DataReference.h in Headers */,
     
    83928403                                C0E3AA7C1209E83C00A49D01 /* Module.h in Headers */,
    83938404                                2D50366B1BCDE17900E20BB3 /* NativeWebGestureEvent.h in Headers */,
     8405                                5118E99C1F295266003EF9F5 /* WebToStorageProcessConnection.h in Headers */,
    83948406                                263172CF18B469490065B9C3 /* NativeWebTouchEvent.h in Headers */,
    83958407                                1ADCB86B189831B30022EE5A /* NavigationActionData.h in Headers */,
     
    84178429                                530258411DCBBD2200DA89C2 /* NetworkCaptureManager.h in Headers */,
    84188430                                530258431DCBBD2200DA89C2 /* NetworkCaptureRecorder.h in Headers */,
     8431                                5118E9A91F295977003EF9F5 /* StorageProcessMessages.h in Headers */,
    84198432                                530258451DCBBD2200DA89C2 /* NetworkCaptureReplayer.h in Headers */,
    84208433                                5302583C1DCBBD2200DA89C2 /* NetworkCaptureResource.h in Headers */,
     
    86148627                                3F87B9C0158940D80090FF62 /* WebColorPicker.h in Headers */,
    86158628                                728E86F11795188C0087879E /* WebColorPickerMac.h in Headers */,
     8629                                5118E9AB1F295977003EF9F5 /* StorageProcessProxyMessages.h in Headers */,
    86168630                                7C4ABED11AA8E9F00088AA37 /* WebCompiledContentRuleList.h in Headers */,
    86178631                                7C4ABED51AA8FCB80088AA37 /* WebCompiledContentRuleListData.h in Headers */,
     
    87338747                                BC5744F012638FB3006F0F12 /* WebPopupItem.h in Headers */,
    87348748                                D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */,
     8749                                5118E9A11F295326003EF9F5 /* StorageProcessCreationParameters.h in Headers */,
    87358750                                BC574E631267D080006F0F12 /* WebPopupMenuProxy.h in Headers */,
    87368751                                BC5750971268F3C6006F0F12 /* WebPopupMenuProxyMac.h in Headers */,
     
    87738788                                1A52C0F81A38CDC70016160A /* WebStorageNamespaceProvider.h in Headers */,
    87748789                                BCC5715B115ADAEF001CCAF9 /* WebSystemInterface.h in Headers */,
    8775                                 51032F19180F73BB00961BB7 /* WebToDatabaseProcessConnection.h in Headers */,
    87768790                                BCA0EF7F12331E78007D3CFB /* WebUndoStep.h in Headers */,
    87778791                                1AAF08AE1926936700B6390C /* WebUserContentController.h in Headers */,
     
    89238937                                BC0E619812D6CD120012A72A /* WKGeolocationPosition.h in Headers */,
    89248938                                0FCB4E4F18BBE044000FCFC9 /* WKGeolocationProviderIOS.h in Headers */,
     8939                                5118E9AD1F295977003EF9F5 /* StorageToWebProcessConnectionMessages.h in Headers */,
    89258940                                BCC8B374125FB69000DE46A4 /* WKGeometry.h in Headers */,
    89268941                                1A422F8B18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h in Headers */,
     
    91839198                        productType = "com.apple.product-type.library.dynamic";
    91849199                };
    9185                 51F7DC3F180CC93600212CA3 /* Databases */ = {
     9200                51F7DC3F180CC93600212CA3 /* Storage */ = {
    91869201                        isa = PBXNativeTarget;
    9187                         buildConfigurationList = 51F7DC46180CC93600212CA3 /* Build configuration list for PBXNativeTarget "Databases" */;
     9202                        buildConfigurationList = 51F7DC46180CC93600212CA3 /* Build configuration list for PBXNativeTarget "Storage" */;
    91889203                        buildPhases = (
    91899204                                51F7DC40180CC93600212CA3 /* Sources */,
     
    91969211                                375E0627191EA8CC004E3CAF /* PBXTargetDependency */,
    91979212                        );
    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 */;
    92019216                        productType = "com.apple.product-type.xpc-service";
    92029217                };
     
    93649379                                BC8283F816B4FDDE00A278FE /* Plugin.32 */,
    93659380                                BC82841E16B4FDF600A278FE /* Plugin.64 */,
    9366                                 51F7DC3F180CC93600212CA3 /* Databases */,
     9381                                51F7DC3F180CC93600212CA3 /* Storage */,
    93679382                                A7AADA1019395CA9003EA1C7 /* Sandbox Profiles */,
    93689383                        );
     
    93829397                        buildActionMask = 2147483647;
    93839398                        files = (
    9384                                 E115C716190F8A2500ECC516 /* com.apple.WebKit.Databases.sb in Resources */,
     9399                                51C3B2871F2A64C5001427FF /* com.apple.WebKit.Storage.sb in Resources */,
    93859400                                E17AE2C316B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb in Resources */,
    93869401                                E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */,
     
    95669581                        );
    95679582                        inputPaths = (
    9568                                 "$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.Databases.sb",
    95699583                                "$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb",
     9584                                "$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.Storage.sb",
    95709585                                "$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb",
    95719586                        );
     
    96629677                                "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.32.xpc",
    96639678                                "$(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",
    96659680                        );
    96669681                        name = "Copy XPC services for engineering builds";
     
    96709685                                "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",
    96719686                                "$(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",
    96739688                        );
    96749689                        runOnlyForDeploymentPostprocessing = 0;
    96759690                        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";
    96779692                };
    96789693                C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = {
     
    98319846                                5104F5A21F19D7D2004CF821 /* CookieStorageUtilsCF.mm in Sources */,
    98329847                                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 */,
    98439854                                C55F91701C595F630029E92D /* DataDetectionResult.mm in Sources */,
    98449855                                1AC7537F183BE50F0072CB15 /* DataReference.cpp in Sources */,
     
    1000410015                                5C20CB9D1BB0DCFA00895BB1 /* NetworkSessionCocoa.mm in Sources */,
    1000510016                                5C0B17811E7C8C2600E9123C /* NetworkSocketStream.cpp in Sources */,
     10017                                5118E99B1F295266003EF9F5 /* WebToStorageProcessConnection.cpp in Sources */,
    1000610018                                5C0B17781E7C880E00E9123C /* NetworkSocketStreamMessageReceiver.cpp in Sources */,
    1000710019                                31A2EC551489982E00810D71 /* NotificationPermissionRequest.cpp in Sources */,
     
    1011210124                                51D130551382EAC000351EDD /* SecItemResponseData.cpp in Sources */,
    1011310125                                E179088D169BAA62006904C7 /* SecItemShim.cpp in Sources */,
     10126                                5118E9A01F295326003EF9F5 /* StorageProcessCreationParameters.cpp in Sources */,
    1011410127                                E18E690B169B563F009B6670 /* SecItemShimProxy.cpp in Sources */,
    1011510128                                E18E6917169B667B009B6670 /* SecItemShimProxyMessageReceiver.cpp in Sources */,
     
    1034210355                                1A08FEE41D593E2A008BA8CB /* WebPluginInfoProvider.cpp in Sources */,
    1034310356                                BC5744EF12638FB3006F0F12 /* WebPopupItem.cpp in Sources */,
     10357                                5118E9A81F295977003EF9F5 /* StorageProcessMessageReceiver.cpp in Sources */,
    1034410358                                D3B9484611FF4B6500032B39 /* WebPopupMenu.cpp in Sources */,
    1034510359                                BCC43AC7127B99DE00317F16 /* WebPopupMenuMac.mm in Sources */,
     
    1038510399                                D3B9484811FF4B6500032B39 /* WebSearchPopupMenu.cpp in Sources */,
    1038610400                                1A4832D61A9CDF96008B4DFE /* WebsiteData.cpp in Sources */,
     10401                                5118E9AA1F295977003EF9F5 /* StorageProcessProxyMessageReceiver.cpp in Sources */,
    1038710402                                1A4832D91A9D1FD2008B4DFE /* WebsiteDataRecord.cpp in Sources */,
    1038810403                                1A53C2A91A32572B004E8C70 /* WebsiteDataStore.cpp in Sources */,
     
    1039510410                                1A52C0F71A38CDC70016160A /* WebStorageNamespaceProvider.cpp in Sources */,
    1039610411                                BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.mm in Sources */,
    10397                                 51032F18180F73BB00961BB7 /* WebToDatabaseProcessConnection.cpp in Sources */,
    1039810412                                C0337DD8127A51B6008FF4F4 /* WebTouchEvent.cpp in Sources */,
    1039910413                                2DA944A31884E4F000ED86DB /* WebTouchEventIOS.cpp in Sources */,
     
    1057410588                                0FCB4E5518BBE044000FCFC9 /* WKScrollView.mm in Sources */,
    1057510589                                51CD1C661B34B9DC00142CA5 /* WKSecurityOrigin.mm in Sources */,
     10590                                5118E9AC1F295977003EF9F5 /* StorageToWebProcessConnectionMessageReceiver.cpp in Sources */,
    1057610591                                51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */,
    1057710592                                BC407603124FF0270068F20A /* WKSerializedScriptValue.cpp in Sources */,
     
    1072010735                51A60B2E180CCF1700F3BF50 /* PBXTargetDependency */ = {
    1072110736                        isa = PBXTargetDependency;
    10722                         target = 51F7DC3F180CC93600212CA3 /* Databases */;
     10737                        target = 51F7DC3F180CC93600212CA3 /* Storage */;
    1072310738                        targetProxy = 51A60B2D180CCF1700F3BF50 /* PBXContainerItemProxy */;
    1072410739                };
     
    1087310888                51F7DC47180CC93600212CA3 /* Debug */ = {
    1087410889                        isa = XCBuildConfiguration;
    10875                         baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* DatabaseService.xcconfig */;
     10890                        baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */;
    1087610891                        buildSettings = {
    1087710892                        };
     
    1088010895                51F7DC48180CC93600212CA3 /* Release */ = {
    1088110896                        isa = XCBuildConfiguration;
    10882                         baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* DatabaseService.xcconfig */;
     10897                        baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */;
    1088310898                        buildSettings = {
    1088410899                        };
     
    1088710902                51F7DC49180CC93600212CA3 /* Production */ = {
    1088810903                        isa = XCBuildConfiguration;
    10889                         baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* DatabaseService.xcconfig */;
     10904                        baseConfigurationReference = 51A60B29180CCD9000F3BF50 /* StorageService.xcconfig */;
    1089010905                        buildSettings = {
    1089110906                        };
     
    1113211147                        defaultConfigurationName = Production;
    1113311148                };
    11134                 51F7DC46180CC93600212CA3 /* Build configuration list for PBXNativeTarget "Databases" */ = {
     11149                51F7DC46180CC93600212CA3 /* Build configuration list for PBXNativeTarget "Storage" */ = {
    1113511150                        isa = XCConfigurationList;
    1113611151                        buildConfigurations = (
  • trunk/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp

    r219901 r219986  
    3030
    3131#include "DataReference.h"
    32 #include "DatabaseToWebProcessConnectionMessages.h"
    3332#include "NetworkConnectionToWebProcessMessages.h"
    3433#include "NetworkProcessConnection.h"
     34#include "StorageToWebProcessConnectionMessages.h"
    3535#include "WebCoreArgumentCoders.h"
    3636#include "WebIDBConnectionToClientMessages.h"
    3737#include "WebIDBResult.h"
    3838#include "WebProcess.h"
    39 #include "WebToDatabaseProcessConnection.h"
     39#include "WebToStorageProcessConnection.h"
    4040#include <WebCore/IDBConnectionToServer.h>
    4141#include <WebCore/IDBCursorInfo.h>
     
    6666    relaxAdoptionRequirement();
    6767
    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));
    6969    m_connectionToServer = IDBClient::IDBConnectionToServer::create(*this);
    7070}
     
    7373{
    7474    if (m_isOpenInServer)
    75         send(Messages::DatabaseToWebProcessConnection::RemoveIDBConnectionToServer(m_identifier));
     75        send(Messages::StorageToWebProcessConnection::RemoveIDBConnectionToServer(m_identifier));
    7676}
    7777
  • trunk/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp

    r197131 r219986  
    2828
    2929#include "WebProcess.h"
    30 #include "WebToDatabaseProcessConnection.h"
     30#include "WebToStorageProcessConnection.h"
    3131#include <WebCore/SessionID.h>
    3232#include <wtf/HashMap.h>
  • trunk/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.cpp

    r219985 r219986  
    2626
    2727#include "config.h"
    28 #include "WebToDatabaseProcessConnection.h"
     28#include "WebToStorageProcessConnection.h"
    2929
    30 #include "DatabaseToWebProcessConnectionMessages.h"
     30#include "StorageToWebProcessConnectionMessages.h"
    3131#include "WebIDBConnectionToServerMessages.h"
    3232#include "WebProcess.h"
  • trunk/Source/WebKit/WebProcess/WebProcess.cpp

    r219960 r219986  
    6565#include "WebResourceLoadStatisticsStoreMessages.h"
    6666#include "WebSocketStream.h"
    67 #include "WebToDatabaseProcessConnection.h"
     67#include "WebToStorageProcessConnection.h"
    6868#include "WebsiteData.h"
    6969#include "WebsiteDataType.h"
  • trunk/Source/cmake/OptionsWPE.cmake

    r219960 r219986  
    5656set(WebKit2_WebProcess_OUTPUT_NAME WPEWebProcess)
    5757set(WebKit2_NetworkProcess_OUTPUT_NAME WPENetworkProcess)
    58 set(WebKit2_DatabaseProcess_OUTPUT_NAME WPEDatabaseProcess)
     58set(WebKit2_StorageProcess_OUTPUT_NAME WPEStorageProcess)
    5959
    6060find_package(ICU REQUIRED)
  • trunk/Source/cmake/gtksymbols.filter

    r218628 r219986  
    55  NetworkProcessMainUnix;
    66  PluginProcessMainUnix;
    7   DatabaseProcessMainUnix;
     7  StorageProcessMainUnix;
    88  _ZN6WebKit22WebKitExtensionManager10initializeEPNS_14InjectedBundleEPN3API6ObjectE;
    99  _ZN6WebKit22WebKitExtensionManager9singletonEv;
Note: See TracChangeset for help on using the changeset viewer.