[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[andersca at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 061b8ef0ce904649f072cda88968305357e99e6c
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 20 22:04:21 2011 +0000

    2011-01-20  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Beth Dakin.
    
            Add Connection::waitForAndDispatchImmediately
            https://bugs.webkit.org/show_bug.cgi?id=52841
    
            * Platform/CoreIPC/Connection.h:
            (CoreIPC::Connection::waitForAndDispatchImmediately):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76280 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index c791a1d..76b5f56 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-20  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Beth Dakin.
+
+        Add Connection::waitForAndDispatchImmediately
+        https://bugs.webkit.org/show_bug.cgi?id=52841
+
+        * Platform/CoreIPC/Connection.h:
+        (CoreIPC::Connection::waitForAndDispatchImmediately):
+
 2011-01-20  Kevin Decker  <kdecker at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/Source/WebKit2/Platform/CoreIPC/Connection.h b/Source/WebKit2/Platform/CoreIPC/Connection.h
index c4ec478..1b009cf 100644
--- a/Source/WebKit2/Platform/CoreIPC/Connection.h
+++ b/Source/WebKit2/Platform/CoreIPC/Connection.h
@@ -119,7 +119,8 @@ public:
 
     template<typename T> bool send(const T& message, uint64_t destinationID);
     template<typename T> bool sendSync(const T& message, const typename T::Reply& reply, uint64_t destinationID, double timeout = NoTimeout);
-    
+    template<typename T> bool waitForAndDispatchImmediately(uint64_t destinationID, double timeout);
+
     PassOwnPtr<ArgumentEncoder> createSyncMessageArgumentEncoder(uint64_t destinationID, uint64_t& syncRequestID);
     bool sendMessage(MessageID, PassOwnPtr<ArgumentEncoder>);
     bool sendSyncReply(PassOwnPtr<ArgumentEncoder>);
@@ -323,6 +324,17 @@ template<typename T> bool Connection::sendSync(const T& message, const typename
     return replyDecoder->decode(const_cast<typename T::Reply&>(reply));
 }
 
+template<typename T> bool Connection::waitForAndDispatchImmediately(uint64_t destinationID, double timeout)
+{
+    OwnPtr<ArgumentDecoder> decoder = waitForMessage(MessageID(T::messageID), destinationID, timeout);
+    if (!decoder)
+        return false;
+
+    ASSERT(decoder->destinationID() == destinationID);
+    m_client->didReceiveMessage(this, MessageID(T::messageID), decoder.get());
+    return true;
+}
+
 // These three member functions are all deprecated.
 
 template<typename E, typename T, typename U>

-- 
WebKit Debian packaging