Changeset 141432 in webkit

Timestamp:

Jan 31, 2013 10:18:55 AM (11 years ago)

Author:

andersca@apple.com

Message:

Stop using OutgoingMessage
​https://bugs.webkit.org/show_bug.cgi?id=108495

Reviewed by Sam Weinig.

• Platform/CoreIPC/Connection.cpp:

(CoreIPC::Connection::sendMessage):
(CoreIPC::Connection::sendOutgoingMessages):

• Platform/CoreIPC/Connection.h:

(Connection):

• Shared/ChildProcessProxy.cpp:

(WebKit::ChildProcessProxy::~ChildProcessProxy):
(WebKit::ChildProcessProxy::sendMessage):
(WebKit::ChildProcessProxy::didFinishLaunching):

• Shared/ChildProcessProxy.h:

(ChildProcessProxy):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/Connection.cpp (modified) (3 diffs)
• Platform/CoreIPC/Connection.h (modified) (2 diffs)
• Shared/ChildProcessProxy.cpp (modified) (3 diffs)
• Shared/ChildProcessProxy.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-31  Anders Carlsson  <andersca@apple.com>
+
+        Stop using OutgoingMessage
+        https://bugs.webkit.org/show_bug.cgi?id=108495
+
+        Reviewed by Sam Weinig.
+
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::sendMessage):
+        (CoreIPC::Connection::sendOutgoingMessages):
+        * Platform/CoreIPC/Connection.h:
+        (Connection):
+        * Shared/ChildProcessProxy.cpp:
+        (WebKit::ChildProcessProxy::~ChildProcessProxy):
+        (WebKit::ChildProcessProxy::sendMessage):
+        (WebKit::ChildProcessProxy::didFinishLaunching):
+        * Shared/ChildProcessProxy.h:
+        (ChildProcessProxy):
+
 2013-01-31  Simon Hausmann  <simon.hausmann@digia.com>
 

trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp

@@ -328 +328 @@
     {
         MutexLocker locker(m_outgoingMessagesLock);
-        m_outgoingMessages.append(OutgoingMessage(MessageID(), encoder));
+        m_outgoingMessages.append(encoder);
     }
     
@@ -670 +670 @@
 
     while (true) {
-        OutgoingMessage message;
+        OwnPtr<MessageEncoder> message;
         {
             MutexLocker locker(m_outgoingMessagesLock);
@@ -678 +678 @@
         }
 
-        if (!sendOutgoingMessage(message.messageID(), adoptPtr(message.arguments())))
+        if (!sendOutgoingMessage(MessageID(), message.release()))
             break;
     }

trunk/Source/WebKit2/Platform/CoreIPC/Connection.h

@@ -229 +229 @@
     };
 
-public:
-    typedef Message<MessageEncoder> OutgoingMessage;
-
-private:
     Connection(Identifier, bool isServer, Client*, WebCore::RunLoop* clientRunLoop);
     void platformInitialize(Identifier);
@@ -293 +289 @@
     // Outgoing messages.
     Mutex m_outgoingMessagesLock;
-    Deque<OutgoingMessage> m_outgoingMessages;
+    Deque<OwnPtr<MessageEncoder>> m_outgoingMessages;
     
     ThreadCondition m_waitForMessageCondition;

trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp

@@ -43 +43 @@
         m_connection->invalidate();
 
-    for (size_t i = 0; i < m_pendingMessages.size(); ++i)
-        m_pendingMessages[i].first.releaseArguments();
-
     if (m_processLauncher) {
         m_processLauncher->invalidate();
@@ -81 +78 @@
     // a CoreIPC connection.
     if (isLaunching()) {
-        m_pendingMessages.append(std::make_pair(CoreIPC::Connection::OutgoingMessage(CoreIPC::MessageID(), encoder), messageSendFlags));
+        m_pendingMessages.append(std::make_pair(encoder, messageSendFlags));
         return true;
     }
@@ -116 +113 @@
 
     for (size_t i = 0; i < m_pendingMessages.size(); ++i) {
-        CoreIPC::Connection::OutgoingMessage& outgoingMessage = m_pendingMessages[i].first;
+        OwnPtr<CoreIPC::MessageEncoder> message = m_pendingMessages[i].first.release();
         unsigned messageSendFlags = m_pendingMessages[i].second;
-        m_connection->sendMessage(adoptPtr(outgoingMessage.arguments()), messageSendFlags);
+        m_connection->sendMessage(message.release(), messageSendFlags);
     }
 

trunk/Source/WebKit2/Shared/ChildProcessProxy.h

@@ -71 +71 @@
     bool sendMessage(PassOwnPtr<CoreIPC::MessageEncoder>, unsigned messageSendFlags);
 
-    Vector<std::pair<CoreIPC::Connection::OutgoingMessage, unsigned> > m_pendingMessages;
+    Vector<std::pair<OwnPtr<CoreIPC::MessageEncoder>, unsigned>> m_pendingMessages;
     RefPtr<ProcessLauncher> m_processLauncher;
     RefPtr<CoreIPC::Connection> m_connection;