Diff
Modified: trunk/Source/WebKit2/ChangeLog (178597 => 178598)
--- trunk/Source/WebKit2/ChangeLog 2015-01-16 21:33:01 UTC (rev 178597)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-16 21:37:42 UTC (rev 178598)
@@ -1,3 +1,34 @@
+2015-01-16 Anders Carlsson <[email protected]>
+
+ Sprinkle some CTTE in ChildProcessProxy member functions
+ https://bugs.webkit.org/show_bug.cgi?id=140562
+
+ Reviewed by Andreas Kling.
+
+ * Shared/ChildProcessProxy.cpp:
+ (WebKit::ChildProcessProxy::didFinishLaunching):
+ (WebKit::ChildProcessProxy::clearConnection):
+ (WebKit::ChildProcessProxy::connectionWillOpen):
+ (WebKit::ChildProcessProxy::connectionDidClose):
+ (WebKit::ChildProcessProxy::connectionWillClose): Deleted.
+ * Shared/ChildProcessProxy.h:
+ * UIProcess/Databases/DatabaseProcessProxy.cpp:
+ (WebKit::DatabaseProcessProxy::connectionWillOpen): Deleted.
+ (WebKit::DatabaseProcessProxy::connectionWillClose): Deleted.
+ * UIProcess/Databases/DatabaseProcessProxy.h:
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::connectionWillOpen):
+ (WebKit::NetworkProcessProxy::connectionWillClose): Deleted.
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::connectionWillOpen):
+ (WebKit::WebProcessProxy::connectionDidClose):
+ (WebKit::WebProcessProxy::connectionWillClose): Deleted.
+ * UIProcess/WebProcessProxy.h:
+ * UIProcess/mac/SecItemShimProxy.cpp:
+ (WebKit::SecItemShimProxy::initializeConnection):
+ * UIProcess/mac/SecItemShimProxy.h:
+
2015-01-16 Beth Dakin <[email protected]>
Should cancel immediate action sooner in WK2
Modified: trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp (178597 => 178598)
--- trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp 2015-01-16 21:33:01 UTC (rev 178597)
+++ trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp 2015-01-16 21:37:42 UTC (rev 178598)
@@ -138,7 +138,7 @@
m_connection->setShouldCloseConnectionOnMachExceptions();
#endif
- connectionWillOpen(m_connection.get());
+ connectionWillOpen(*m_connection);
m_connection->open();
for (size_t i = 0; i < m_pendingMessages.size(); ++i) {
@@ -164,17 +164,18 @@
if (!m_connection)
return;
- connectionWillClose(m_connection.get());
+ // FIXME: Call this after the connection has been invalidated.
+ connectionDidClose(*m_connection);
m_connection->invalidate();
m_connection = nullptr;
}
-void ChildProcessProxy::connectionWillOpen(IPC::Connection*)
+void ChildProcessProxy::connectionWillOpen(IPC::Connection&)
{
}
-void ChildProcessProxy::connectionWillClose(IPC::Connection*)
+void ChildProcessProxy::connectionDidClose(IPC::Connection&)
{
}
Modified: trunk/Source/WebKit2/Shared/ChildProcessProxy.h (178597 => 178598)
--- trunk/Source/WebKit2/Shared/ChildProcessProxy.h 2015-01-16 21:33:01 UTC (rev 178597)
+++ trunk/Source/WebKit2/Shared/ChildProcessProxy.h 2015-01-16 21:37:42 UTC (rev 178598)
@@ -84,8 +84,8 @@
private:
virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) = 0;
- virtual void connectionWillOpen(IPC::Connection*);
- virtual void connectionWillClose(IPC::Connection*);
+ virtual void connectionWillOpen(IPC::Connection&);
+ virtual void connectionDidClose(IPC::Connection&);
Vector<std::pair<std::unique_ptr<IPC::MessageEncoder>, unsigned>> m_pendingMessages;
RefPtr<ProcessLauncher> m_processLauncher;
Modified: trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp (178597 => 178598)
--- trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2015-01-16 21:33:01 UTC (rev 178597)
+++ trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2015-01-16 21:37:42 UTC (rev 178598)
@@ -61,14 +61,6 @@
platformGetLaunchOptions(launchOptions);
}
-void DatabaseProcessProxy::connectionWillOpen(IPC::Connection*)
-{
-}
-
-void DatabaseProcessProxy::connectionWillClose(IPC::Connection*)
-{
-}
-
void DatabaseProcessProxy::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder)
{
if (decoder.messageReceiverName() == Messages::DatabaseProcessProxy::messageReceiverName()) {
Modified: trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h (178597 => 178598)
--- trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h 2015-01-16 21:33:01 UTC (rev 178597)
+++ trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h 2015-01-16 21:37:42 UTC (rev 178598)
@@ -49,8 +49,6 @@
// ChildProcessProxy
virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) override;
- virtual void connectionWillOpen(IPC::Connection*) override;
- virtual void connectionWillClose(IPC::Connection*) override;
// IPC::Connection::Client
virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (178597 => 178598)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-01-16 21:33:01 UTC (rev 178597)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-01-16 21:37:42 UTC (rev 178598)
@@ -82,7 +82,7 @@
platformGetLaunchOptions(launchOptions);
}
-void NetworkProcessProxy::connectionWillOpen(IPC::Connection* connection)
+void NetworkProcessProxy::connectionWillOpen(IPC::Connection& connection)
{
#if ENABLE(SEC_ITEM_SHIM)
SecItemShimProxy::shared().initializeConnection(connection);
@@ -91,10 +91,6 @@
#endif
}
-void NetworkProcessProxy::connectionWillClose(IPC::Connection*)
-{
-}
-
void NetworkProcessProxy::getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply)
{
m_pendingConnectionReplies.append(reply);
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (178597 => 178598)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-01-16 21:33:01 UTC (rev 178597)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-01-16 21:37:42 UTC (rev 178598)
@@ -73,8 +73,7 @@
// ChildProcessProxy
virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) override;
- virtual void connectionWillOpen(IPC::Connection*) override;
- virtual void connectionWillClose(IPC::Connection*) override;
+ virtual void connectionWillOpen(IPC::Connection&) override;
void platformGetLaunchOptions(ProcessLauncher::LaunchOptions&);
void networkProcessCrashedOrFailedToLaunch();
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (178597 => 178598)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-01-16 21:33:01 UTC (rev 178597)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-01-16 21:37:42 UTC (rev 178598)
@@ -123,26 +123,26 @@
platformGetLaunchOptions(launchOptions);
}
-void WebProcessProxy::connectionWillOpen(IPC::Connection* connection)
+void WebProcessProxy::connectionWillOpen(IPC::Connection& connection)
{
- ASSERT(this->connection() == connection);
+ ASSERT(this->connection() == &connection);
#if ENABLE(SEC_ITEM_SHIM)
SecItemShimProxy::shared().initializeConnection(connection);
#endif
for (WebPageProxyMap::iterator it = m_pageMap.begin(), end = m_pageMap.end(); it != end; ++it)
- it->value->connectionWillOpen(connection);
+ it->value->connectionWillOpen(&connection);
m_processPool->processWillOpenConnection(this);
}
-void WebProcessProxy::connectionWillClose(IPC::Connection* connection)
+void WebProcessProxy::connectionDidClose(IPC::Connection& connection)
{
- ASSERT(this->connection() == connection);
+ ASSERT(this->connection() == &connection);
for (WebPageProxyMap::iterator it = m_pageMap.begin(), end = m_pageMap.end(); it != end; ++it)
- it->value->connectionWillClose(connection);
+ it->value->connectionWillClose(&connection);
m_processPool->processWillCloseConnection(this);
}
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (178597 => 178598)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-01-16 21:33:01 UTC (rev 178597)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-01-16 21:37:42 UTC (rev 178598)
@@ -149,8 +149,8 @@
// From ChildProcessProxy
virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) override;
void platformGetLaunchOptions(ProcessLauncher::LaunchOptions&);
- virtual void connectionWillOpen(IPC::Connection*) override;
- virtual void connectionWillClose(IPC::Connection*) override;
+ virtual void connectionWillOpen(IPC::Connection&) override;
+ virtual void connectionDidClose(IPC::Connection&) override;
// Called when the web process has crashed or we know that it will terminate soon.
// Will potentially cause the WebProcessProxy object to be freed.
Modified: trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp (178597 => 178598)
--- trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp 2015-01-16 21:33:01 UTC (rev 178597)
+++ trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp 2015-01-16 21:37:42 UTC (rev 178598)
@@ -52,9 +52,9 @@
{
}
-void SecItemShimProxy::initializeConnection(IPC::Connection* connection)
+void SecItemShimProxy::initializeConnection(IPC::Connection& connection)
{
- connection->addWorkQueueMessageReceiver(Messages::SecItemShimProxy::messageReceiverName(), m_queue.get(), this);
+ connection.addWorkQueueMessageReceiver(Messages::SecItemShimProxy::messageReceiverName(), m_queue.get(), this);
}
void SecItemShimProxy::secItemRequest(IPC::Connection& connection, uint64_t requestID, const SecItemRequestData& request)
Modified: trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h (178597 => 178598)
--- trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h 2015-01-16 21:33:01 UTC (rev 178597)
+++ trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h 2015-01-16 21:37:42 UTC (rev 178598)
@@ -39,7 +39,7 @@
public:
static SecItemShimProxy& shared();
- void initializeConnection(IPC::Connection*);
+ void initializeConnection(IPC::Connection&);
private:
SecItemShimProxy();
