Diff
Modified: trunk/Source/WebKit/ChangeLog (220104 => 220105)
--- trunk/Source/WebKit/ChangeLog 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/ChangeLog 2017-08-01 18:18:03 UTC (rev 220105)
@@ -1,5 +1,156 @@
2017-08-01 Brady Eidson <beid...@apple.com>
+ Part 2 of: Rename DatabaseProcess to StorageProcess.
+ https://bugs.webkit.org/show_bug.cgi?id=174880
+
+ Reviewed by Andy Estes.
+
+ 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:
+
+2017-08-01 Brady Eidson <beid...@apple.com>
+
Part 1 of: Rename DatabaseProcess to StorageProcess.
https://bugs.webkit.org/show_bug.cgi?id=174879
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (220104 => 220105)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -398,7 +398,7 @@
for (auto& file : fileReferences)
file->revokeFileAccess();
- NetworkProcess::singleton().grantSandboxExtensionsToDatabaseProcessForBlobs(fileNames, [this, protectedThis = WTFMove(protectedThis), requestIdentifier, fileNames]() {
+ NetworkProcess::singleton().grantSandboxExtensionsToStorageProcessForBlobs(fileNames, [this, protectedThis = WTFMove(protectedThis), requestIdentifier, fileNames]() {
if (!m_connection->isValid())
return;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (220104 => 220105)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -303,16 +303,16 @@
SessionTracker::destroySession(sessionID);
}
-void NetworkProcess::grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler)
+void NetworkProcess::grantSandboxExtensionsToStorageProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler)
{
static uint64_t lastRequestID;
uint64_t requestID = ++lastRequestID;
m_sandboxExtensionForBlobsCompletionHandlers.set(requestID, WTFMove(completionHandler));
- parentProcessConnection()->send(Messages::NetworkProcessProxy::GrantSandboxExtensionsToDatabaseProcessForBlobs(requestID, filenames), 0);
+ parentProcessConnection()->send(Messages::NetworkProcessProxy::GrantSandboxExtensionsToStorageProcessForBlobs(requestID, filenames), 0);
}
-void NetworkProcess::didGrantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID)
+void NetworkProcess::didGrantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID)
{
if (auto handler = m_sandboxExtensionForBlobsCompletionHandlers.take(requestID))
handler();
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (220104 => 220105)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2017-08-01 18:18:03 UTC (rev 220105)
@@ -115,7 +115,7 @@
void ensurePrivateBrowsingSession(WebsiteDataStoreParameters&&);
- void grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler);
+ void grantSandboxExtensionsToStorageProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler);
#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
void updateCookiePartitioningForTopPrivatelyOwnedDomains(const Vector<String>& domainsToRemove, const Vector<String>& domainsToAdd, bool shouldClearFirst);
@@ -197,7 +197,7 @@
void setAllowsAnySSLCertificateForWebSocket(bool);
void syncAllCookies();
- void didGrantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID);
+ void didGrantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID);
#if USE(SOUP)
void setIgnoreTLSErrors(bool);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in (220104 => 220105)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2017-08-01 18:18:03 UTC (rev 220105)
@@ -80,7 +80,7 @@
CancelPrepareToSuspend()
ProcessDidResume()
- DidGrantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID)
+ DidGrantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID)
#if HAVE(CFNETWORK_STORAGE_PARTITIONING)
UpdateCookiePartitioningForTopPrivatelyOwnedDomains(Vector<String> domainsToRemove, Vector<String> domainsToAdd, bool shouldClearFirst)
Modified: trunk/Source/WebKit/Shared/ProcessExecutablePath.h (220104 => 220105)
--- trunk/Source/WebKit/Shared/ProcessExecutablePath.h 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/Shared/ProcessExecutablePath.h 2017-08-01 18:18:03 UTC (rev 220105)
@@ -32,6 +32,6 @@
String executablePathOfWebProcess();
String executablePathOfPluginProcess();
String executablePathOfNetworkProcess();
-String executablePathOfDatabaseProcess();
+String executablePathOfStorageProcess();
}
Modified: trunk/Source/WebKit/Shared/gtk/ProcessExecutablePathGtk.cpp (220104 => 220105)
--- trunk/Source/WebKit/Shared/gtk/ProcessExecutablePathGtk.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/Shared/gtk/ProcessExecutablePathGtk.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -84,9 +84,9 @@
return findWebKitProcess("WebKitNetworkProcess");
}
-String executablePathOfDatabaseProcess()
+String executablePathOfStorageProcess()
{
- return findWebKitProcess("WebKitDatabaseProcess");
+ return findWebKitProcess("WebKitStorageProcess");
}
} // namespace WebKit
Modified: trunk/Source/WebKit/Shared/wpe/ProcessExecutablePathWPE.cpp (220104 => 220105)
--- trunk/Source/WebKit/Shared/wpe/ProcessExecutablePathWPE.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/Shared/wpe/ProcessExecutablePathWPE.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -77,9 +77,9 @@
return findWebKitProcess("WPENetworkProcess");
}
-String executablePathOfDatabaseProcess()
+String executablePathOfStorageProcess()
{
- return findWebKitProcess("WPEDatabaseProcess");
+ return findWebKitProcess("WPEStorageProcess");
}
} // namespace WebKit
Modified: trunk/Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp (220104 => 220105)
--- trunk/Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -287,7 +287,7 @@
&& overwriteMode != static_cast<unsigned>(IndexedDB::ObjectStoreOverwriteMode::Overwrite)
&& overwriteMode != static_cast<unsigned>(IndexedDB::ObjectStoreOverwriteMode::OverwriteForCursor)) {
// FIXME: This message from the WebProcess is corrupt.
- // The DatabaseProcess should return early at this point, but can we also kill the bad WebProcess?
+ // The StorageProcess should return early at this point, but can we also kill the bad WebProcess?
return;
}
Modified: trunk/Source/WebKit/StorageProcess/StorageProcess.cpp (220104 => 220105)
--- trunk/Source/WebKit/StorageProcess/StorageProcess.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/StorageProcess/StorageProcess.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -121,7 +121,7 @@
addResult.iterator->value = parameters.indexedDatabaseDirectory;
SandboxExtension::consumePermanently(parameters.indexedDatabaseDirectoryExtensionHandle);
- postDatabaseTask(createCrossThreadTask(*this, &StorageProcess::ensurePathExists, parameters.indexedDatabaseDirectory));
+ postStorageTask(createCrossThreadTask(*this, &StorageProcess::ensurePathExists, parameters.indexedDatabaseDirectory));
#endif
}
@@ -133,39 +133,39 @@
LOG_ERROR("Failed to make all directories for path '%s'", path.utf8().data());
}
-void StorageProcess::postDatabaseTask(CrossThreadTask&& task)
+void StorageProcess::postStorageTask(CrossThreadTask&& task)
{
ASSERT(RunLoop::isMain());
- LockHolder locker(m_databaseTaskMutex);
+ LockHolder locker(m_storageTaskMutex);
- m_databaseTasks.append(WTFMove(task));
+ m_storageTasks.append(WTFMove(task));
m_queue->dispatch([this] {
- performNextDatabaseTask();
+ performNextStorageTask();
});
}
-void StorageProcess::performNextDatabaseTask()
+void StorageProcess::performNextStorageTask()
{
ASSERT(!RunLoop::isMain());
CrossThreadTask task;
{
- LockHolder locker(m_databaseTaskMutex);
- ASSERT(!m_databaseTasks.isEmpty());
- task = m_databaseTasks.takeFirst();
+ LockHolder locker(m_storageTaskMutex);
+ ASSERT(!m_storageTasks.isEmpty());
+ task = m_storageTasks.takeFirst();
}
task.performTask();
}
-void StorageProcess::createDatabaseToWebProcessConnection()
+void StorageProcess::createStorageToWebProcessConnection()
{
#if USE(UNIX_DOMAIN_SOCKETS)
IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
m_databaseToWebProcessConnections.append(StorageToWebProcessConnection::create(socketPair.server));
- parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateDatabaseToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);
+ parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateStorageToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);
#elif OS(DARWIN)
// Create the listening port.
mach_port_t listeningPort;
@@ -175,7 +175,7 @@
m_databaseToWebProcessConnections.append(StorageToWebProcessConnection::create(IPC::Connection::Identifier(listeningPort)));
IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
- parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateDatabaseToWebProcessConnection(clientPort), 0);
+ parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateStorageToWebProcessConnection(clientPort), 0);
#else
notImplemented();
#endif
@@ -196,7 +196,7 @@
if (websiteDataTypes.contains(WebsiteDataType::IndexedDBDatabases)) {
// FIXME: Pick the right database store based on the session ID.
- postDatabaseTask(CrossThreadTask([this, completionHandler = WTFMove(completionHandler), path = WTFMove(path)]() mutable {
+ postStorageTask(CrossThreadTask([this, completionHandler = WTFMove(completionHandler), path = WTFMove(path)]() mutable {
RunLoop::main().dispatch([completionHandler = WTFMove(completionHandler), securityOrigins = indexedDatabaseOrigins(path)] {
WebsiteData websiteData;
for (const auto& securityOrigin : securityOrigins)
Modified: trunk/Source/WebKit/StorageProcess/StorageProcess.h (220104 => 220105)
--- trunk/Source/WebKit/StorageProcess/StorageProcess.h 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/StorageProcess/StorageProcess.h 2017-08-01 18:18:03 UTC (rev 220105)
@@ -61,7 +61,7 @@
WorkQueue& queue() { return m_queue.get(); }
- void postDatabaseTask(CrossThreadTask&&);
+ void postStorageTask(CrossThreadTask&&);
#if ENABLE(INDEXED_DATABASE)
// WebCore::IDBServer::IDBBackingStoreFileHandler
@@ -90,7 +90,7 @@
// Message Handlers
void initializeWebsiteDataStore(const StorageProcessCreationParameters&);
- void createDatabaseToWebProcessConnection();
+ void createStorageToWebProcessConnection();
void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID);
void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
@@ -105,7 +105,7 @@
#endif
// For execution on work queue thread only
- void performNextDatabaseTask();
+ void performNextStorageTask();
void ensurePathExists(const String&);
Vector<RefPtr<StorageToWebProcessConnection>> m_databaseToWebProcessConnections;
@@ -119,8 +119,8 @@
HashMap<String, RefPtr<SandboxExtension>> m_blobTemporaryFileSandboxExtensions;
HashMap<uint64_t, WTF::Function<void (SandboxExtension::HandleArray&&)>> m_sandboxExtensionForBlobsCompletionHandlers;
- Deque<CrossThreadTask> m_databaseTasks;
- Lock m_databaseTaskMutex;
+ Deque<CrossThreadTask> m_storageTasks;
+ Lock m_storageTaskMutex;
};
} // namespace WebKit
Modified: trunk/Source/WebKit/StorageProcess/StorageProcess.messages.in (220104 => 220105)
--- trunk/Source/WebKit/StorageProcess/StorageProcess.messages.in 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/StorageProcess/StorageProcess.messages.in 2017-08-01 18:18:03 UTC (rev 220105)
@@ -25,7 +25,7 @@
InitializeWebsiteDataStore(struct WebKit::StorageProcessCreationParameters processCreationParameters)
# Creates a connection for communication with a WebProcess
- CreateDatabaseToWebProcessConnection()
+ CreateStorageToWebProcessConnection()
FetchWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, uint64_t callbackID)
DeleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
Modified: trunk/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm (220104 => 220105)
--- trunk/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/StorageProcess/mac/StorageProcessMac.mm 2017-08-01 18:18:03 UTC (rev 220105)
@@ -46,7 +46,7 @@
void StorageProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
{
- NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Database Storage", "visible name of the database process. The argument is the application name."), (NSString *)parameters.uiProcessName];
+ NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Storage", "visible name of the storage process. The argument is the application name."), (NSString *)parameters.uiProcessName];
WKSetVisibleApplicationName((CFStringRef)applicationName);
}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -590,5 +590,5 @@
pid_t WKContextGetDatabaseProcessIdentifier(WKContextRef contextRef)
{
- return toImpl(contextRef)->databaseProcessIdentifier();
+ return toImpl(contextRef)->storageProcessIdentifier();
}
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2017-08-01 18:18:03 UTC (rev 220105)
@@ -385,9 +385,9 @@
_processPool->setAutomationSession(automationSession ? automationSession->_session.get() : nullptr);
}
-- (void)_terminateDatabaseProcess
+- (void)_terminateStorageProcess
{
- _processPool->terminateDatabaseProcess();
+ _processPool->terminateStorageProcess();
}
- (void)_terminateNetworkProcess
@@ -400,9 +400,9 @@
return _processPool->networkProcessIdentifier();
}
-- (pid_t)_databaseProcessIdentifier
+- (pid_t)_storageProcessIdentifier
{
- return _processPool->databaseProcessIdentifier();
+ return _processPool->storageProcessIdentifier();
}
- (void)_syncNetworkProcessCookies
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2017-08-01 18:18:03 UTC (rev 220105)
@@ -72,12 +72,12 @@
- (void)_setAutomationSession:(_WKAutomationSession *)automationSession WK_API_AVAILABLE(macosx(10.12), ios(10.0));
// Test only. Should be called only while no web content processes are running.
-- (void)_terminateDatabaseProcess;
+- (void)_terminateStorageProcess;
- (void)_terminateNetworkProcess;
// Test only.
- (pid_t)_networkProcessIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
-- (pid_t)_databaseProcessIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+- (pid_t)_storageProcessIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
// Test only.
- (size_t)_webProcessCount WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
Modified: trunk/Source/WebKit/UIProcess/ChildProcessProxy.cpp (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/ChildProcessProxy.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/ChildProcessProxy.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -70,8 +70,8 @@
case ProcessLauncher::ProcessType::Network:
varname = "NETWORK_PROCESS_CMD_PREFIX";
break;
- case ProcessLauncher::ProcessType::Database:
- varname = "DATABASE_PROCESS_CMD_PREFIX";
+ case ProcessLauncher::ProcessType::Storage:
+ varname = "STORAGE_PROCESS_CMD_PREFIX";
break;
}
const char* processCmdPrefix = getenv(varname);
Modified: trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h 2017-08-01 18:18:03 UTC (rev 220105)
@@ -51,7 +51,7 @@
Plugin64,
#endif
Network,
- Database,
+ Storage,
};
struct LaunchOptions {
Modified: trunk/Source/WebKit/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -81,8 +81,8 @@
case ProcessLauncher::ProcessType::Network:
executablePath = executablePathOfNetworkProcess();
break;
- case ProcessLauncher::ProcessType::Database:
- executablePath = executablePathOfDatabaseProcess();
+ case ProcessLauncher::ProcessType::Storage:
+ executablePath = executablePathOfStorageProcess();
break;
default:
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2017-08-01 18:18:03 UTC (rev 220105)
@@ -55,7 +55,7 @@
return "com.apple.WebKit.WebContent";
case ProcessLauncher::ProcessType::Network:
return "com.apple.WebKit.Networking";
- case ProcessLauncher::ProcessType::Database:
+ case ProcessLauncher::ProcessType::Storage:
return "com.apple.WebKit.Databases";
#if ENABLE(NETSCAPE_PLUGIN_API)
case ProcessLauncher::ProcessType::Plugin32:
Modified: trunk/Source/WebKit/UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -67,8 +67,8 @@
case ProcessLauncher::ProcessType::Network:
executablePath = executablePathOfNetworkProcess();
break;
- case ProcessLauncher::ProcessType::Database:
- executablePath = executablePathOfDatabaseProcess();
+ case ProcessLauncher::ProcessType::Storage:
+ executablePath = executablePathOfStorageProcess();
break;
default:
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -289,19 +289,19 @@
callback();
}
-void NetworkProcessProxy::grantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID, const Vector<String>& paths)
+void NetworkProcessProxy::grantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID, const Vector<String>& paths)
{
#if ENABLE(SANDBOX_EXTENSIONS)
SandboxExtension::HandleArray extensions;
extensions.allocate(paths.size());
for (size_t i = 0; i < paths.size(); ++i) {
- // ReadWrite is required for creating hard links as well as deleting the temporary file, which the DatabaseProcess will do.
+ // ReadWrite is required for creating hard links as well as deleting the temporary file, which the StorageProcess will do.
SandboxExtension::createHandle(paths[i], SandboxExtension::ReadWrite, extensions[i]);
}
- m_processPool.sendToDatabaseProcessRelaunchingIfNecessary(Messages::StorageProcess::GrantSandboxExtensionsForBlobs(paths, extensions));
+ m_processPool.sendToStorageProcessRelaunchingIfNecessary(Messages::StorageProcess::GrantSandboxExtensionsForBlobs(paths, extensions));
#endif
- connection()->send(Messages::NetworkProcess::DidGrantSandboxExtensionsToDatabaseProcessForBlobs(requestID), 0);
+ connection()->send(Messages::NetworkProcess::DidGrantSandboxExtensionsToStorageProcessForBlobs(requestID), 0);
}
void NetworkProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2017-08-01 18:18:03 UTC (rev 220105)
@@ -111,7 +111,7 @@
void didFetchWebsiteData(uint64_t callbackID, const WebsiteData&);
void didDeleteWebsiteData(uint64_t callbackID);
void didDeleteWebsiteDataForOrigins(uint64_t callbackID);
- void grantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID, const Vector<String>& paths);
+ void grantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID, const Vector<String>& paths);
void logDiagnosticMessage(uint64_t pageID, const String& message, const String& description, WebCore::ShouldSample);
void logDiagnosticMessageWithResult(uint64_t pageID, const String& message, const String& description, uint32_t result, WebCore::ShouldSample);
void logDiagnosticMessageWithValue(uint64_t pageID, const String& message, const String& description, double value, unsigned significantFigures, WebCore::ShouldSample);
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.messages.in 2017-08-01 18:18:03 UTC (rev 220105)
@@ -29,7 +29,7 @@
DidDeleteWebsiteData(uint64_t callbackID)
DidDeleteWebsiteDataForOrigins(uint64_t callbackID)
- GrantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID, Vector<String> paths)
+ GrantSandboxExtensionsToStorageProcessForBlobs(uint64_t requestID, Vector<String> paths)
ProcessReadyToSuspend()
SetIsHoldingLockedFiles(bool isHoldingLockedFiles)
Modified: trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -66,7 +66,7 @@
void StorageProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
{
- launchOptions.processType = ProcessLauncher::ProcessType::Database;
+ launchOptions.processType = ProcessLauncher::ProcessType::Storage;
ChildProcessProxy::getLaunchOptions(launchOptions);
}
@@ -111,7 +111,7 @@
send(Messages::StorageProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, origins, callbackID), 0);
}
-void StorageProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
+void StorageProcessProxy::getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&& reply)
{
m_pendingConnectionReplies.append(WTFMove(reply));
@@ -120,12 +120,12 @@
return;
}
- send(Messages::StorageProcess::CreateDatabaseToWebProcessConnection(), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
+ send(Messages::StorageProcess::CreateStorageToWebProcessConnection(), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
}
void StorageProcessProxy::didClose(IPC::Connection&)
{
- // The database process must have crashed or exited, so send any pending sync replies we might have.
+ // The storage process must have crashed or exited, so send any pending sync replies we might have.
while (!m_pendingConnectionReplies.isEmpty()) {
auto reply = m_pendingConnectionReplies.takeFirst();
@@ -150,8 +150,8 @@
callback();
m_pendingDeleteWebsiteDataForOriginsCallbacks.clear();
- // Tell ProcessPool to forget about this database process. This may cause us to be deleted.
- m_processPool->databaseProcessCrashed(this);
+ // Tell ProcessPool to forget about this storage process. This may cause us to be deleted.
+ m_processPool->storageProcessCrashed(this);
}
void StorageProcessProxy::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
@@ -158,11 +158,11 @@
{
}
-void StorageProcessProxy::didCreateDatabaseToWebProcessConnection(const IPC::Attachment& connectionIdentifier)
+void StorageProcessProxy::didCreateStorageToWebProcessConnection(const IPC::Attachment& connectionIdentifier)
{
ASSERT(!m_pendingConnectionReplies.isEmpty());
- RefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
+ RefPtr<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
#if USE(UNIX_DOMAIN_SOCKETS)
reply->send(connectionIdentifier);
@@ -215,7 +215,7 @@
}
for (unsigned i = 0; i < m_numPendingConnectionRequests; ++i)
- send(Messages::StorageProcess::CreateDatabaseToWebProcessConnection(), 0);
+ send(Messages::StorageProcess::CreateStorageToWebProcessConnection(), 0);
m_numPendingConnectionRequests = 0;
}
Modified: trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.h 2017-08-01 18:18:03 UTC (rev 220105)
@@ -52,7 +52,7 @@
void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, WTF::Function<void()>&& completionHandler);
void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>&, WTF::Function<void()>&& completionHandler);
- void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
+ void getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&&);
private:
StorageProcessProxy(WebProcessPool*);
@@ -69,7 +69,7 @@
void didReceiveStorageProcessProxyMessage(IPC::Connection&, IPC::Decoder&);
// Message handlers
- void didCreateDatabaseToWebProcessConnection(const IPC::Attachment&);
+ void didCreateStorageToWebProcessConnection(const IPC::Attachment&);
void didFetchWebsiteData(uint64_t callbackID, const WebsiteData&);
void didDeleteWebsiteData(uint64_t callbackID);
void didDeleteWebsiteDataForOrigins(uint64_t callbackID);
@@ -83,7 +83,7 @@
WebProcessPool* m_processPool;
unsigned m_numPendingConnectionRequests;
- Deque<Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>> m_pendingConnectionReplies;
+ Deque<Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>> m_pendingConnectionReplies;
HashMap<uint64_t, WTF::Function<void (WebsiteData)>> m_pendingFetchWebsiteDataCallbacks;
HashMap<uint64_t, WTF::Function<void ()>> m_pendingDeleteWebsiteDataCallbacks;
Modified: trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.messages.in (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.messages.in 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.messages.in 2017-08-01 18:18:03 UTC (rev 220105)
@@ -21,7 +21,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
messages -> StorageProcessProxy LegacyReceiver {
- DidCreateDatabaseToWebProcessConnection(IPC::Attachment connectionIdentifier)
+ DidCreateStorageToWebProcessConnection(IPC::Attachment connectionIdentifier)
DidFetchWebsiteData(uint64_t callbackID, struct WebKit::WebsiteData websiteData)
DidDeleteWebsiteData(uint64_t callbackID)
Modified: trunk/Source/WebKit/UIProcess/WebContextClient.cpp (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/WebContextClient.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/WebContextClient.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -46,7 +46,7 @@
m_client.networkProcessDidCrash(toAPI(processPool), m_client.base.clientInfo);
}
-void WebContextClient::databaseProcessDidCrash(WebProcessPool* processPool)
+void WebContextClient::storageProcessDidCrash(WebProcessPool* processPool)
{
if (!m_client.databaseProcessDidCrash)
return;
Modified: trunk/Source/WebKit/UIProcess/WebContextClient.h (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/WebContextClient.h 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/WebContextClient.h 2017-08-01 18:18:03 UTC (rev 220105)
@@ -45,7 +45,7 @@
public:
void plugInAutoStartOriginHashesChanged(WebProcessPool*);
void networkProcessDidCrash(WebProcessPool*);
- void databaseProcessDidCrash(WebProcessPool*);
+ void storageProcessDidCrash(WebProcessPool*);
};
} // namespace WebKit
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -514,14 +514,14 @@
m_networkProcess->getNetworkProcessConnection(WTFMove(reply));
}
-void WebProcessPool::ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore)
+void WebProcessPool::ensureStorageProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore)
{
// *********
// IMPORTANT: Do not change the directory structure for indexed databases on disk without first consulting a reviewer from Apple (<rdar://problem/17454712>)
// *********
- if (!m_databaseProcess) {
- m_databaseProcess = StorageProcessProxy::create(this);
+ if (!m_storageProcess) {
+ m_storageProcess = StorageProcessProxy::create(this);
StorageProcessCreationParameters parameters;
#if ENABLE(INDEXED_DATABASE)
@@ -533,32 +533,32 @@
#endif
ASSERT(!parameters.indexedDatabaseDirectory.isEmpty());
- m_databaseProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(parameters), 0);
+ m_storageProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(parameters), 0);
}
if (!relevantDataStore || relevantDataStore == &websiteDataStore().websiteDataStore())
return;
- m_databaseProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(relevantDataStore->databaseProcessParameters()), 0);
+ m_storageProcess->send(Messages::StorageProcess::InitializeWebsiteDataStore(relevantDataStore->storageProcessParameters()), 0);
}
-void WebProcessPool::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
+void WebProcessPool::getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&& reply)
{
- ensureDatabaseProcessAndWebsiteDataStore(nullptr);
+ ensureStorageProcessAndWebsiteDataStore(nullptr);
- m_databaseProcess->getDatabaseProcessConnection(WTFMove(reply));
+ m_storageProcess->getStorageProcessConnection(WTFMove(reply));
}
-void WebProcessPool::databaseProcessCrashed(StorageProcessProxy* databaseProcessProxy)
+void WebProcessPool::storageProcessCrashed(StorageProcessProxy* storageProcessProxy)
{
- ASSERT(m_databaseProcess);
- ASSERT(databaseProcessProxy == m_databaseProcess.get());
+ ASSERT(m_storageProcess);
+ ASSERT(storageProcessProxy == m_storageProcess.get());
for (auto& supplement : m_supplements.values())
- supplement->processDidClose(databaseProcessProxy);
+ supplement->processDidClose(storageProcessProxy);
- m_client.databaseProcessDidCrash(this);
- m_databaseProcess = nullptr;
+ m_client.storageProcessDidCrash(this);
+ m_storageProcess = nullptr;
}
void WebProcessPool::willStartUsingPrivateBrowsing()
@@ -959,9 +959,9 @@
page.process().send(Messages::WebProcess::AddWebsiteDataStore(page.websiteDataStore().parameters()), 0);
#if ENABLE(INDEXED_DATABASE)
- auto databaseParameters = page.websiteDataStore().databaseProcessParameters();
- if (!databaseParameters.indexedDatabaseDirectory.isEmpty())
- sendToDatabaseProcessRelaunchingIfNecessary(Messages::StorageProcess::InitializeWebsiteDataStore(databaseParameters));
+ auto storageParameters = page.websiteDataStore().storageProcessParameters();
+ if (!storageParameters.indexedDatabaseDirectory.isEmpty())
+ sendToStorageProcessRelaunchingIfNecessary(Messages::StorageProcess::InitializeWebsiteDataStore(storageParameters));
#endif
}
}
@@ -1073,12 +1073,12 @@
return m_networkProcess->processIdentifier();
}
-pid_t WebProcessPool::databaseProcessIdentifier()
+pid_t WebProcessPool::storageProcessIdentifier()
{
- if (!m_databaseProcess)
+ if (!m_storageProcess)
return 0;
- return m_databaseProcess->processIdentifier();
+ return m_storageProcess->processIdentifier();
}
void WebProcessPool::setAlwaysUsesComplexTextCodePath(bool alwaysUseComplexText)
@@ -1302,13 +1302,13 @@
m_networkProcess->send(Messages::NetworkProcess::ClearCachedCredentials(), 0);
}
-void WebProcessPool::terminateDatabaseProcess()
+void WebProcessPool::terminateStorageProcess()
{
- if (!m_databaseProcess)
+ if (!m_storageProcess)
return;
- m_databaseProcess->terminate();
- m_databaseProcess = nullptr;
+ m_storageProcess->terminate();
+ m_storageProcess = nullptr;
}
void WebProcessPool::terminateNetworkProcess()
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.h 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h 2017-08-01 18:18:03 UTC (rev 220105)
@@ -160,8 +160,8 @@
template<typename T, typename U> void sendSyncToNetworkingProcess(T&& message, U&& reply);
template<typename T> void sendToNetworkingProcessRelaunchingIfNecessary(T&& message);
- // Sends the message to WebProcess or DatabaseProcess as approporiate for current process model.
- template<typename T> void sendToDatabaseProcessRelaunchingIfNecessary(T&& message);
+ // Sends the message to WebProcess or StorageProcess as approporiate for current process model.
+ template<typename T> void sendToStorageProcessRelaunchingIfNecessary(T&& message);
void processDidFinishLaunching(WebProcessProxy*);
@@ -199,7 +199,7 @@
#endif
pid_t networkProcessIdentifier();
- pid_t databaseProcessIdentifier();
+ pid_t storageProcessIdentifier();
void setAlwaysUsesComplexTextCodePath(bool);
void setShouldUseFontSmoothing(bool);
@@ -255,7 +255,7 @@
void setAllowsAnySSLCertificateForWebSocket(bool);
void clearCachedCredentials();
- void terminateDatabaseProcess();
+ void terminateStorageProcess();
void terminateNetworkProcess();
void syncNetworkProcessCookies();
@@ -312,10 +312,10 @@
void getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
- void ensureDatabaseProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore);
- StorageProcessProxy* databaseProcess() { return m_databaseProcess.get(); }
- void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
- void databaseProcessCrashed(StorageProcessProxy*);
+ void ensureStorageProcessAndWebsiteDataStore(WebsiteDataStore* relevantDataStore);
+ StorageProcessProxy* storageProcess() { return m_storageProcess.get(); }
+ void getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&&);
+ void storageProcessCrashed(StorageProcessProxy*);
#if PLATFORM(COCOA)
bool processSuppressionEnabled() const;
@@ -549,7 +549,7 @@
bool m_canHandleHTTPSServerTrustEvaluation;
bool m_didNetworkProcessCrash;
RefPtr<NetworkProcessProxy> m_networkProcess;
- RefPtr<StorageProcessProxy> m_databaseProcess;
+ RefPtr<StorageProcessProxy> m_storageProcess;
HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks;
HashMap<uint64_t, RefPtr<StatisticsRequest>> m_statisticsRequests;
@@ -627,10 +627,10 @@
}
template<typename T>
-void WebProcessPool::sendToDatabaseProcessRelaunchingIfNecessary(T&& message)
+void WebProcessPool::sendToStorageProcessRelaunchingIfNecessary(T&& message)
{
- ensureDatabaseProcessAndWebsiteDataStore(nullptr);
- m_databaseProcess->send(std::forward<T>(message), 0);
+ ensureStorageProcessAndWebsiteDataStore(nullptr);
+ m_storageProcess->send(std::forward<T>(message), 0);
}
template<typename T>
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -573,9 +573,9 @@
m_processPool->getNetworkProcessConnection(WTFMove(reply));
}
-void WebProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
+void WebProcessProxy::getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&& reply)
{
- m_processPool->getDatabaseProcessConnection(WTFMove(reply));
+ m_processPool->getStorageProcessConnection(WTFMove(reply));
}
#if !PLATFORM(COCOA)
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.h (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.h 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.h 2017-08-01 18:18:03 UTC (rev 220105)
@@ -214,7 +214,7 @@
void getPluginProcessConnection(uint64_t pluginProcessToken, Ref<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>&&);
#endif
void getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
- void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
+ void getStorageProcessConnection(Ref<Messages::WebProcessProxy::GetStorageProcessConnection::DelayedReply>&&);
bool platformIsBeingDebugged() const;
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.messages.in (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.messages.in 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.messages.in 2017-08-01 18:18:03 UTC (rev 220105)
@@ -37,7 +37,7 @@
GetPluginProcessConnection(uint64_t pluginProcessToken) -> (IPC::Attachment connectionHandle, bool supportsAsynchronousInitialization) Delayed
#endif
GetNetworkProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
- GetDatabaseProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
+ GetStorageProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
ProcessReadyToSuspend()
DidCancelProcessSuspension()
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -433,10 +433,10 @@
if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
for (auto& processPool : processPools()) {
- processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
+ processPool->ensureStorageProcessAndWebsiteDataStore(this);
callbackAggregator->addPendingCallback();
- processPool->databaseProcess()->fetchWebsiteData(m_sessionID, dataTypes, [callbackAggregator, processPool](WebsiteData websiteData) {
+ processPool->storageProcess()->fetchWebsiteData(m_sessionID, dataTypes, [callbackAggregator, processPool](WebsiteData websiteData) {
callbackAggregator->removePendingCallback(WTFMove(websiteData));
});
}
@@ -727,10 +727,10 @@
if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
for (auto& processPool : processPools()) {
- processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
+ processPool->ensureStorageProcessAndWebsiteDataStore(this);
callbackAggregator->addPendingCallback();
- processPool->databaseProcess()->deleteWebsiteData(m_sessionID, dataTypes, modifiedSince, [callbackAggregator, processPool] {
+ processPool->storageProcess()->deleteWebsiteData(m_sessionID, dataTypes, modifiedSince, [callbackAggregator, processPool] {
callbackAggregator->removePendingCallback();
});
}
@@ -1004,10 +1004,10 @@
if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
for (auto& processPool : processPools()) {
- processPool->ensureDatabaseProcessAndWebsiteDataStore(this);
+ processPool->ensureStorageProcessAndWebsiteDataStore(this);
callbackAggregator->addPendingCallback();
- processPool->databaseProcess()->deleteWebsiteDataForOrigins(m_sessionID, dataTypes, origins, [callbackAggregator, processPool] {
+ processPool->storageProcess()->deleteWebsiteDataForOrigins(m_sessionID, dataTypes, origins, [callbackAggregator, processPool] {
callbackAggregator->removePendingCallback();
});
}
@@ -1315,7 +1315,7 @@
processPool->setResourceLoadStatisticsEnabled(true);
}
-StorageProcessCreationParameters WebsiteDataStore::databaseProcessParameters()
+StorageProcessCreationParameters WebsiteDataStore::storageProcessParameters()
{
resolveDirectoriesIfNecessary();
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (220104 => 220105)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2017-08-01 18:18:03 UTC (rev 220105)
@@ -121,7 +121,7 @@
bool isAssociatedProcessPool(WebProcessPool&) const;
WebsiteDataStoreParameters parameters();
- StorageProcessCreationParameters databaseProcessParameters();
+ StorageProcessCreationParameters storageProcessParameters();
Vector<WebCore::Cookie> pendingCookies() const;
void addPendingCookie(const WebCore::Cookie&);
Modified: trunk/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp (220104 => 220105)
--- trunk/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -77,7 +77,7 @@
IPC::Connection* WebIDBConnectionToServer::messageSenderConnection()
{
- return &WebProcess::singleton().webToDatabaseProcessConnection()->connection();
+ return &WebProcess::singleton().webToStorageProcessConnection()->connection();
}
IDBClient::IDBConnectionToServer& WebIDBConnectionToServer::coreConnectionToServer()
Modified: trunk/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h (220104 => 220105)
--- trunk/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h 2017-08-01 18:18:03 UTC (rev 220105)
@@ -79,7 +79,7 @@
void ref() override { RefCounted<WebIDBConnectionToServer>::ref(); }
void deref() override { RefCounted<WebIDBConnectionToServer>::deref(); }
- // Messages received from DatabaseProcess
+ // Messages received from StorageProcess
void didDeleteDatabase(const WebCore::IDBResultData&);
void didOpenDatabase(const WebCore::IDBResultData&);
void didAbortTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&);
Modified: trunk/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp (220104 => 220105)
--- trunk/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -79,8 +79,8 @@
return result.iterator->value->connectionToServer();
}
- ASSERT(WebProcess::singleton().webToDatabaseProcessConnection());
- return WebProcess::singleton().webToDatabaseProcessConnection()->idbConnectionToServerForSession(sessionID).coreConnectionToServer();
+ ASSERT(WebProcess::singleton().webToStorageProcessConnection());
+ return WebProcess::singleton().webToStorageProcessConnection()->idbConnectionToServerForSession(sessionID).coreConnectionToServer();
}
#endif
Modified: trunk/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.cpp (220104 => 220105)
--- trunk/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -35,17 +35,17 @@
namespace WebKit {
-WebToDatabaseProcessConnection::WebToDatabaseProcessConnection(IPC::Connection::Identifier connectionIdentifier)
+WebToStorageProcessConnection::WebToStorageProcessConnection(IPC::Connection::Identifier connectionIdentifier)
: m_connection(IPC::Connection::createClientConnection(connectionIdentifier, *this))
{
m_connection->open();
}
-WebToDatabaseProcessConnection::~WebToDatabaseProcessConnection()
+WebToStorageProcessConnection::~WebToStorageProcessConnection()
{
}
-void WebToDatabaseProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
+void WebToStorageProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
{
#if ENABLE(INDEXED_DATABASE)
if (decoder.messageReceiverName() == Messages::WebIDBConnectionToServer::messageReceiverName()) {
@@ -59,7 +59,7 @@
ASSERT_NOT_REACHED();
}
-void WebToDatabaseProcessConnection::didClose(IPC::Connection& connection)
+void WebToStorageProcessConnection::didClose(IPC::Connection& connection)
{
#if ENABLE(INDEXED_DATABASE)
for (auto& connection : m_webIDBConnectionsByIdentifier.values())
@@ -69,15 +69,15 @@
m_webIDBConnectionsBySession.clear();
#endif
- WebProcess::singleton().webToDatabaseProcessConnectionClosed(this);
+ WebProcess::singleton().webToStorageProcessConnectionClosed(this);
}
-void WebToDatabaseProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
+void WebToStorageProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
{
}
#if ENABLE(INDEXED_DATABASE)
-WebIDBConnectionToServer& WebToDatabaseProcessConnection::idbConnectionToServerForSession(const SessionID& sessionID)
+WebIDBConnectionToServer& WebToStorageProcessConnection::idbConnectionToServerForSession(const SessionID& sessionID)
{
auto result = m_webIDBConnectionsBySession.add(sessionID, nullptr);
if (result.isNewEntry) {
Modified: trunk/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.h (220104 => 220105)
--- trunk/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.h 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.h 2017-08-01 18:18:03 UTC (rev 220105)
@@ -38,13 +38,13 @@
namespace WebKit {
-class WebToDatabaseProcessConnection : public RefCounted<WebToDatabaseProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender {
+class WebToStorageProcessConnection : public RefCounted<WebToStorageProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender {
public:
- static Ref<WebToDatabaseProcessConnection> create(IPC::Connection::Identifier connectionIdentifier)
+ static Ref<WebToStorageProcessConnection> create(IPC::Connection::Identifier connectionIdentifier)
{
- return adoptRef(*new WebToDatabaseProcessConnection(connectionIdentifier));
+ return adoptRef(*new WebToStorageProcessConnection(connectionIdentifier));
}
- ~WebToDatabaseProcessConnection();
+ ~WebToStorageProcessConnection();
IPC::Connection& connection() { return m_connection.get(); }
@@ -53,7 +53,7 @@
#endif
private:
- WebToDatabaseProcessConnection(IPC::Connection::Identifier);
+ WebToStorageProcessConnection(IPC::Connection::Identifier);
// IPC::Connection::Client
void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (220104 => 220105)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2017-08-01 18:18:03 UTC (rev 220105)
@@ -1139,31 +1139,30 @@
return m_webLoaderStrategy;
}
-void WebProcess::webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection* connection)
+void WebProcess::webToStorageProcessConnectionClosed(WebToStorageProcessConnection* connection)
{
- ASSERT(m_webToDatabaseProcessConnection);
- ASSERT(m_webToDatabaseProcessConnection == connection);
+ ASSERT(m_webToStorageProcessConnection);
+ ASSERT(m_webToStorageProcessConnection == connection);
- m_webToDatabaseProcessConnection = nullptr;
+ m_webToStorageProcessConnection = nullptr;
}
-WebToDatabaseProcessConnection* WebProcess::webToDatabaseProcessConnection()
+WebToStorageProcessConnection* WebProcess::webToStorageProcessConnection()
{
- if (!m_webToDatabaseProcessConnection)
- ensureWebToDatabaseProcessConnection();
+ if (!m_webToStorageProcessConnection)
+ ensureWebToStorageProcessConnection();
- return m_webToDatabaseProcessConnection.get();
+ return m_webToStorageProcessConnection.get();
}
-void WebProcess::ensureWebToDatabaseProcessConnection()
+void WebProcess::ensureWebToStorageProcessConnection()
{
- if (m_webToDatabaseProcessConnection)
+ if (m_webToStorageProcessConnection)
return;
IPC::Attachment encodedConnectionIdentifier;
- if (!parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetDatabaseProcessConnection(),
- Messages::WebProcessProxy::GetDatabaseProcessConnection::Reply(encodedConnectionIdentifier), 0))
+ if (!parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetStorageProcessConnection(), Messages::WebProcessProxy::GetStorageProcessConnection::Reply(encodedConnectionIdentifier), 0))
return;
#if USE(UNIX_DOMAIN_SOCKETS)
@@ -1175,7 +1174,7 @@
#endif
if (IPC::Connection::identifierIsNull(connectionIdentifier))
return;
- m_webToDatabaseProcessConnection = WebToDatabaseProcessConnection::create(connectionIdentifier);
+ m_webToStorageProcessConnection = WebToStorageProcessConnection::create(connectionIdentifier);
}
void WebProcess::setEnhancedAccessibility(bool flag)
Modified: trunk/Source/WebKit/WebProcess/WebProcess.h (220104 => 220105)
--- trunk/Source/WebKit/WebProcess/WebProcess.h 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h 2017-08-01 18:18:03 UTC (rev 220105)
@@ -86,7 +86,7 @@
class WebPage;
class WebPageGroupProxy;
class WebProcessSupplement;
-class WebToDatabaseProcessConnection;
+class WebToStorageProcessConnection;
enum class WebsiteDataType;
struct WebPageCreationParameters;
struct WebPageGroupData;
@@ -164,8 +164,8 @@
LibWebRTCNetwork& libWebRTCNetwork();
#endif
- void webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection*);
- WebToDatabaseProcessConnection* webToDatabaseProcessConnection();
+ void webToStorageProcessConnectionClosed(WebToStorageProcessConnection*);
+ WebToStorageProcessConnection* webToStorageProcessConnection();
void setCacheModel(uint32_t);
@@ -383,8 +383,8 @@
std::unique_ptr<WebAutomationSessionProxy> m_automationSessionProxy;
- void ensureWebToDatabaseProcessConnection();
- RefPtr<WebToDatabaseProcessConnection> m_webToDatabaseProcessConnection;
+ void ensureWebToStorageProcessConnection();
+ RefPtr<WebToStorageProcessConnection> m_webToStorageProcessConnection;
#if ENABLE(NETSCAPE_PLUGIN_API)
RefPtr<PluginProcessConnectionManager> m_pluginProcessConnectionManager;
Modified: trunk/Tools/ChangeLog (220104 => 220105)
--- trunk/Tools/ChangeLog 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Tools/ChangeLog 2017-08-01 18:18:03 UTC (rev 220105)
@@ -1,3 +1,19 @@
+2017-08-01 Brady Eidson <beid...@apple.com>
+
+ Part 2 of: Rename DatabaseProcess to StorageProcess.
+ https://bugs.webkit.org/show_bug.cgi?id=174880
+
+ Reviewed by Andy Estes.
+
+ * 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:
+
2017-07-31 Csaba Osztrogonác <o...@webkit.org>
Fix JSCOnly ARM buildbots after r220047
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.mm (220104 => 220105)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.mm 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IDBDeleteRecovery.mm 2017-08-01 18:18:03 UTC (rev 220105)
@@ -59,7 +59,7 @@
RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
[[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
- [configuration.get().processPool _terminateDatabaseProcess];
+ [configuration.get().processPool _terminateStorageProcess];
// Copy the inconsistent database files to the database directory
NSURL *url1 = [[NSBundle mainBundle] URLForResource:@"IDBDeleteRecovery" withExtension:@"sqlite3" subdirectory:@"TestWebKitAPI.resources"];
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IDBIndexUpgradeToV2.mm (220104 => 220105)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IDBIndexUpgradeToV2.mm 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IDBIndexUpgradeToV2.mm 2017-08-01 18:18:03 UTC (rev 220105)
@@ -59,7 +59,7 @@
RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
[[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
- [configuration.get().processPool _terminateDatabaseProcess];
+ [configuration.get().processPool _terminateStorageProcess];
// Copy the inconsistent database files to the database directory
NSURL *url1 = [[NSBundle mainBundle] URLForResource:@"IndexUpgrade" withExtension:@"sqlite3" subdirectory:@"TestWebKitAPI.resources"];
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBDatabaseProcessKill.mm (220104 => 220105)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBDatabaseProcessKill.mm 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBDatabaseProcessKill.mm 2017-08-01 18:18:03 UTC (rev 220105)
@@ -94,7 +94,7 @@
TestWebKitAPI::Util::run(&receivedScriptMessage);
if (!killedDBProcess && openRequestUpgradeNeeded) {
killedDBProcess = true;
- [configuration.get().processPool _terminateDatabaseProcess];
+ [configuration.get().processPool _terminateStorageProcess];
}
}
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm (220104 => 220105)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm 2017-08-01 18:18:03 UTC (rev 220105)
@@ -71,7 +71,7 @@
RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
[[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
- [configuration.get().processPool _terminateDatabaseProcess];
+ [configuration.get().processPool _terminateStorageProcess];
RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBPersistence.mm (220104 => 220105)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBPersistence.mm 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBPersistence.mm 2017-08-01 18:18:03 UTC (rev 220105)
@@ -75,8 +75,8 @@
// Ditch this web view (ditching its web process)
webView = nil;
- // Terminate the database process
- [configuration.get().processPool _terminateDatabaseProcess];
+ // Terminate the storage process
+ [configuration.get().processPool _terminateStorageProcess];
// Make a new web view to finish the test
webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ResourceLoadStatistics.mm (220104 => 220105)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ResourceLoadStatistics.mm 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ResourceLoadStatistics.mm 2017-08-01 18:18:03 UTC (rev 220105)
@@ -123,7 +123,7 @@
// Ensure the shared process pool exists so the data store operations we're about to do work with it.
WKProcessPool *sharedProcessPool = [WKProcessPool _sharedProcessPool];
- EXPECT_EQ((pid_t)0, [sharedProcessPool _databaseProcessIdentifier]);
+ EXPECT_EQ((pid_t)0, [sharedProcessPool _storageProcessIdentifier]);
EXPECT_EQ((size_t)0, [sharedProcessPool _pluginProcessCount]);
auto *dataStore = [WKWebsiteDataStore defaultDataStore];
@@ -148,7 +148,7 @@
EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:targetURL.path]);
- EXPECT_EQ((pid_t)0, [sharedProcessPool _databaseProcessIdentifier]);
+ EXPECT_EQ((pid_t)0, [sharedProcessPool _storageProcessIdentifier]);
EXPECT_EQ((size_t)0, [sharedProcessPool _pluginProcessCount]);
}
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm (220104 => 220105)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebProcessKillIDBCleanup.mm 2017-08-01 18:18:03 UTC (rev 220105)
@@ -72,7 +72,7 @@
RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
[[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
- [configuration.get().processPool _terminateDatabaseProcess];
+ [configuration.get().processPool _terminateStorageProcess];
RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm (220104 => 220105)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm 2017-08-01 16:42:18 UTC (rev 220104)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsiteDataStoreCustomPaths.mm 2017-08-01 18:18:03 UTC (rev 220105)
@@ -121,7 +121,7 @@
[[[webView configuration] processPool] _syncNetworkProcessCookies];
// Forcibly shut down everything of WebKit that we can.
- [[[webView configuration] processPool] _terminateDatabaseProcess];
+ [[[webView configuration] processPool] _terminateStorageProcess];
auto pid = [webView _webProcessIdentifier];
if (pid)
kill(pid, SIGKILL);
@@ -159,7 +159,7 @@
// Data stores can't delete anything unless a WKProcessPool exists, so make sure the shared data store exists.
auto *processPool = [WKProcessPool _sharedProcessPool];
- [processPool _terminateDatabaseProcess];
+ [processPool _terminateStorageProcess];
RetainPtr<WKWebsiteDataStore> dataStore = [[WKWebsiteDataStore alloc] _initWithConfiguration:websiteDataStoreConfiguration.get()];
RetainPtr<NSSet> types = adoptNS([[NSSet alloc] initWithObjects:WKWebsiteDataTypeIndexedDBDatabases, nil]);
