⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 220105 in webkit


Ignore:
Timestamp:
Aug 1, 2017, 11:18:03 AM (9 years ago)
Author:
beidson@apple.com
Message:

Part 2 of: Rename DatabaseProcess to StorageProcess.
​https://bugs.webkit.org/show_bug.cgi?id=174880

Reviewed by Andy Estes.

Source/WebKit:

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

  • NetworkProcess/NetworkConnectionToWebProcess.cpp:

(WebKit::NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles):

  • NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::grantSandboxExtensionsToStorageProcessForBlobs):
(WebKit::NetworkProcess::didGrantSandboxExtensionsToStorageProcessForBlobs):
(WebKit::NetworkProcess::grantSandboxExtensionsToDatabaseProcessForBlobs): Deleted.
(WebKit::NetworkProcess::didGrantSandboxExtensionsToDatabaseProcessForBlobs): Deleted.

  • NetworkProcess/NetworkProcess.h:
  • NetworkProcess/NetworkProcess.messages.in:
  • Shared/ProcessExecutablePath.h:
  • Shared/gtk/ProcessExecutablePathGtk.cpp:

(WebKit::executablePathOfStorageProcess):
(WebKit::executablePathOfDatabaseProcess): Deleted.

  • Shared/wpe/ProcessExecutablePathWPE.cpp:

(WebKit::executablePathOfStorageProcess):
(WebKit::executablePathOfDatabaseProcess): Deleted.

  • StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp:

(WebKit::WebIDBConnectionToClient::putOrAdd):

  • StorageProcess/StorageProcess.cpp:

(WebKit::StorageProcess::initializeWebsiteDataStore):
(WebKit::StorageProcess::postStorageTask):
(WebKit::StorageProcess::performNextStorageTask):
(WebKit::StorageProcess::createStorageToWebProcessConnection):
(WebKit::StorageProcess::fetchWebsiteData):
(WebKit::StorageProcess::postDatabaseTask): Deleted.
(WebKit::StorageProcess::performNextDatabaseTask): Deleted.
(WebKit::StorageProcess::createDatabaseToWebProcessConnection): Deleted.

  • StorageProcess/StorageProcess.h:
  • StorageProcess/StorageProcess.messages.in:
  • StorageProcess/mac/StorageProcessMac.mm:

(WebKit::StorageProcess::initializeProcessName):

  • UIProcess/API/C/WKContext.cpp:

(WKContextGetDatabaseProcessIdentifier):

  • UIProcess/API/Cocoa/WKProcessPool.mm:

(-[WKProcessPool _terminateStorageProcess]):
(-[WKProcessPool _storageProcessIdentifier]):
(-[WKProcessPool _terminateDatabaseProcess]): Deleted.
(-[WKProcessPool _databaseProcessIdentifier]): Deleted.

  • UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
  • UIProcess/ChildProcessProxy.cpp:

(WebKit::ChildProcessProxy::getLaunchOptions):

  • UIProcess/Launcher/ProcessLauncher.h:
  • UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:

(WebKit::ProcessLauncher::launchProcess):

  • UIProcess/Launcher/mac/ProcessLauncherMac.mm:

(WebKit::serviceName):

  • UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp:

(WebKit::ProcessLauncher::launchProcess):

  • UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::grantSandboxExtensionsToStorageProcessForBlobs):
(WebKit::NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs): Deleted.

  • UIProcess/Network/NetworkProcessProxy.h:
  • UIProcess/Network/NetworkProcessProxy.messages.in:
  • UIProcess/Storage/StorageProcessProxy.cpp:

(WebKit::StorageProcessProxy::getLaunchOptions):
(WebKit::StorageProcessProxy::getStorageProcessConnection):
(WebKit::StorageProcessProxy::didClose):
(WebKit::StorageProcessProxy::didCreateStorageToWebProcessConnection):
(WebKit::StorageProcessProxy::didFinishLaunching):
(WebKit::StorageProcessProxy::getDatabaseProcessConnection): Deleted.
(WebKit::StorageProcessProxy::didCreateDatabaseToWebProcessConnection): Deleted.

  • UIProcess/Storage/StorageProcessProxy.h:
  • UIProcess/Storage/StorageProcessProxy.messages.in:
  • UIProcess/WebContextClient.cpp:

(WebKit::WebContextClient::storageProcessDidCrash):
(WebKit::WebContextClient::databaseProcessDidCrash): Deleted.

  • UIProcess/WebContextClient.h:
  • UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::ensureStorageProcessAndWebsiteDataStore):
(WebKit::WebProcessPool::getStorageProcessConnection):
(WebKit::WebProcessPool::storageProcessCrashed):
(WebKit::WebProcessPool::pageAddedToProcess):
(WebKit::WebProcessPool::storageProcessIdentifier):
(WebKit::WebProcessPool::terminateStorageProcess):
(WebKit::WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore): Deleted.
(WebKit::WebProcessPool::getDatabaseProcessConnection): Deleted.
(WebKit::WebProcessPool::databaseProcessCrashed): Deleted.
(WebKit::WebProcessPool::databaseProcessIdentifier): Deleted.
(WebKit::WebProcessPool::terminateDatabaseProcess): Deleted.

  • UIProcess/WebProcessPool.h:

(WebKit::WebProcessPool::sendToStorageProcessRelaunchingIfNecessary):
(WebKit::WebProcessPool::sendToDatabaseProcessRelaunchingIfNecessary): Deleted.

  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::getStorageProcessConnection):
(WebKit::WebProcessProxy::getDatabaseProcessConnection): Deleted.

  • UIProcess/WebProcessProxy.h:
  • UIProcess/WebProcessProxy.messages.in:
  • UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::fetchDataAndApply):
(WebKit::WebsiteDataStore::removeData):
(WebKit::WebsiteDataStore::storageProcessParameters):
(WebKit::WebsiteDataStore::databaseProcessParameters): Deleted.

  • UIProcess/WebsiteData/WebsiteDataStore.h:
  • WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:

(WebKit::WebIDBConnectionToServer::messageSenderConnection):

  • WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
  • WebProcess/Databases/WebDatabaseProvider.cpp:

(WebKit::WebDatabaseProvider::idbConnectionToServerForSession):

  • WebProcess/Storage/WebToStorageProcessConnection.cpp:

(WebKit::WebToStorageProcessConnection::WebToStorageProcessConnection):
(WebKit::WebToStorageProcessConnection::~WebToStorageProcessConnection):
(WebKit::WebToStorageProcessConnection::didReceiveMessage):
(WebKit::WebToStorageProcessConnection::didClose):
(WebKit::WebToStorageProcessConnection::didReceiveInvalidMessage):
(WebKit::WebToStorageProcessConnection::idbConnectionToServerForSession):
(WebKit::WebToDatabaseProcessConnection::WebToDatabaseProcessConnection): Deleted.
(WebKit::WebToDatabaseProcessConnection::~WebToDatabaseProcessConnection): Deleted.
(WebKit::WebToDatabaseProcessConnection::didReceiveMessage): Deleted.
(WebKit::WebToDatabaseProcessConnection::didClose): Deleted.
(WebKit::WebToDatabaseProcessConnection::didReceiveInvalidMessage): Deleted.
(WebKit::WebToDatabaseProcessConnection::idbConnectionToServerForSession): Deleted.

  • WebProcess/Storage/WebToStorageProcessConnection.h:

(WebKit::WebToStorageProcessConnection::create):
(WebKit::WebToDatabaseProcessConnection::create): Deleted.
(WebKit::WebToDatabaseProcessConnection::connection): Deleted.

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::webToStorageProcessConnectionClosed):
(WebKit::WebProcess::webToStorageProcessConnection):
(WebKit::WebProcess::ensureWebToStorageProcessConnection):
(WebKit::WebProcess::webToDatabaseProcessConnectionClosed): Deleted.
(WebKit::WebProcess::webToDatabaseProcessConnection): Deleted.
(WebKit::WebProcess::ensureWebToDatabaseProcessConnection): Deleted.

  • WebProcess/WebProcess.h:

Tools:

  • TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.mm:
  • TestWebKitAPI/Tests/WebKit2Cocoa/IDBIndexUpgradeToV2.mm:
  • TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBDatabaseProcessKill.mm:
  • TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm:
  • TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBPersistence.mm:
  • TestWebKitAPI/Tests/WebKit2Cocoa/ResourceLoadStatistics.mm:
  • TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm:
  • TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm:
Location:
trunk
Files:
52 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r220094 r220105  
     12017-08-01  Brady Eidson  <beidson@apple.com>
     2
     3        Part 2 of: Rename DatabaseProcess to StorageProcess.
     4        https://bugs.webkit.org/show_bug.cgi?id=174880
     5
     6        Reviewed by Andy Estes.
     7
     8        Rename some more variables, classes, etc. to reflect the change.
     9
     10        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
     11        (WebKit::NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles):
     12
     13        * NetworkProcess/NetworkProcess.cpp:
     14        (WebKit::NetworkProcess::grantSandboxExtensionsToStorageProcessForBlobs):
     15        (WebKit::NetworkProcess::didGrantSandboxExtensionsToStorageProcessForBlobs):
     16        (WebKit::NetworkProcess::grantSandboxExtensionsToDatabaseProcessForBlobs): Deleted.
     17        (WebKit::NetworkProcess::didGrantSandboxExtensionsToDatabaseProcessForBlobs): Deleted.
     18        * NetworkProcess/NetworkProcess.h:
     19        * NetworkProcess/NetworkProcess.messages.in:
     20
     21        * Shared/ProcessExecutablePath.h:
     22        * Shared/gtk/ProcessExecutablePathGtk.cpp:
     23        (WebKit::executablePathOfStorageProcess):
     24        (WebKit::executablePathOfDatabaseProcess): Deleted.
     25        * Shared/wpe/ProcessExecutablePathWPE.cpp:
     26        (WebKit::executablePathOfStorageProcess):
     27        (WebKit::executablePathOfDatabaseProcess): Deleted.
     28
     29        * StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp:
     30        (WebKit::WebIDBConnectionToClient::putOrAdd):
     31
     32        * StorageProcess/StorageProcess.cpp:
     33        (WebKit::StorageProcess::initializeWebsiteDataStore):
     34        (WebKit::StorageProcess::postStorageTask):
     35        (WebKit::StorageProcess::performNextStorageTask):
     36        (WebKit::StorageProcess::createStorageToWebProcessConnection):
     37        (WebKit::StorageProcess::fetchWebsiteData):
     38        (WebKit::StorageProcess::postDatabaseTask): Deleted.
     39        (WebKit::StorageProcess::performNextDatabaseTask): Deleted.
     40        (WebKit::StorageProcess::createDatabaseToWebProcessConnection): Deleted.
     41        * StorageProcess/StorageProcess.h:
     42        * StorageProcess/StorageProcess.messages.in:
     43        * StorageProcess/mac/StorageProcessMac.mm:
     44        (WebKit::StorageProcess::initializeProcessName):
     45
     46        * UIProcess/API/C/WKContext.cpp:
     47        (WKContextGetDatabaseProcessIdentifier):
     48
     49        * UIProcess/API/Cocoa/WKProcessPool.mm:
     50        (-[WKProcessPool _terminateStorageProcess]):
     51        (-[WKProcessPool _storageProcessIdentifier]):
     52        (-[WKProcessPool _terminateDatabaseProcess]): Deleted.
     53        (-[WKProcessPool _databaseProcessIdentifier]): Deleted.
     54        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
     55
     56        * UIProcess/ChildProcessProxy.cpp:
     57        (WebKit::ChildProcessProxy::getLaunchOptions):
     58
     59        * UIProcess/Launcher/ProcessLauncher.h:
     60        * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
     61        (WebKit::ProcessLauncher::launchProcess):
     62        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
     63        (WebKit::serviceName):
     64        * UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp:
     65        (WebKit::ProcessLauncher::launchProcess):
     66
     67        * UIProcess/Network/NetworkProcessProxy.cpp:
     68        (WebKit::NetworkProcessProxy::grantSandboxExtensionsToStorageProcessForBlobs):
     69        (WebKit::NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs): Deleted.
     70        * UIProcess/Network/NetworkProcessProxy.h:
     71        * UIProcess/Network/NetworkProcessProxy.messages.in:
     72
     73        * UIProcess/Storage/StorageProcessProxy.cpp:
     74        (WebKit::StorageProcessProxy::getLaunchOptions):
     75        (WebKit::StorageProcessProxy::getStorageProcessConnection):
     76        (WebKit::StorageProcessProxy::didClose):
     77        (WebKit::StorageProcessProxy::didCreateStorageToWebProcessConnection):
     78        (WebKit::StorageProcessProxy::didFinishLaunching):
     79        (WebKit::StorageProcessProxy::getDatabaseProcessConnection): Deleted.
     80        (WebKit::StorageProcessProxy::didCreateDatabaseToWebProcessConnection): Deleted.
     81        * UIProcess/Storage/StorageProcessProxy.h:
     82        * UIProcess/Storage/StorageProcessProxy.messages.in:
     83
     84        * UIProcess/WebContextClient.cpp:
     85        (WebKit::WebContextClient::storageProcessDidCrash):
     86        (WebKit::WebContextClient::databaseProcessDidCrash): Deleted.
     87        * UIProcess/WebContextClient.h:
     88
     89        * UIProcess/WebProcessPool.cpp:
     90        (WebKit::WebProcessPool::ensureStorageProcessAndWebsiteDataStore):
     91        (WebKit::WebProcessPool::getStorageProcessConnection):
     92        (WebKit::WebProcessPool::storageProcessCrashed):
     93        (WebKit::WebProcessPool::pageAddedToProcess):
     94        (WebKit::WebProcessPool::storageProcessIdentifier):
     95        (WebKit::WebProcessPool::terminateStorageProcess):
     96        (WebKit::WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore): Deleted.
     97        (WebKit::WebProcessPool::getDatabaseProcessConnection): Deleted.
     98        (WebKit::WebProcessPool::databaseProcessCrashed): Deleted.
     99        (WebKit::WebProcessPool::databaseProcessIdentifier): Deleted.
     100        (WebKit::WebProcessPool::terminateDatabaseProcess): Deleted.
     101        * UIProcess/WebProcessPool.h:
     102        (WebKit::WebProcessPool::sendToStorageProcessRelaunchingIfNecessary):
     103        (WebKit::WebProcessPool::sendToDatabaseProcessRelaunchingIfNecessary): Deleted.
     104
     105        * UIProcess/WebProcessProxy.cpp:
     106        (WebKit::WebProcessProxy::getStorageProcessConnection):
     107        (WebKit::WebProcessProxy::getDatabaseProcessConnection): Deleted.
     108        * UIProcess/WebProcessProxy.h:
     109        * UIProcess/WebProcessProxy.messages.in:
     110
     111        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
     112        (WebKit::WebsiteDataStore::fetchDataAndApply):
     113        (WebKit::WebsiteDataStore::removeData):
     114        (WebKit::WebsiteDataStore::storageProcessParameters):
     115        (WebKit::WebsiteDataStore::databaseProcessParameters): Deleted.
     116        * UIProcess/WebsiteData/WebsiteDataStore.h:
     117
     118        * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:
     119        (WebKit::WebIDBConnectionToServer::messageSenderConnection):
     120        * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
     121
     122        * WebProcess/Databases/WebDatabaseProvider.cpp:
     123        (WebKit::WebDatabaseProvider::idbConnectionToServerForSession):
     124
     125        * WebProcess/Storage/WebToStorageProcessConnection.cpp:
     126        (WebKit::WebToStorageProcessConnection::WebToStorageProcessConnection):
     127        (WebKit::WebToStorageProcessConnection::~WebToStorageProcessConnection):
     128        (WebKit::WebToStorageProcessConnection::didReceiveMessage):
     129        (WebKit::WebToStorageProcessConnection::didClose):
     130        (WebKit::WebToStorageProcessConnection::didReceiveInvalidMessage):
     131        (WebKit::WebToStorageProcessConnection::idbConnectionToServerForSession):
     132        (WebKit::WebToDatabaseProcessConnection::WebToDatabaseProcessConnection): Deleted.
     133        (WebKit::WebToDatabaseProcessConnection::~WebToDatabaseProcessConnection): Deleted.
     134        (WebKit::WebToDatabaseProcessConnection::didReceiveMessage): Deleted.
     135        (WebKit::WebToDatabaseProcessConnection::didClose): Deleted.
     136        (WebKit::WebToDatabaseProcessConnection::didReceiveInvalidMessage): Deleted.
     137        (WebKit::WebToDatabaseProcessConnection::idbConnectionToServerForSession): Deleted.
     138        * WebProcess/Storage/WebToStorageProcessConnection.h:
     139        (WebKit::WebToStorageProcessConnection::create):
     140        (WebKit::WebToDatabaseProcessConnection::create): Deleted.
     141        (WebKit::WebToDatabaseProcessConnection::connection): Deleted.
     142
     143        * WebProcess/WebProcess.cpp:
     144        (WebKit::WebProcess::webToStorageProcessConnectionClosed):
     145        (WebKit::WebProcess::webToStorageProcessConnection):
     146        (WebKit::WebProcess::ensureWebToStorageProcessConnection):
     147        (WebKit::WebProcess::webToDatabaseProcessConnectionClosed): Deleted.
     148        (WebKit::WebProcess::webToDatabaseProcessConnection): Deleted.
     149        (WebKit::WebProcess::ensureWebToDatabaseProcessConnection): Deleted.
     150        * WebProcess/WebProcess.h:
     151
    11522017-08-01  Brady Eidson  <beidson@apple.com>
    2153

  • trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp

    r220037 r220105  
    399399            file->revokeFileAccess();
    400400
    401         NetworkProcess::singleton().grantSandboxExtensionsToDatabaseProcessForBlobs(fileNames, [this, protectedThis = WTFMove(protectedThis), requestIdentifier, fileNames]() {
     401        NetworkProcess::singleton().grantSandboxExtensionsToStorageProcessForBlobs(fileNames, [this, protectedThis = WTFMove(protectedThis), requestIdentifier, fileNames]() {
    402402            if (!m_connection->isValid())
    403403                return;

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

    r220037 r220105  
    304304}
    305305
    306 void NetworkProcess::grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler)
     306void NetworkProcess::grantSandboxExtensionsToStorageProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler)
    307307{
    308308    static uint64_t lastRequestID;
    … …  
    310310    uint64_t requestID = ++lastRequestID;
    311311    m_sandboxExtensionForBlobsCompletionHandlers.set(requestID, WTFMove(completionHandler));
    312     parentProcessConnection()->send(Messages::NetworkProcessProxy::GrantSandboxExtensionsToDatabaseProcessForBlobs(requestID, filenames), 0);
    313 }
    314 
    315 void NetworkProcess::didGrantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID)
     312    parentProcessConnection()->send(Messages::NetworkProcessProxy::GrantSandboxExtensionsToStorageProcessForBlobs(requestID, filenames), 0);
     313}
     314
     315void NetworkProcess::didGrantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID)
    316316{
    317317    if (auto handler = m_sandboxExtensionForBlobsCompletionHandlers.take(requestID))

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

    r220037 r220105  
    116116    void ensurePrivateBrowsingSession(WebsiteDataStoreParameters&&);
    117117
    118     void grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler);
     118    void grantSandboxExtensionsToStorageProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler);
    119119
    120120#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
    … …  
    198198    void syncAllCookies();
    199199
    200     void didGrantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID);
     200    void didGrantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID);
    201201
    202202#if USE(SOUP)

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in

    r220037 r220105  
    8181    ProcessDidResume()
    8282
    83     DidGrantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID)
     83    DidGrantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID)
    8484
    8585#if HAVE(CFNETWORK_STORAGE_PARTITIONING)

  • trunk/Source/WebKit/Shared/ProcessExecutablePath.h

    r220037 r220105  
    3333String executablePathOfPluginProcess();
    3434String executablePathOfNetworkProcess();
    35 String executablePathOfDatabaseProcess();
     35String executablePathOfStorageProcess();
    3636
    3737}

  • trunk/Source/WebKit/Shared/gtk/ProcessExecutablePathGtk.cpp

    r220037 r220105  
    8585}
    8686
    87 String executablePathOfDatabaseProcess()
     87String executablePathOfStorageProcess()
    8888{
    89     return findWebKitProcess("WebKitDatabaseProcess");
     89    return findWebKitProcess("WebKitStorageProcess");
    9090}
    9191

  • trunk/Source/WebKit/Shared/wpe/ProcessExecutablePathWPE.cpp

    r220037 r220105  
    7878}
    7979
    80 String executablePathOfDatabaseProcess()
     80String executablePathOfStorageProcess()
    8181{
    82     return findWebKitProcess("WPEDatabaseProcess");
     82    return findWebKitProcess("WPEStorageProcess");
    8383}
    8484

  • trunk/Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp

    r220094 r220105  
    288288        && overwriteMode != static_cast<unsigned>(IndexedDB::ObjectStoreOverwriteMode::OverwriteForCursor)) {
    289289        // FIXME: This message from the WebProcess is corrupt.
    290         // The DatabaseProcess should return early at this point, but can we also kill the bad WebProcess?
     290        // The StorageProcess should return early at this point, but can we also kill the bad WebProcess?
    291291        return;
    292292    }

  • trunk/Source/WebKit/StorageProcess/StorageProcess.cpp

    r220094 r220105  
    122122    SandboxExtension::consumePermanently(parameters.indexedDatabaseDirectoryExtensionHandle);
    123123
    124     postDatabaseTask(createCrossThreadTask(*this, &StorageProcess::ensurePathExists, parameters.indexedDatabaseDirectory));
     124    postStorageTask(createCrossThreadTask(*this, &StorageProcess::ensurePathExists, parameters.indexedDatabaseDirectory));
    125125#endif
    126126}
    … …  
    134134}
    135135
    136 void StorageProcess::postDatabaseTask(CrossThreadTask&& task)
     136void StorageProcess::postStorageTask(CrossThreadTask&& task)
    137137{
    138138    ASSERT(RunLoop::isMain());
    139139
    140     LockHolder locker(m_databaseTaskMutex);
    141 
    142     m_databaseTasks.append(WTFMove(task));
     140    LockHolder locker(m_storageTaskMutex);
     141
     142    m_storageTasks.append(WTFMove(task));
    143143
    144144    m_queue->dispatch([this] {
    145         performNextDatabaseTask();
     145        performNextStorageTask();
    146146    });
    147147}
    148148
    149 void StorageProcess::performNextDatabaseTask()
     149void StorageProcess::performNextStorageTask()
    150150{
    151151    ASSERT(!RunLoop::isMain());
    … …  
    153153    CrossThreadTask task;
    154154    {
    155         LockHolder locker(m_databaseTaskMutex);
    156         ASSERT(!m_databaseTasks.isEmpty());
    157         task = m_databaseTasks.takeFirst();
     155        LockHolder locker(m_storageTaskMutex);
     156        ASSERT(!m_storageTasks.isEmpty());
     157        task = m_storageTasks.takeFirst();
    158158    }
    159159
    … …  
    161161}
    162162
    163 void StorageProcess::createDatabaseToWebProcessConnection()
     163void StorageProcess::createStorageToWebProcessConnection()
    164164{
    165165#if USE(UNIX_DOMAIN_SOCKETS)
    166166    IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
    167167    m_databaseToWebProcessConnections.append(StorageToWebProcessConnection::create(socketPair.server));
    168     parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateDatabaseToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);
     168    parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateStorageToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);
    169169#elif OS(DARWIN)
    170170    // Create the listening port.
    … …  
    176176
    177177    IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
    178     parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateDatabaseToWebProcessConnection(clientPort), 0);
     178    parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateStorageToWebProcessConnection(clientPort), 0);
    179179#else
    180180    notImplemented();
    … …  
    197197    if (websiteDataTypes.contains(WebsiteDataType::IndexedDBDatabases)) {
    198198        // FIXME: Pick the right database store based on the session ID.
    199         postDatabaseTask(CrossThreadTask([this, completionHandler = WTFMove(completionHandler), path = WTFMove(path)]() mutable {
     199        postStorageTask(CrossThreadTask([this, completionHandler = WTFMove(completionHandler), path = WTFMove(path)]() mutable {
    200200            RunLoop::main().dispatch([completionHandler = WTFMove(completionHandler), securityOrigins = indexedDatabaseOrigins(path)] {
    201201                WebsiteData websiteData;

  • trunk/Source/WebKit/StorageProcess/StorageProcess.h

    r220094 r220105  
    6262    WorkQueue& queue() { return m_queue.get(); }
    6363
    64     void postDatabaseTask(CrossThreadTask&&);
     64    void postStorageTask(CrossThreadTask&&);
    6565
    6666#if ENABLE(INDEXED_DATABASE)
    … …  
    9191    // Message Handlers
    9292    void initializeWebsiteDataStore(const StorageProcessCreationParameters&);
    93     void createDatabaseToWebProcessConnection();
     93    void createStorageToWebProcessConnection();
    9494
    9595    void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID);
    … …  
    106106
    107107    // For execution on work queue thread only
    108     void performNextDatabaseTask();
     108    void performNextStorageTask();
    109109    void ensurePathExists(const String&);
    110110
    … …  
    120120    HashMap<uint64_t, WTF::Function<void (SandboxExtension::HandleArray&&)>> m_sandboxExtensionForBlobsCompletionHandlers;
    121121
    122     Deque<CrossThreadTask> m_databaseTasks;
    123     Lock m_databaseTaskMutex;
     122    Deque<CrossThreadTask> m_storageTasks;
     123    Lock m_storageTaskMutex;
    124124};
    125125

  • trunk/Source/WebKit/StorageProcess/StorageProcess.messages.in

    r220094 r220105  
    2626
    2727    # Creates a connection for communication with a WebProcess
    28     CreateDatabaseToWebProcessConnection()
     28    CreateStorageToWebProcessConnection()
    2929
    3030    FetchWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, uint64_t callbackID)

  • trunk/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm

    r220094 r220105  
    4747void StorageProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
    4848{
    49     NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Database Storage", "visible name of the database process. The argument is the application name."), (NSString *)parameters.uiProcessName];
     49    NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Storage", "visible name of the storage process. The argument is the application name."), (NSString *)parameters.uiProcessName];
    5050    WKSetVisibleApplicationName((CFStringRef)applicationName);
    5151}

  • trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp

    r220037 r220105  
    591591pid_t WKContextGetDatabaseProcessIdentifier(WKContextRef contextRef)
    592592{
    593     return toImpl(contextRef)->databaseProcessIdentifier();
    594 }
     593    return toImpl(contextRef)->storageProcessIdentifier();
     594}

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm

    r220037 r220105  
    386386}
    387387
    388 - (void)_terminateDatabaseProcess
    389 {
    390     _processPool->terminateDatabaseProcess();
     388- (void)_terminateStorageProcess
     389{
     390    _processPool->terminateStorageProcess();
    391391}
    392392
    … …  
    401401}
    402402
    403 - (pid_t)_databaseProcessIdentifier
    404 {
    405     return _processPool->databaseProcessIdentifier();
     403- (pid_t)_storageProcessIdentifier
     404{
     405    return _processPool->storageProcessIdentifier();
    406406}
    407407

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h

    r220037 r220105  
    7373
    7474// Test only. Should be called only while no web content processes are running.
    75 - (void)_terminateDatabaseProcess;
     75- (void)_terminateStorageProcess;
    7676- (void)_terminateNetworkProcess;
    7777
    7878// Test only.
    7979- (pid_t)_networkProcessIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    80 - (pid_t)_databaseProcessIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     80- (pid_t)_storageProcessIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    8181
    8282// Test only.

  • trunk/Source/WebKit/UIProcess/ChildProcessProxy.cpp

    r220037 r220105  
    7171        varname = "NETWORK_PROCESS_CMD_PREFIX";
    7272        break;
    73     case ProcessLauncher::ProcessType::Database:
    74         varname = "DATABASE_PROCESS_CMD_PREFIX";
     73    case ProcessLauncher::ProcessType::Storage:
     74        varname = "STORAGE_PROCESS_CMD_PREFIX";
    7575        break;
    7676    }

  • trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h

    r220037 r220105  
    5252#endif
    5353        Network,
    54         Database,
     54        Storage,
    5555    };
    5656

  • trunk/Source/WebKit/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp

    r220037 r220105  
    8282        executablePath = executablePathOfNetworkProcess();
    8383        break;
    84     case ProcessLauncher::ProcessType::Database:
    85         executablePath = executablePathOfDatabaseProcess();
     84    case ProcessLauncher::ProcessType::Storage:
     85        executablePath = executablePathOfStorageProcess();
    8686        break;
    8787    default:

  • trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm

    r220038 r220105  
    5656    case ProcessLauncher::ProcessType::Network:
    5757        return "com.apple.WebKit.Networking";
    58     case ProcessLauncher::ProcessType::Database:
     58    case ProcessLauncher::ProcessType::Storage:
    5959        return "com.apple.WebKit.Databases";
    6060#if ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit/UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp

    r220037 r220105  
    6868        executablePath = executablePathOfNetworkProcess();
    6969        break;
    70     case ProcessLauncher::ProcessType::Database:
    71         executablePath = executablePathOfDatabaseProcess();
     70    case ProcessLauncher::ProcessType::Storage:
     71        executablePath = executablePathOfStorageProcess();
    7272        break;
    7373    default:

  • trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

    r220094 r220105  
    290290}
    291291
    292 void NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID, const Vector<String>& paths)
     292void NetworkProcessProxy::grantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID, const Vector<String>& paths)
    293293{
    294294#if ENABLE(SANDBOX_EXTENSIONS)
    … …  
    296296    extensions.allocate(paths.size());
    297297    for (size_t i = 0; i < paths.size(); ++i) {
    298         // ReadWrite is required for creating hard links as well as deleting the temporary file, which the DatabaseProcess will do.
     298        // ReadWrite is required for creating hard links as well as deleting the temporary file, which the StorageProcess will do.
    299299        SandboxExtension::createHandle(paths[i], SandboxExtension::ReadWrite, extensions[i]);
    300300    }
    301301
    302     m_processPool.sendToDatabaseProcessRelaunchingIfNecessary(Messages::StorageProcess::GrantSandboxExtensionsForBlobs(paths, extensions));
    303 #endif
    304     connection()->send(Messages::NetworkProcess::DidGrantSandboxExtensionsToDatabaseProcessForBlobs(requestID), 0);
     302    m_processPool.sendToStorageProcessRelaunchingIfNecessary(Messages::StorageProcess::GrantSandboxExtensionsForBlobs(paths, extensions));
     303#endif
     304    connection()->send(Messages::NetworkProcess::DidGrantSandboxExtensionsToStorageProcessForBlobs(requestID), 0);
    305305}
    306306

  • trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h

    r220037 r220105  
    112112    void didDeleteWebsiteData(uint64_t callbackID);
    113113    void didDeleteWebsiteDataForOrigins(uint64_t callbackID);
    114     void grantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID, const Vector<String>& paths);
     114    void grantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID, const Vector<String>& paths);
    115115    void logDiagnosticMessage(uint64_t pageID, const String& message, const String& description, WebCore::ShouldSample);
    116116    void logDiagnosticMessageWithResult(uint64_t pageID, const String& message, const String& description, uint32_t result, WebCore::ShouldSample);

  • trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in

    r220037 r220105  
    3030    DidDeleteWebsiteDataForOrigins(uint64_t callbackID)
    3131
    32     GrantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID, Vector<String> paths)
     32    GrantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID, Vector<String> paths)
    3333
    3434    ProcessReadyToSuspend()

  • trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp

    r220094 r220105  
    6767void StorageProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
    6868{
    69     launchOptions.processType = ProcessLauncher::ProcessType::Database;
     69    launchOptions.processType = ProcessLauncher::ProcessType::Storage;
    7070    ChildProcessProxy::getLaunchOptions(launchOptions);
    7171}
    … …  
    112112}
    113113
    114 void StorageProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
     114void StorageProcessProxy::getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&& reply)
    115115{
    116116    m_pendingConnectionReplies.append(WTFMove(reply));
    … …  
    121121    }
    122122
    123     send(Messages::StorageProcess::CreateDatabaseToWebProcessConnection(), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
     123    send(Messages::StorageProcess::CreateStorageToWebProcessConnection(), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
    124124}
    125125
    126126void StorageProcessProxy::didClose(IPC::Connection&)
    127127{
    128     // The database process must have crashed or exited, so send any pending sync replies we might have.
     128    // The storage process must have crashed or exited, so send any pending sync replies we might have.
    129129    while (!m_pendingConnectionReplies.isEmpty()) {
    130130        auto reply = m_pendingConnectionReplies.takeFirst();
    … …  
    151151    m_pendingDeleteWebsiteDataForOriginsCallbacks.clear();
    152152
    153     // Tell ProcessPool to forget about this database process. This may cause us to be deleted.
    154     m_processPool->databaseProcessCrashed(this);
     153    // Tell ProcessPool to forget about this storage process. This may cause us to be deleted.
     154    m_processPool->storageProcessCrashed(this);
    155155}
    156156
    … …  
    159159}
    160160
    161 void StorageProcessProxy::didCreateDatabaseToWebProcessConnection(const IPC::Attachment& connectionIdentifier)
     161void StorageProcessProxy::didCreateStorageToWebProcessConnection(const IPC::Attachment& connectionIdentifier)
    162162{
    163163    ASSERT(!m_pendingConnectionReplies.isEmpty());
    164164
    165     RefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
     165    RefPtr<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
    166166
    167167#if USE(UNIX_DOMAIN_SOCKETS)
    … …  
    216216
    217217    for (unsigned i = 0; i < m_numPendingConnectionRequests; ++i)
    218         send(Messages::StorageProcess::CreateDatabaseToWebProcessConnection(), 0);
     218        send(Messages::StorageProcess::CreateStorageToWebProcessConnection(), 0);
    219219   
    220220    m_numPendingConnectionRequests = 0;

  • trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h

    r220094 r220105  
    5353    void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>&, WTF::Function<void()>&& completionHandler);
    5454
    55     void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
     55    void getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&&);
    5656
    5757private:
    … …  
    7070
    7171    // Message handlers
    72     void didCreateDatabaseToWebProcessConnection(const IPC::Attachment&);
     72    void didCreateStorageToWebProcessConnection(const IPC::Attachment&);
    7373    void didFetchWebsiteData(uint64_t callbackID, const WebsiteData&);
    7474    void didDeleteWebsiteData(uint64_t callbackID);
    … …  
    8484
    8585    unsigned m_numPendingConnectionRequests;
    86     Deque<Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>> m_pendingConnectionReplies;
     86    Deque<Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>> m_pendingConnectionReplies;
    8787
    8888    HashMap<uint64_t, WTF::Function<void (WebsiteData)>> m_pendingFetchWebsiteDataCallbacks;

  • trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.messages.in

    r220094 r220105  
    2222
    2323messages -> StorageProcessProxy LegacyReceiver {
    24     DidCreateDatabaseToWebProcessConnection(IPC::Attachment connectionIdentifier)
     24    DidCreateStorageToWebProcessConnection(IPC::Attachment connectionIdentifier)
    2525
    2626    DidFetchWebsiteData(uint64_t callbackID, struct WebKit::WebsiteData websiteData)

  • trunk/Source/WebKit/UIProcess/WebContextClient.cpp

    r220037 r220105  
    4747}
    4848
    49 void WebContextClient::databaseProcessDidCrash(WebProcessPool* processPool)
     49void WebContextClient::storageProcessDidCrash(WebProcessPool* processPool)
    5050{
    5151    if (!m_client.databaseProcessDidCrash)

  • trunk/Source/WebKit/UIProcess/WebContextClient.h

    r220037 r220105  
    4646    void plugInAutoStartOriginHashesChanged(WebProcessPool*);
    4747    void networkProcessDidCrash(WebProcessPool*);
    48     void databaseProcessDidCrash(WebProcessPool*);
     48    void storageProcessDidCrash(WebProcessPool*);
    4949};
    5050

  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r220094 r220105  
    515515}
    516516
    517 void WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore)
     517void WebProcessPool::ensureStorageProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore)
    518518{
    519519    // *********
    … …  
    521521    // *********
    522522
    523     if (!m_databaseProcess) {
    524         m_databaseProcess = StorageProcessProxy::create(this);
     523    if (!m_storageProcess) {
     524        m_storageProcess = StorageProcessProxy::create(this);
    525525
    526526        StorageProcessCreationParameters parameters;
    … …  
    534534
    535535        ASSERT(!parameters.indexedDatabaseDirectory.isEmpty());
    536         m_databaseProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(parameters), 0);
     536        m_storageProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(parameters), 0);
    537537    }
    538538
    … …  
    540540        return;
    541541
    542     m_databaseProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(relevantDataStore->databaseProcessParameters()), 0);
    543 }
    544 
    545 void WebProcessPool::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
    546 {
    547     ensureDatabaseProcessAndWebsiteDataStore(nullptr);
    548 
    549     m_databaseProcess->getDatabaseProcessConnection(WTFMove(reply));
    550 }
    551 
    552 void WebProcessPool::databaseProcessCrashed(StorageProcessProxy* databaseProcessProxy)
    553 {
    554     ASSERT(m_databaseProcess);
    555     ASSERT(databaseProcessProxy == m_databaseProcess.get());
     542    m_storageProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(relevantDataStore->storageProcessParameters()), 0);
     543}
     544
     545void WebProcessPool::getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&& reply)
     546{
     547    ensureStorageProcessAndWebsiteDataStore(nullptr);
     548
     549    m_storageProcess->getStorageProcessConnection(WTFMove(reply));
     550}
     551
     552void WebProcessPool::storageProcessCrashed(StorageProcessProxy* storageProcessProxy)
     553{
     554    ASSERT(m_storageProcess);
     555    ASSERT(storageProcessProxy == m_storageProcess.get());
    556556
    557557    for (auto& supplement : m_supplements.values())
    558         supplement->processDidClose(databaseProcessProxy);
    559 
    560     m_client.databaseProcessDidCrash(this);
    561     m_databaseProcess = nullptr;
     558        supplement->processDidClose(storageProcessProxy);
     559
     560    m_client.storageProcessDidCrash(this);
     561    m_storageProcess = nullptr;
    562562}
    563563
    … …  
    960960
    961961#if ENABLE(INDEXED_DATABASE)
    962         auto databaseParameters = page.websiteDataStore().databaseProcessParameters();
    963         if (!databaseParameters.indexedDatabaseDirectory.isEmpty())
    964             sendToDatabaseProcessRelaunchingIfNecessary(Messages::StorageProcess::InitializeWebsiteDataStore(databaseParameters));
     962        auto storageParameters = page.websiteDataStore().storageProcessParameters();
     963        if (!storageParameters.indexedDatabaseDirectory.isEmpty())
     964            sendToStorageProcessRelaunchingIfNecessary(Messages::StorageProcess::InitializeWebsiteDataStore(storageParameters));
    965965#endif
    966966    }
    … …  
    10741074}
    10751075
    1076 pid_t WebProcessPool::databaseProcessIdentifier()
    1077 {
    1078     if (!m_databaseProcess)
     1076pid_t WebProcessPool::storageProcessIdentifier()
     1077{
     1078    if (!m_storageProcess)
    10791079        return 0;
    10801080
    1081     return m_databaseProcess->processIdentifier();
     1081    return m_storageProcess->processIdentifier();
    10821082}
    10831083
    … …  
    13031303}
    13041304
    1305 void WebProcessPool::terminateDatabaseProcess()
    1306 {
    1307     if (!m_databaseProcess)
    1308         return;
    1309 
    1310     m_databaseProcess->terminate();
    1311     m_databaseProcess = nullptr;
     1305void WebProcessPool::terminateStorageProcess()
     1306{
     1307    if (!m_storageProcess)
     1308        return;
     1309
     1310    m_storageProcess->terminate();
     1311    m_storageProcess = nullptr;
    13121312}
    13131313

  • trunk/Source/WebKit/UIProcess/WebProcessPool.h

    r220094 r220105  
    161161    template<typename T> void sendToNetworkingProcessRelaunchingIfNecessary(T&& message);
    162162
    163     // Sends the message to WebProcess or DatabaseProcess as approporiate for current process model.
    164     template<typename T> void sendToDatabaseProcessRelaunchingIfNecessary(T&& message);
     163    // Sends the message to WebProcess or StorageProcess as approporiate for current process model.
     164    template<typename T> void sendToStorageProcessRelaunchingIfNecessary(T&& message);
    165165
    166166    void processDidFinishLaunching(WebProcessProxy*);
    … …  
    200200
    201201    pid_t networkProcessIdentifier();
    202     pid_t databaseProcessIdentifier();
     202    pid_t storageProcessIdentifier();
    203203
    204204    void setAlwaysUsesComplexTextCodePath(bool);
    … …  
    256256
    257257    void clearCachedCredentials();
    258     void terminateDatabaseProcess();
     258    void terminateStorageProcess();
    259259    void terminateNetworkProcess();
    260260
    … …  
    313313    void getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
    314314
    315     void ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore);
    316     StorageProcessProxy* databaseProcess() { return m_databaseProcess.get(); }
    317     void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
    318     void databaseProcessCrashed(StorageProcessProxy*);
     315    void ensureStorageProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore);
     316    StorageProcessProxy* storageProcess() { return m_storageProcess.get(); }
     317    void getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&&);
     318    void storageProcessCrashed(StorageProcessProxy*);
    319319
    320320#if PLATFORM(COCOA)
    … …  
    550550    bool m_didNetworkProcessCrash;
    551551    RefPtr<NetworkProcessProxy> m_networkProcess;
    552     RefPtr<StorageProcessProxy> m_databaseProcess;
     552    RefPtr<StorageProcessProxy> m_storageProcess;
    553553
    554554    HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks;
    … …  
    628628
    629629template<typename T>
    630 void WebProcessPool::sendToDatabaseProcessRelaunchingIfNecessary(T&& message)
     630void WebProcessPool::sendToStorageProcessRelaunchingIfNecessary(T&& message)
    631631{
    632     ensureDatabaseProcessAndWebsiteDataStore(nullptr);
    633     m_databaseProcess->send(std::forward<T>(message), 0);
     632    ensureStorageProcessAndWebsiteDataStore(nullptr);
     633    m_storageProcess->send(std::forward<T>(message), 0);
    634634}
    635635

  • trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

    r220037 r220105  
    574574}
    575575
    576 void WebProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
    577 {
    578     m_processPool->getDatabaseProcessConnection(WTFMove(reply));
     576void WebProcessProxy::getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&& reply)
     577{
     578    m_processPool->getStorageProcessConnection(WTFMove(reply));
    579579}
    580580

  • trunk/Source/WebKit/UIProcess/WebProcessProxy.h

    r220037 r220105  
    215215#endif
    216216    void getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
    217     void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
     217    void getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&&);
    218218
    219219    bool platformIsBeingDebugged() const;

  • trunk/Source/WebKit/UIProcess/WebProcessProxy.messages.in

    r220037 r220105  
    3838#endif
    3939    GetNetworkProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
    40     GetDatabaseProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
     40    GetStorageProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
    4141    ProcessReadyToSuspend()
    4242    DidCancelProcessSuspension()

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

    r220094 r220105  
    434434    if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
    435435        for (auto& processPool : processPools()) {
    436             processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
     436            processPool->ensureStorageProcessAndWebsiteDataStore(this);
    437437
    438438            callbackAggregator->addPendingCallback();
    439             processPool->databaseProcess()->fetchWebsiteData(m_sessionID, dataTypes, [callbackAggregator, processPool](WebsiteData websiteData) {
     439            processPool->storageProcess()->fetchWebsiteData(m_sessionID, dataTypes, [callbackAggregator, processPool](WebsiteData websiteData) {
    440440                callbackAggregator->removePendingCallback(WTFMove(websiteData));
    441441            });
    … …  
    728728    if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
    729729        for (auto& processPool : processPools()) {
    730             processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
     730            processPool->ensureStorageProcessAndWebsiteDataStore(this);
    731731
    732732            callbackAggregator->addPendingCallback();
    733             processPool->databaseProcess()->deleteWebsiteData(m_sessionID, dataTypes, modifiedSince, [callbackAggregator, processPool] {
     733            processPool->storageProcess()->deleteWebsiteData(m_sessionID, dataTypes, modifiedSince, [callbackAggregator, processPool] {
    734734                callbackAggregator->removePendingCallback();
    735735            });
    … …  
    10051005    if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
    10061006        for (auto& processPool : processPools()) {
    1007             processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
     1007            processPool->ensureStorageProcessAndWebsiteDataStore(this);
    10081008
    10091009            callbackAggregator->addPendingCallback();
    1010             processPool->databaseProcess()->deleteWebsiteDataForOrigins(m_sessionID, dataTypes, origins, [callbackAggregator, processPool] {
     1010            processPool->storageProcess()->deleteWebsiteDataForOrigins(m_sessionID, dataTypes, origins, [callbackAggregator, processPool] {
    10111011                callbackAggregator->removePendingCallback();
    10121012            });
    … …  
    13161316}
    13171317
    1318 StorageProcessCreationParameters WebsiteDataStore::databaseProcessParameters()
     1318StorageProcessCreationParameters WebsiteDataStore::storageProcessParameters()
    13191319{
    13201320    resolveDirectoriesIfNecessary();

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

    r220094 r220105  
    122122
    123123    WebsiteDataStoreParameters parameters();
    124     StorageProcessCreationParameters databaseProcessParameters();
     124    StorageProcessCreationParameters storageProcessParameters();
    125125
    126126    Vector<WebCore::Cookie> pendingCookies() const;

  • trunk/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp

    r220094 r220105  
    7878IPC::Connection* WebIDBConnectionToServer::messageSenderConnection()
    7979{
    80     return &WebProcess::singleton().webToDatabaseProcessConnection()->connection();
     80    return &WebProcess::singleton().webToStorageProcessConnection()->connection();
    8181}
    8282

  • trunk/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h

    r220037 r220105  
    8080    void deref() override { RefCounted<WebIDBConnectionToServer>::deref(); }
    8181
    82     // Messages received from DatabaseProcess
     82    // Messages received from StorageProcess
    8383    void didDeleteDatabase(const WebCore::IDBResultData&);
    8484    void didOpenDatabase(const WebCore::IDBResultData&);

  • trunk/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp

    r220094 r220105  
    8080    }
    8181
    82     ASSERT(WebProcess::singleton().webToDatabaseProcessConnection());
    83     return WebProcess::singleton().webToDatabaseProcessConnection()->idbConnectionToServerForSession(sessionID).coreConnectionToServer();
     82    ASSERT(WebProcess::singleton().webToStorageProcessConnection());
     83    return WebProcess::singleton().webToStorageProcessConnection()->idbConnectionToServerForSession(sessionID).coreConnectionToServer();
    8484}
    8585

  • trunk/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.cpp

    r220094 r220105  
    3636namespace WebKit {
    3737
    38 WebToDatabaseProcessConnection::WebToDatabaseProcessConnection(IPC::Connection::Identifier connectionIdentifier)
     38WebToStorageProcessConnection::WebToStorageProcessConnection(IPC::Connection::Identifier connectionIdentifier)
    3939    : m_connection(IPC::Connection::createClientConnection(connectionIdentifier, *this))
    4040{
    … …  
    4242}
    4343
    44 WebToDatabaseProcessConnection::~WebToDatabaseProcessConnection()
     44WebToStorageProcessConnection::~WebToStorageProcessConnection()
    4545{
    4646}
    4747
    48 void WebToDatabaseProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
     48void WebToStorageProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
    4949{
    5050#if ENABLE(INDEXED_DATABASE)
    … …  
    6060}
    6161
    62 void WebToDatabaseProcessConnection::didClose(IPC::Connection& connection)
     62void WebToStorageProcessConnection::didClose(IPC::Connection& connection)
    6363{
    6464#if ENABLE(INDEXED_DATABASE)
    … …  
    7070#endif
    7171
    72     WebProcess::singleton().webToDatabaseProcessConnectionClosed(this);
     72    WebProcess::singleton().webToStorageProcessConnectionClosed(this);
    7373}
    7474
    75 void WebToDatabaseProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
     75void WebToStorageProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
    7676{
    7777}
    7878
    7979#if ENABLE(INDEXED_DATABASE)
    80 WebIDBConnectionToServer& WebToDatabaseProcessConnection::idbConnectionToServerForSession(const SessionID& sessionID)
     80WebIDBConnectionToServer& WebToStorageProcessConnection::idbConnectionToServerForSession(const SessionID& sessionID)
    8181{
    8282    auto result = m_webIDBConnectionsBySession.add(sessionID, nullptr);

  • trunk/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.h

    r220094 r220105  
    3939namespace WebKit {
    4040
    41 class WebToDatabaseProcessConnection : public RefCounted<WebToDatabaseProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender {
     41class WebToStorageProcessConnection : public RefCounted<WebToStorageProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender {
    4242public:
    43     static Ref<WebToDatabaseProcessConnection> create(IPC::Connection::Identifier connectionIdentifier)
     43    static Ref<WebToStorageProcessConnection> create(IPC::Connection::Identifier connectionIdentifier)
    4444    {
    45         return adoptRef(*new WebToDatabaseProcessConnection(connectionIdentifier));
     45        return adoptRef(*new WebToStorageProcessConnection(connectionIdentifier));
    4646    }
    47     ~WebToDatabaseProcessConnection();
     47    ~WebToStorageProcessConnection();
    4848   
    4949    IPC::Connection& connection() { return m_connection.get(); }
    … …  
    5454
    5555private:
    56     WebToDatabaseProcessConnection(IPC::Connection::Identifier);
     56    WebToStorageProcessConnection(IPC::Connection::Identifier);
    5757
    5858    // IPC::Connection::Client

  • trunk/Source/WebKit/WebProcess/WebProcess.cpp

    r220094 r220105  
    11401140}
    11411141
    1142 void WebProcess::webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection* connection)
    1143 {
    1144     ASSERT(m_webToDatabaseProcessConnection);
    1145     ASSERT(m_webToDatabaseProcessConnection == connection);
    1146 
    1147     m_webToDatabaseProcessConnection = nullptr;
    1148 }
    1149 
    1150 WebToDatabaseProcessConnection* WebProcess::webToDatabaseProcessConnection()
    1151 {
    1152     if (!m_webToDatabaseProcessConnection)
    1153         ensureWebToDatabaseProcessConnection();
    1154 
    1155     return m_webToDatabaseProcessConnection.get();
    1156 }
    1157 
    1158 void WebProcess::ensureWebToDatabaseProcessConnection()
    1159 {
    1160     if (m_webToDatabaseProcessConnection)
     1142void WebProcess::webToStorageProcessConnectionClosed(WebToStorageProcessConnection* connection)
     1143{
     1144    ASSERT(m_webToStorageProcessConnection);
     1145    ASSERT(m_webToStorageProcessConnection == connection);
     1146
     1147    m_webToStorageProcessConnection = nullptr;
     1148}
     1149
     1150WebToStorageProcessConnection* WebProcess::webToStorageProcessConnection()
     1151{
     1152    if (!m_webToStorageProcessConnection)
     1153        ensureWebToStorageProcessConnection();
     1154
     1155    return m_webToStorageProcessConnection.get();
     1156}
     1157
     1158void WebProcess::ensureWebToStorageProcessConnection()
     1159{
     1160    if (m_webToStorageProcessConnection)
    11611161        return;
    11621162
    11631163    IPC::Attachment encodedConnectionIdentifier;
    11641164
    1165     if (!parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetDatabaseProcessConnection(),
    1166         Messages::WebProcessProxy::GetDatabaseProcessConnection::Reply(encodedConnectionIdentifier), 0))
     1165    if (!parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetStorageProcessConnection(), Messages::WebProcessProxy::GetStorageProcessConnection::Reply(encodedConnectionIdentifier), 0))
    11671166        return;
    11681167
    … …  
    11761175    if (IPC::Connection::identifierIsNull(connectionIdentifier))
    11771176        return;
    1178     m_webToDatabaseProcessConnection = WebToDatabaseProcessConnection::create(connectionIdentifier);
     1177    m_webToStorageProcessConnection = WebToStorageProcessConnection::create(connectionIdentifier);
    11791178}
    11801179

  • trunk/Source/WebKit/WebProcess/WebProcess.h

    r220037 r220105  
    8787class WebPageGroupProxy;
    8888class WebProcessSupplement;
    89 class WebToDatabaseProcessConnection;
     89class WebToStorageProcessConnection;
    9090enum class WebsiteDataType;
    9191struct WebPageCreationParameters;
    … …  
    165165#endif
    166166
    167     void webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection*);
    168     WebToDatabaseProcessConnection* webToDatabaseProcessConnection();
     167    void webToStorageProcessConnectionClosed(WebToStorageProcessConnection*);
     168    WebToStorageProcessConnection* webToStorageProcessConnection();
    169169
    170170    void setCacheModel(uint32_t);
    … …  
    384384    std::unique_ptr<WebAutomationSessionProxy> m_automationSessionProxy;
    385385
    386     void ensureWebToDatabaseProcessConnection();
    387     RefPtr<WebToDatabaseProcessConnection> m_webToDatabaseProcessConnection;
     386    void ensureWebToStorageProcessConnection();
     387    RefPtr<WebToStorageProcessConnection> m_webToStorageProcessConnection;
    388388
    389389#if ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Tools/ChangeLog

    r220087 r220105  
     12017-08-01  Brady Eidson  <beidson@apple.com>
     2
     3        Part 2 of: Rename DatabaseProcess to StorageProcess.
     4        https://bugs.webkit.org/show_bug.cgi?id=174880
     5
     6        Reviewed by Andy Estes.
     7
     8        * TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.mm:
     9        * TestWebKitAPI/Tests/WebKit2Cocoa/IDBIndexUpgradeToV2.mm:
     10        * TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBDatabaseProcessKill.mm:
     11        * TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm:
     12        * TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBPersistence.mm:
     13        * TestWebKitAPI/Tests/WebKit2Cocoa/ResourceLoadStatistics.mm:
     14        * TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm:
     15        * TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm:
     16
    1172017-07-31  Csaba Osztrogonác  <ossy@webkit.org>
    218

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.mm

    r220037 r220105  
    6060    [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
    6161
    62     [configuration.get().processPool _terminateDatabaseProcess];
     62    [configuration.get().processPool _terminateStorageProcess];
    6363
    6464    // Copy the inconsistent database files to the database directory

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IDBIndexUpgradeToV2.mm

    r220037 r220105  
    6060    [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
    6161
    62     [configuration.get().processPool _terminateDatabaseProcess];
     62    [configuration.get().processPool _terminateStorageProcess];
    6363
    6464    // Copy the inconsistent database files to the database directory

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBDatabaseProcessKill.mm

    r220037 r220105  
    9595        if (!killedDBProcess && openRequestUpgradeNeeded) {
    9696            killedDBProcess = true;
    97             [configuration.get().processPool _terminateDatabaseProcess];
     97            [configuration.get().processPool _terminateStorageProcess];
    9898        }
    9999    }

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm

    r220037 r220105  
    7272    [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
    7373
    74     [configuration.get().processPool _terminateDatabaseProcess];
     74    [configuration.get().processPool _terminateStorageProcess];
    7575
    7676    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBPersistence.mm

    r220037 r220105  
    7676    webView = nil;
    7777
    78     // Terminate the database process
    79     [configuration.get().processPool _terminateDatabaseProcess];
     78    // Terminate the storage process
     79    [configuration.get().processPool _terminateStorageProcess];
    8080
    8181    // Make a new web view to finish the test

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ResourceLoadStatistics.mm

    r220037 r220105  
    124124    WKProcessPool *sharedProcessPool = [WKProcessPool _sharedProcessPool];
    125125
    126     EXPECT_EQ((pid_t)0, [sharedProcessPool _databaseProcessIdentifier]);
     126    EXPECT_EQ((pid_t)0, [sharedProcessPool _storageProcessIdentifier]);
    127127    EXPECT_EQ((size_t)0, [sharedProcessPool _pluginProcessCount]);
    128128
    … …  
    149149    EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:targetURL.path]);
    150150
    151     EXPECT_EQ((pid_t)0, [sharedProcessPool _databaseProcessIdentifier]);
     151    EXPECT_EQ((pid_t)0, [sharedProcessPool _storageProcessIdentifier]);
    152152    EXPECT_EQ((size_t)0, [sharedProcessPool _pluginProcessCount]);
    153153}

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm

    r220037 r220105  
    7373    [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
    7474
    75     [configuration.get().processPool _terminateDatabaseProcess];
     75    [configuration.get().processPool _terminateStorageProcess];
    7676
    7777    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm

    r220037 r220105  
    122122
    123123    // Forcibly shut down everything of WebKit that we can.
    124     [[[webView configuration] processPool] _terminateDatabaseProcess];
     124    [[[webView configuration] processPool] _terminateStorageProcess];
    125125    auto pid = [webView _webProcessIdentifier];
    126126    if (pid)
    … …  
    160160    // Data stores can't delete anything unless a WKProcessPool exists, so make sure the shared data store exists.
    161161    auto *processPool = [WKProcessPool _sharedProcessPool];
    162     [processPool _terminateDatabaseProcess];
     162    [processPool _terminateStorageProcess];
    163163    RetainPtr<WKWebsiteDataStore> dataStore = [[WKWebsiteDataStore alloc] _initWithConfiguration:websiteDataStoreConfiguration.get()];
    164164    RetainPtr<NSSet> types = adoptNS([[NSSet alloc] initWithObjects:WKWebsiteDataTypeIndexedDBDatabases, nil]);
Note: See TracChangeset for help on using the changeset viewer.