[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

andersca at apple.com andersca at apple.com
Wed Dec 22 11:40:40 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit f5401ebe1e758a3d99df3bdb30bf6a38e3bdb7d2
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 17:39:50 2010 +0000

    Frequent ASSERT_NOT_REACHED in Connection::processIncomingMessage when running regression tests
    https://bugs.webkit.org/show_bug.cgi?id=42926
    <rdar://problem/8237329>
    
    Reviewed by Adam Roben.
    
    Remove this assert, it's bogus. It would fire when a reply came in on the connection queue before
    waitForReply was called on the client thread, but that case is already covered.
    
    * Platform/CoreIPC/Connection.cpp:
    (CoreIPC::Connection::processIncomingMessage):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64564 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index fca10eb..2f3da91 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-03  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Frequent ASSERT_NOT_REACHED in Connection::processIncomingMessage when running regression tests
+        https://bugs.webkit.org/show_bug.cgi?id=42926
+        <rdar://problem/8237329>
+
+        Remove this assert, it's bogus. It would fire when a reply came in on the connection queue before 
+        waitForReply was called on the client thread, but that case is already covered.
+
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::processIncomingMessage):
+
 2010-08-03  Adam Roben  <aroben at apple.com>
 
         Compile out two Mac-only localized strings on non-Mac platforms
diff --git a/WebKit2/Platform/CoreIPC/Connection.cpp b/WebKit2/Platform/CoreIPC/Connection.cpp
index e1d009e..adcfa16 100644
--- a/WebKit2/Platform/CoreIPC/Connection.cpp
+++ b/WebKit2/Platform/CoreIPC/Connection.cpp
@@ -175,11 +175,6 @@ void Connection::processIncomingMessage(MessageID messageID, PassOwnPtr<Argument
         }
     }
 
-    if (messageID == MessageID(CoreIPCMessage::SyncMessageReply)) {
-        // FIXME: We got a reply for another sync message someone sent, handle this.
-        ASSERT_NOT_REACHED();
-    }
-
     MutexLocker locker(m_incomingMessagesLock);
     m_incomingMessages.append(IncomingMessage(messageID, arguments));
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list