[webkit-changes] [140582] trunk/Source/WebKit2

[ap]

Title: [140582] trunk/Source/WebKit2

Revision

140582

Author

a...@apple.com

Date

2013-01-23 13:34:24 -0800 (Wed, 23 Jan 2013)

Log Message

        <rdar://problem/13064414> REGRESSION(r139514): didFailToSendSyncMessage is not called by Connection
        https://bugs.webkit.org/show_bug.cgi?id=107715

        Reviewed by Anders Carlsson.

        * Platform/CoreIPC/Connection.cpp:
        (CoreIPC::Connection::sendSyncMessage):
        (CoreIPC::Connection::sendSyncMessageFromSecondaryThread):
        Correcting a misapplied edit - didFailToSendSyncMessage should be kept in main
        thread message sending, not in secondary thread.

Modified Paths

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

Diff

Modified: trunk/Source/WebKit2/ChangeLog (140581 => 140582)

--- trunk/Source/WebKit2/ChangeLog	2013-01-23 21:31:15 UTC (rev 140581)
+++ trunk/Source/WebKit2/ChangeLog	2013-01-23 21:34:24 UTC (rev 140582)
@@ -1,3 +1,16 @@
+2013-01-23  Alexey Proskuryakov  <a...@apple.com>
+
+        <rdar://problem/13064414> REGRESSION(r139514): didFailToSendSyncMessage is not called by Connection
+        https://bugs.webkit.org/show_bug.cgi?id=107715
+
+        Reviewed by Anders Carlsson.
+
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::sendSyncMessage):
+        (CoreIPC::Connection::sendSyncMessageFromSecondaryThread):
+        Correcting a misapplied edit - didFailToSendSyncMessage should be kept in main
+        thread message sending, not in secondary thread.
+
 2013-01-23  Brady Eidson  <beid...@apple.com>
 
         Recursion handling cancelled authentication challenges in NetworkProcess

Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp (140581 => 140582)

--- trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp	2013-01-23 21:31:15 UTC (rev 140581)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp	2013-01-23 21:34:24 UTC (rev 140582)
@@ -404,8 +404,10 @@
         return sendSyncMessageFromSecondaryThread(messageID, syncRequestID, encoder, timeout);
     }
 
-    if (!isValid())
+    if (!isValid()) {
+        didFailToSendSyncMessage();
         return nullptr;
+    }
 
     // Push the pending sync reply information on our stack.
     {
@@ -433,6 +435,9 @@
         m_pendingSyncReplies.removeLast();
     }
 
+    if (!pendingReply.replyDecoder)
+        didFailToSendSyncMessage();
+
     return reply.release();
 }
 
@@ -440,20 +445,16 @@
 {
     ASSERT(RunLoop::current() != m_clientRunLoop);
 
-    if (!isValid()) {
-        didFailToSendSyncMessage();
+    if (!isValid())
         return nullptr;
-    }
 
     SecondaryThreadPendingSyncReply pendingReply;
 
     // Push the pending sync reply information on our stack.
     {
         MutexLocker locker(m_syncReplyStateMutex);
-        if (!m_shouldWaitForSyncReplies) {
-            didFailToSendSyncMessage();
+        if (!m_shouldWaitForSyncReplies)
             return nullptr;
-        }
 
         ASSERT(!m_secondaryThreadPendingSyncReplyMap.contains(syncRequestID));
         m_secondaryThreadPendingSyncReplyMap.add(syncRequestID, &pendingReply);
@@ -474,9 +475,6 @@
         m_secondaryThreadPendingSyncReplyMap.remove(syncRequestID);
     }
 
-    if (!pendingReply.replyDecoder)
-        didFailToSendSyncMessage();
-
     return adoptPtr(pendingReply.replyDecoder);
 }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes