Changeset 70833 in webkit

Timestamp:

Oct 28, 2010 6:29:35 PM (13 years ago)

Author:

andersca@apple.com

Message:

Move code to dispatch a sync message out into a separate function
​https://bugs.webkit.org/show_bug.cgi?id=48605

Reviewed by Adam Roben.

• Platform/CoreIPC/Connection.cpp:

(CoreIPC::Connection::dispatchSyncMessage):
Factor code out from dispatchMessage. Handle receiving a message with an invalid reply ID.

(CoreIPC::Connection::dispatchMessages):
Call dispatchSyncMessage.

• Platform/CoreIPC/Connection.h:

Location:

trunk/WebKit2

Files:

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

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-28  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Move code to dispatch a sync message out into a separate function
+        https://bugs.webkit.org/show_bug.cgi?id=48605
+
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::dispatchSyncMessage):
+        Factor code out from dispatchMessage. Handle receiving a message with an invalid reply ID.
+
+        (CoreIPC::Connection::dispatchMessages):
+        Call dispatchSyncMessage.
+
+        * Platform/CoreIPC/Connection.h:
+
 2010-10-28  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/Platform/CoreIPC/Connection.cpp

@@ -313 +313 @@
 }
 
+void Connection::dispatchSyncMessage(MessageID messageID, ArgumentDecoder* arguments)
+{
+    ASSERT(messageID.isSync());
+
+    // Decode the sync request ID.
+    uint64_t syncRequestID = 0;
+
+    if (!arguments->decodeUInt64(syncRequestID) || !syncRequestID) {
+        // We received an invalid sync message.
+        arguments->markInvalid();
+        return;
+    }
+
+    // Create our reply encoder.
+    ArgumentEncoder* replyEncoder = new ArgumentEncoder(syncRequestID);
+    
+    // Hand off both the decoder and encoder to the client..
+    SyncReplyMode syncReplyMode = m_client->didReceiveSyncMessage(this, messageID, arguments, replyEncoder);
+
+    // FIXME: If the message was invalid, we should send back a SyncMessageError.
+    ASSERT(!arguments->isInvalid());
+
+    if (syncReplyMode == ManualReply) {
+        // The client will take ownership of the reply encoder and send it at some point in the future.
+        // We won't do anything here.
+        return;
+    }
+
+    // Send the reply.
+    sendSyncReply(replyEncoder);
+}
+
 void Connection::dispatchMessages()
 {
@@ -331 +363 @@
         OwnPtr<ArgumentDecoder> arguments = message.releaseArguments();
 
-        if (message.messageID().isSync()) {
-            // Decode the sync request ID.
-            uint64_t syncRequestID = 0;
-
-            if (!arguments->decodeUInt64(syncRequestID)) {
-                // FIXME: Handle this case.
-                ASSERT_NOT_REACHED();
-            }
-
-            // Create our reply encoder.
-            ArgumentEncoder* replyEncoder = new ArgumentEncoder(syncRequestID);
-            
-            // Hand off both the decoder and encoder to the client..
-            SyncReplyMode syncReplyMode = m_client->didReceiveSyncMessage(this, message.messageID(), arguments.get(), replyEncoder);
-            
-            // FIXME: If the message was invalid, we should send back a SyncMessageError.
-            ASSERT(!arguments->isInvalid());
-
-            if (syncReplyMode == AutomaticReply) {
-                // Send the reply.
-                sendSyncReply(replyEncoder);
-            } else {
-                // The client will take ownership of the reply encoder and send it at some point in the future.
-                // We won't do anything here.
-            }
-        } else
+        if (message.messageID().isSync())
+            dispatchSyncMessage(message.messageID(), arguments.get());
+        else
             m_client->didReceiveMessage(this, message.messageID(), arguments.get());
 

trunk/WebKit2/Platform/CoreIPC/Connection.h

@@ -169 +169 @@
     void dispatchConnectionDidClose();
     void dispatchMessages();
-    
+    void dispatchSyncMessage(MessageID, ArgumentDecoder*);
+                             
     Client* m_client;
     bool m_isServer;