[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
hyatt at apple.com
hyatt at apple.com
Mon Feb 21 00:31:51 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 3e51f8a97ea6e00dd0dae5a1102c94710e0a70ca
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 1 18:46:24 2011 +0000
Back out accidental commit of Connection.cpp
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/Platform/CoreIPC/Connection.cpp b/Source/WebKit2/Platform/CoreIPC/Connection.cpp
index c6cdbde..4b25629 100644
--- a/Source/WebKit2/Platform/CoreIPC/Connection.cpp
+++ b/Source/WebKit2/Platform/CoreIPC/Connection.cpp
@@ -275,15 +275,13 @@ void Connection::processIncomingMessage(MessageID messageID, PassOwnPtr<Argument
// Check if this is a sync reply.
if (messageID == MessageID(CoreIPCMessage::SyncMessageReply)) {
MutexLocker locker(m_syncReplyStateMutex);
- if (!m_pendingSyncReplies.isEmpty()) {
- ASSERT(!m_pendingSyncReplies.isEmpty());
+ ASSERT(!m_pendingSyncReplies.isEmpty());
- PendingSyncReply& pendingSyncReply = m_pendingSyncReplies.last();
- ASSERT(pendingSyncReply.syncRequestID == arguments->destinationID());
+ PendingSyncReply& pendingSyncReply = m_pendingSyncReplies.last();
+ ASSERT(pendingSyncReply.syncRequestID == arguments->destinationID());
- pendingSyncReply.replyDecoder = arguments.leakPtr();
- pendingSyncReply.didReceiveReply = true;
- }
+ pendingSyncReply.replyDecoder = arguments.leakPtr();
+ pendingSyncReply.didReceiveReply = true;
m_waitForSyncReplySemaphore.signal();
return;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list