Diff
Modified: trunk/Source/WebKit2/ChangeLog (210886 => 210887)
--- trunk/Source/WebKit2/ChangeLog 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-18 22:43:22 UTC (rev 210887)
@@ -1,5 +1,49 @@
2017-01-18 Alex Christensen <[email protected]>
+ Modernize DelayedReply IPC code
+ https://bugs.webkit.org/show_bug.cgi?id=167176
+
+ Reviewed by Brady Eidson.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::performSynchronousLoad):
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ * Platform/IPC/HandleMessage.h:
+ (IPC::callMemberFunctionImpl):
+ (IPC::callMemberFunction):
+ (IPC::handleMessageDelayed):
+ * Scripts/webkit/messages.py:
+ (message_to_struct_declaration):
+ (generate_message_handler):
+ * UIProcess/Databases/DatabaseProcessProxy.cpp:
+ (WebKit::DatabaseProcessProxy::getDatabaseProcessConnection):
+ * UIProcess/Databases/DatabaseProcessProxy.h:
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::getNetworkProcessConnection):
+ (WebKit::NetworkProcessProxy::networkProcessCrashedOrFailedToLaunch):
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/Plugins/PluginProcessManager.cpp:
+ (WebKit::PluginProcessManager::getPluginProcessConnection):
+ * UIProcess/Plugins/PluginProcessManager.h:
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::getPluginProcessConnection):
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::runJavaScriptAlert):
+ (WebKit::WebPageProxy::runJavaScriptConfirm):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::getNetworkProcessConnection):
+ (WebKit::WebProcessPool::getDatabaseProcessConnection):
+ * UIProcess/WebProcessPool.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::getPluginProcessConnection):
+ (WebKit::WebProcessProxy::getNetworkProcessConnection):
+ (WebKit::WebProcessProxy::getDatabaseProcessConnection):
+ * UIProcess/WebProcessProxy.h:
+
+2017-01-18 Alex Christensen <[email protected]>
+
Fix CMake build.
* PlatformMac.cmake:
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (210886 => 210887)
--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2017-01-18 22:43:22 UTC (rev 210887)
@@ -129,7 +129,7 @@
loader->start();
}
-void NetworkConnectionToWebProcess::performSynchronousLoad(const NetworkResourceLoadParameters& loadParameters, RefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>&& reply)
+void NetworkConnectionToWebProcess::performSynchronousLoad(const NetworkResourceLoadParameters& loadParameters, Ref<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>&& reply)
{
auto loader = NetworkResourceLoader::create(loadParameters, *this, WTFMove(reply));
m_networkResourceLoaders.add(loadParameters.identifier, loader.ptr());
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (210886 => 210887)
--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2017-01-18 22:43:22 UTC (rev 210887)
@@ -73,7 +73,7 @@
void didReceiveSyncNetworkConnectionToWebProcessMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&);
void scheduleResourceLoad(const NetworkResourceLoadParameters&);
- void performSynchronousLoad(const NetworkResourceLoadParameters&, RefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>&&);
+ void performSynchronousLoad(const NetworkResourceLoadParameters&, Ref<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>&&);
void loadPing(const NetworkResourceLoadParameters&);
void prefetchDNS(const String&);
Modified: trunk/Source/WebKit2/Platform/IPC/HandleMessage.h (210886 => 210887)
--- trunk/Source/WebKit2/Platform/IPC/HandleMessage.h 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/Platform/IPC/HandleMessage.h 2017-01-18 22:43:22 UTC (rev 210887)
@@ -63,15 +63,15 @@
// Dispatch functions with delayed reply arguments.
template <typename C, typename MF, typename R, typename ArgsTuple, size_t... ArgsIndex>
-void callMemberFunctionImpl(C* object, MF function, PassRefPtr<R> delayedReply, ArgsTuple&& args, std::index_sequence<ArgsIndex...>)
+void callMemberFunctionImpl(C* object, MF function, Ref<R>&& delayedReply, ArgsTuple&& args, std::index_sequence<ArgsIndex...>)
{
- (object->*function)(std::get<ArgsIndex>(args)..., delayedReply);
+ (object->*function)(std::get<ArgsIndex>(args)..., WTFMove(delayedReply));
}
template<typename C, typename MF, typename R, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>>
-void callMemberFunction(ArgsTuple&& args, PassRefPtr<R> delayedReply, C* object, MF function)
+void callMemberFunction(ArgsTuple&& args, Ref<R>&& delayedReply, C* object, MF function)
{
- callMemberFunctionImpl(object, function, delayedReply, std::forward<ArgsTuple>(args), ArgsIndicies());
+ callMemberFunctionImpl(object, function, WTFMove(delayedReply), std::forward<ArgsTuple>(args), ArgsIndicies());
}
// Dispatch functions with connection parameter with no reply arguments.
@@ -174,8 +174,8 @@
return;
}
- RefPtr<typename T::DelayedReply> delayedReply = adoptRef(new typename T::DelayedReply(&connection, WTFMove(replyEncoder)));
- callMemberFunction(WTFMove(arguments), PassRefPtr<typename T::DelayedReply>(WTFMove(delayedReply)), object, function);
+ Ref<typename T::DelayedReply> delayedReply = adoptRef(*new typename T::DelayedReply(connection, WTFMove(replyEncoder)));
+ callMemberFunction(WTFMove(arguments), WTFMove(delayedReply), object, function);
}
} // namespace IPC
Modified: trunk/Source/WebKit2/Scripts/webkit/messages.py (210886 => 210887)
--- trunk/Source/WebKit2/Scripts/webkit/messages.py 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/Scripts/webkit/messages.py 2017-01-18 22:43:22 UTC (rev 210887)
@@ -118,7 +118,7 @@
if message.has_attribute(DELAYED_ATTRIBUTE):
send_parameters = [(function_parameter_type(x.type, x.kind), x.name) for x in message.reply_parameters]
result.append(' struct DelayedReply : public ThreadSafeRefCounted<DelayedReply> {\n')
- result.append(' DelayedReply(PassRefPtr<IPC::Connection>, std::unique_ptr<IPC::Encoder>);\n')
+ result.append(' DelayedReply(Ref<IPC::Connection>&&, std::unique_ptr<IPC::Encoder>);\n')
result.append(' ~DelayedReply();\n')
result.append('\n')
result.append(' bool send(%s);\n' % ', '.join([' '.join(x) for x in send_parameters]))
@@ -486,8 +486,8 @@
if message.condition:
result.append('#if %s\n\n' % message.condition)
- result.append('%s::DelayedReply::DelayedReply(PassRefPtr<IPC::Connection> connection, std::unique_ptr<IPC::Encoder> encoder)\n' % message.name)
- result.append(' : m_connection(connection)\n')
+ result.append('%s::DelayedReply::DelayedReply(Ref<IPC::Connection>&& connection, std::unique_ptr<IPC::Encoder> encoder)\n' % message.name)
+ result.append(' : m_connection(WTFMove(connection))\n')
result.append(' , m_encoder(WTFMove(encoder))\n')
result.append('{\n')
result.append('}\n')
Modified: trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp (210886 => 210887)
--- trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2017-01-18 22:43:22 UTC (rev 210887)
@@ -112,9 +112,9 @@
send(Messages::DatabaseProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, origins, callbackID), 0);
}
-void DatabaseProcessProxy::getDatabaseProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply> reply)
+void DatabaseProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
{
- m_pendingConnectionReplies.append(reply);
+ m_pendingConnectionReplies.append(WTFMove(reply));
if (state() == State::Launching) {
m_numPendingConnectionRequests++;
Modified: trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h (210886 => 210887)
--- trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h 2017-01-18 22:43:22 UTC (rev 210887)
@@ -55,7 +55,7 @@
void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, std::function<void()> completionHandler);
void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>&, std::function<void()> completionHandler);
- void getDatabaseProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>);
+ void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
private:
DatabaseProcessProxy(WebProcessPool*);
@@ -86,7 +86,7 @@
WebProcessPool* m_processPool;
unsigned m_numPendingConnectionRequests;
- Deque<RefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>> m_pendingConnectionReplies;
+ Deque<Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>> m_pendingConnectionReplies;
HashMap<uint64_t, std::function<void (WebsiteData)>> m_pendingFetchWebsiteDataCallbacks;
HashMap<uint64_t, std::function<void ()>> m_pendingDeleteWebsiteDataCallbacks;
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (210886 => 210887)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2017-01-18 22:43:22 UTC (rev 210887)
@@ -100,9 +100,9 @@
ASSERT_UNUSED(connection, this->connection() == &connection);
}
-void NetworkProcessProxy::getNetworkProcessConnection(RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&& reply)
+void NetworkProcessProxy::getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&& reply)
{
- m_pendingConnectionReplies.append(reply);
+ m_pendingConnectionReplies.append(WTFMove(reply));
if (state() == State::Launching) {
m_numPendingConnectionRequests++;
@@ -169,7 +169,7 @@
{
// The network process must have crashed or exited, send any pending sync replies we might have.
while (!m_pendingConnectionReplies.isEmpty()) {
- RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
+ Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
#if USE(UNIX_DOMAIN_SOCKETS)
reply->send(IPC::Attachment());
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (210886 => 210887)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2017-01-18 22:43:22 UTC (rev 210887)
@@ -59,7 +59,7 @@
static Ref<NetworkProcessProxy> create(WebProcessPool&);
~NetworkProcessProxy();
- void getNetworkProcessConnection(RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
+ void getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
DownloadProxy* createDownloadProxy(const WebCore::ResourceRequest&);
@@ -122,7 +122,7 @@
WebProcessPool& m_processPool;
unsigned m_numPendingConnectionRequests;
- Deque<RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>> m_pendingConnectionReplies;
+ Deque<Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>> m_pendingConnectionReplies;
HashMap<uint64_t, std::function<void (WebsiteData)>> m_pendingFetchWebsiteDataCallbacks;
HashMap<uint64_t, std::function<void ()>> m_pendingDeleteWebsiteDataCallbacks;
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp (210886 => 210887)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp 2017-01-18 22:43:22 UTC (rev 210887)
@@ -79,12 +79,12 @@
return token;
}
-void PluginProcessManager::getPluginProcessConnection(uint64_t pluginProcessToken, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply)
+void PluginProcessManager::getPluginProcessConnection(uint64_t pluginProcessToken, Ref<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>&& reply)
{
ASSERT(pluginProcessToken);
PluginProcessProxy* pluginProcess = getOrCreatePluginProcess(pluginProcessToken);
- pluginProcess->getPluginProcessConnection(reply);
+ pluginProcess->getPluginProcessConnection(WTFMove(reply));
}
void PluginProcessManager::removePluginProcessProxy(PluginProcessProxy* pluginProcessProxy)
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h (210886 => 210887)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2017-01-18 22:43:22 UTC (rev 210887)
@@ -58,7 +58,7 @@
uint64_t pluginProcessToken(const PluginModuleInfo&, PluginProcessType, PluginProcessSandboxPolicy);
- void getPluginProcessConnection(uint64_t pluginProcessToken, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>);
+ void getPluginProcessConnection(uint64_t pluginProcessToken, Ref<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>&&);
void removePluginProcessProxy(PluginProcessProxy*);
void fetchWebsiteData(const PluginModuleInfo&, std::function<void (Vector<String>)> completionHandler);
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp (210886 => 210887)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2017-01-18 22:43:22 UTC (rev 210887)
@@ -99,9 +99,9 @@
// Asks the plug-in process to create a new connection to a web process. The connection identifier will be
// encoded in the given argument encoder and sent back to the connection of the given web process.
-void PluginProcessProxy::getPluginProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply)
+void PluginProcessProxy::getPluginProcessConnection(Ref<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>&& reply)
{
- m_pendingConnectionReplies.append(reply);
+ m_pendingConnectionReplies.append(WTFMove(reply));
if (state() == State::Launching) {
m_numPendingConnectionRequests++;
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (210886 => 210887)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2017-01-18 22:43:22 UTC (rev 210887)
@@ -76,7 +76,7 @@
// Asks the plug-in process to create a new connection to a web process. The connection identifier will be
// encoded in the given argument encoder and sent back to the connection of the given web process.
- void getPluginProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>);
+ void getPluginProcessConnection(Ref<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>&&);
void fetchWebsiteData(std::function<void (Vector<String>)> completionHandler);
void deleteWebsiteData(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (210886 => 210887)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-01-18 22:43:22 UTC (rev 210887)
@@ -3896,7 +3896,7 @@
m_uiClient->close(this);
}
-void WebPageProxy::runJavaScriptAlert(uint64_t frameID, const SecurityOriginData& securityOrigin, const String& message, RefPtr<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply> reply)
+void WebPageProxy::runJavaScriptAlert(uint64_t frameID, const SecurityOriginData& securityOrigin, const String& message, Ref<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply>&& reply)
{
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
@@ -3904,10 +3904,12 @@
// Since runJavaScriptAlert() can spin a nested run loop we need to turn off the responsiveness timer.
m_process->responsivenessTimer().stop();
- m_uiClient->runJavaScriptAlert(this, message, frame, securityOrigin, [reply]{ reply->send(); });
+ m_uiClient->runJavaScriptAlert(this, message, frame, securityOrigin, [reply = WTFMove(reply)] {
+ reply->send();
+ });
}
-void WebPageProxy::runJavaScriptConfirm(uint64_t frameID, const SecurityOriginData& securityOrigin, const String& message, RefPtr<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply> reply)
+void WebPageProxy::runJavaScriptConfirm(uint64_t frameID, const SecurityOriginData& securityOrigin, const String& message, Ref<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply>&& reply)
{
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
@@ -3915,7 +3917,9 @@
// Since runJavaScriptConfirm() can spin a nested run loop we need to turn off the responsiveness timer.
m_process->responsivenessTimer().stop();
- m_uiClient->runJavaScriptConfirm(this, message, frame, securityOrigin, [reply](bool result) { reply->send(result); });
+ m_uiClient->runJavaScriptConfirm(this, message, frame, securityOrigin, [reply = WTFMove(reply)](bool result) {
+ reply->send(result);
+ });
}
void WebPageProxy::runJavaScriptPrompt(uint64_t frameID, const SecurityOriginData& securityOrigin, const String& message, const String& defaultValue, RefPtr<Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply> reply)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (210886 => 210887)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-01-18 22:43:22 UTC (rev 210887)
@@ -1272,8 +1272,8 @@
// UI client
void createNewPage(uint64_t frameID, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const NavigationActionData&, uint64_t& newPageID, WebPageCreationParameters&);
void showPage();
- void runJavaScriptAlert(uint64_t frameID, const WebCore::SecurityOriginData&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply>);
- void runJavaScriptConfirm(uint64_t frameID, const WebCore::SecurityOriginData&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply>);
+ void runJavaScriptAlert(uint64_t frameID, const WebCore::SecurityOriginData&, const String&, Ref<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply>&&);
+ void runJavaScriptConfirm(uint64_t frameID, const WebCore::SecurityOriginData&, const String&, Ref<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply>&&);
void runJavaScriptPrompt(uint64_t frameID, const WebCore::SecurityOriginData&, const String&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply>);
void setStatusText(const String&);
void mouseDidMoveOverElement(const WebHitTestResultData&, uint32_t modifiers, const UserData&);
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (210886 => 210887)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-01-18 22:43:22 UTC (rev 210887)
@@ -416,14 +416,12 @@
m_networkProcess = nullptr;
}
-void WebProcessPool::getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply)
+void WebProcessPool::getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&& reply)
{
- ASSERT(reply);
-
ensureNetworkProcess();
ASSERT(m_networkProcess);
- m_networkProcess->getNetworkProcessConnection(reply);
+ m_networkProcess->getNetworkProcessConnection(WTFMove(reply));
}
#if ENABLE(DATABASE_PROCESS)
@@ -448,13 +446,11 @@
m_databaseProcess->send(Messages::DatabaseProcess::InitializeDatabaseProcess(parameters), 0);
}
-void WebProcessPool::getDatabaseProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply> reply)
+void WebProcessPool::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
{
- ASSERT(reply);
-
ensureDatabaseProcess();
- m_databaseProcess->getDatabaseProcessConnection(reply);
+ m_databaseProcess->getDatabaseProcessConnection(WTFMove(reply));
}
void WebProcessPool::databaseProcessCrashed(DatabaseProcessProxy* databaseProcessProxy)
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (210886 => 210887)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2017-01-18 22:43:22 UTC (rev 210887)
@@ -295,12 +295,12 @@
NetworkProcessProxy* networkProcess() { return m_networkProcess.get(); }
void networkProcessCrashed(NetworkProcessProxy*);
- void getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>);
+ void getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
#if ENABLE(DATABASE_PROCESS)
void ensureDatabaseProcess();
DatabaseProcessProxy* databaseProcess() { return m_databaseProcess.get(); }
- void getDatabaseProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>);
+ void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
void databaseProcessCrashed(DatabaseProcessProxy*);
#endif
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (210886 => 210887)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-01-18 22:43:22 UTC (rev 210887)
@@ -407,21 +407,21 @@
#endif // ENABLE(NETSCAPE_PLUGIN_API)
#if ENABLE(NETSCAPE_PLUGIN_API)
-void WebProcessProxy::getPluginProcessConnection(uint64_t pluginProcessToken, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply)
+void WebProcessProxy::getPluginProcessConnection(uint64_t pluginProcessToken, Ref<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>&& reply)
{
- PluginProcessManager::singleton().getPluginProcessConnection(pluginProcessToken, reply);
+ PluginProcessManager::singleton().getPluginProcessConnection(pluginProcessToken, WTFMove(reply));
}
#endif
-void WebProcessProxy::getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply)
+void WebProcessProxy::getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&& reply)
{
- m_processPool->getNetworkProcessConnection(reply);
+ m_processPool->getNetworkProcessConnection(WTFMove(reply));
}
#if ENABLE(DATABASE_PROCESS)
-void WebProcessProxy::getDatabaseProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply> reply)
+void WebProcessProxy::getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&& reply)
{
- m_processPool->getDatabaseProcessConnection(reply);
+ m_processPool->getDatabaseProcessConnection(WTFMove(reply));
}
#endif // ENABLE(DATABASE_PROCESS)
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (210886 => 210887)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2017-01-18 22:29:31 UTC (rev 210886)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2017-01-18 22:43:22 UTC (rev 210887)
@@ -173,11 +173,11 @@
void getPlugins(bool refresh, Vector<WebCore::PluginInfo>& plugins, Vector<WebCore::PluginInfo>& applicationPlugins);
#endif // ENABLE(NETSCAPE_PLUGIN_API)
#if ENABLE(NETSCAPE_PLUGIN_API)
- void getPluginProcessConnection(uint64_t pluginProcessToken, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>);
+ void getPluginProcessConnection(uint64_t pluginProcessToken, Ref<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>&&);
#endif
- void getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>);
+ void getNetworkProcessConnection(Ref<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>&&);
#if ENABLE(DATABASE_PROCESS)
- void getDatabaseProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>);
+ void getDatabaseProcessConnection(Ref<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>&&);
#endif
void retainIconForPageURL(const String& pageURL);
