Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 6 insertions, 6 deletions

diff --git a/Source/WebKit2/Platform/CoreIPC/Connection.cpp b/Source/WebKit2/Platform/CoreIPC/Connection.cpp
index 5cbd4bc..281ccb6 100644
--- a/Source/WebKit2/Platform/CoreIPC/Connection.cpp
+++ b/Source/WebKit2/Platform/CoreIPC/Connection.cpp
@@ -343,10 +343,8 @@ PassOwnPtr<ArgumentDecoder> Connection::sendSyncMessage(MessageID messageID, uin
     // We only allow sending sync messages from the client run loop.
     ASSERT(RunLoop::current() == m_clientRunLoop);
 
-    if (!isValid()) {
-        m_client->didFailToSendSyncMessage(this);
+    if (!isValid())
         return 0;
-    }
     
     // Push the pending sync reply information on our stack.
     {
@@ -358,12 +356,14 @@ PassOwnPtr<ArgumentDecoder> Connection::sendSyncMessage(MessageID messageID, uin
 
         m_pendingSyncReplies.append(PendingSyncReply(syncRequestID));
     }
-    
-    // First send the message.
-    sendMessage(messageID, encoder);
 
+    // We have to begin waiting for the sync reply before sending the message, in case the other side
+    // would have sent a request before us, which would lead to a deadlock.
     m_syncMessageState->beginWaitForSyncReply();
 
+    // First send the message.
+    sendMessage(messageID, encoder);
+
     // Then wait for a reply. Waiting for a reply could involve dispatching incoming sync messages, so
     // keep an extra reference to the connection here in case it's invalidated.
     RefPtr<Connection> protect(this);