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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 23db083aa7572ba5c75876644ad45b28cccff67f
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 20 18:54:18 2010 +0000

    2010-12-20  Anders Carlsson  <andersca at apple.com>
    
            Unreviewed, rolling out r74345.
            http://trac.webkit.org/changeset/74345
            https://bugs.webkit.org/show_bug.cgi?id=51115
    
            Not the correct fix.
    
            * Platform/CoreIPC/Connection.h:
            * Platform/CoreIPC/qt/ConnectionQt.cpp:
            (CoreIPC::Connection::open):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74355 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 26b510c..7bd6ccc 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-20  Anders Carlsson  <andersca at apple.com>
+
+        Unreviewed, rolling out r74345.
+        http://trac.webkit.org/changeset/74345
+        https://bugs.webkit.org/show_bug.cgi?id=51115
+
+        Not the correct fix.
+
+        * Platform/CoreIPC/Connection.h:
+        * Platform/CoreIPC/qt/ConnectionQt.cpp:
+        (CoreIPC::Connection::open):
+
 2010-12-20  Balazs Kelemen  <kbalazs at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/Platform/CoreIPC/Connection.h b/WebKit2/Platform/CoreIPC/Connection.h
index d7accdc..4da2200 100644
--- a/WebKit2/Platform/CoreIPC/Connection.h
+++ b/WebKit2/Platform/CoreIPC/Connection.h
@@ -261,7 +261,6 @@ private:
 #elif PLATFORM(QT)
     // Called on the connection queue.
     void readyReadHandler();
-    void disconnectHandler();
 
     Vector<uint8_t> m_readBuffer;
     size_t m_currentMessageSize;
diff --git a/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp b/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp
index 89c1a17..e3d965c 100644
--- a/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp
+++ b/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp
@@ -82,13 +82,6 @@ void Connection::readyReadHandler()
     }
 }
 
-void Connection::disconnectHandler()
-{
-    // The connection might have been explicitly invalidated on the listener thread.
-    if (isValid())
-        connectionDidClose();
-}
-
 bool Connection::open()
 {
     ASSERT(!m_socket);
@@ -105,7 +98,7 @@ bool Connection::open()
         m_socket->connectToServer(m_serverName);
         m_connectionQueue.moveSocketToWorkThread(m_socket);
         m_connectionQueue.connectSignal(m_socket, SIGNAL(readyRead()), WorkItem::create(this, &Connection::readyReadHandler));
-        m_connectionQueue.connectSignal(m_socket, SIGNAL(disconnected()), WorkItem::create(this, &Connection::disconnectHandler));
+        m_connectionQueue.connectSignal(m_socket, SIGNAL(disconnected()), WorkItem::create(this, &Connection::connectionDidClose));
         m_isConnected = m_socket->waitForConnected();
     }
     return m_isConnected;

-- 
WebKit Debian packaging