Title: [140592] tags/Safari-537.26.4/Source/WebKit2
- Revision
- 140592
- Author
- lforsch...@apple.com
- Date
- 2013-01-23 14:20:08 -0800 (Wed, 23 Jan 2013)
Log Message
Merged r140582. <rdar://problem/13048210>
Modified Paths
Diff
Modified: tags/Safari-537.26.4/Source/WebKit2/ChangeLog (140591 => 140592)
--- tags/Safari-537.26.4/Source/WebKit2/ChangeLog 2013-01-23 22:18:59 UTC (rev 140591)
+++ tags/Safari-537.26.4/Source/WebKit2/ChangeLog 2013-01-23 22:20:08 UTC (rev 140592)
@@ -1,3 +1,20 @@
+2013-01-23 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r140582
+
+ 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-21 Lucas Forschler <lforsch...@apple.com>
Merge r140351
Modified: tags/Safari-537.26.4/Source/WebKit2/Platform/CoreIPC/Connection.cpp (140591 => 140592)
--- tags/Safari-537.26.4/Source/WebKit2/Platform/CoreIPC/Connection.cpp 2013-01-23 22:18:59 UTC (rev 140591)
+++ tags/Safari-537.26.4/Source/WebKit2/Platform/CoreIPC/Connection.cpp 2013-01-23 22:20:08 UTC (rev 140592)
@@ -405,8 +405,10 @@
return sendSyncMessageFromSecondaryThread(messageID, syncRequestID, encoder, timeout);
}
- if (!isValid())
+ if (!isValid()) {
+ didFailToSendSyncMessage();
return nullptr;
+ }
// Push the pending sync reply information on our stack.
{
@@ -434,6 +436,9 @@
m_pendingSyncReplies.removeLast();
}
+ if (!reply)
+ didFailToSendSyncMessage();
+
return reply.release();
}
@@ -441,20 +446,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);
@@ -475,9 +476,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
