Changeset 74355 in webkit

Timestamp:

Dec 20, 2010 10:54:18 AM (13 years ago)

Author:

andersca@apple.com

Message:

2010-12-20 Anders Carlsson <​andersca@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):

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/Connection.h (modified) (1 diff)
• Platform/CoreIPC/qt/ConnectionQt.cpp (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-20  Anders Carlsson  <andersca@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@webkit.org>
 

trunk/WebKit2/Platform/CoreIPC/Connection.h

@@ -262 +262 @@
     // Called on the connection queue.
     void readyReadHandler();
-    void disconnectHandler();
 
     Vector<uint8_t> m_readBuffer;

trunk/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp

@@ -83 +83 @@
 }
 
-void Connection::disconnectHandler()
-{
-    // The connection might have been explicitly invalidated on the listener thread.
-    if (isValid())
-        connectionDidClose();
-}
-
 bool Connection::open()
 {
@@ -106 +99 @@
         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();
     }