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

eric at webkit.org eric at webkit.org
Wed Dec 22 11:42:03 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 300e04bee635e8ee175f83ff079fdbe178c98d9f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 4 05:07:29 2010 +0000

    2010-08-03  Balazs Kelemen  <kb at inf.u-szeged.hu>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Close the WebProcess
    
            https://bugs.webkit.org/show_bug.cgi?id=41690
    
            * Platform/CoreIPC/qt/ConnectionQt.cpp:
            (CoreIPC::Connection::open): Registered connectionDidClose to be called when the client disconnected.
            * Platform/qt/RunLoopQt.cpp:
            (RunLoop::stop): Implemented by calling QCoreApplication::exit.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64628 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b5b42df..35eac71 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-03  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Close the WebProcess
+
+        https://bugs.webkit.org/show_bug.cgi?id=41690
+
+        * Platform/CoreIPC/qt/ConnectionQt.cpp:
+        (CoreIPC::Connection::open): Registered connectionDidClose to be called when the client disconnected.
+        * Platform/qt/RunLoopQt.cpp:
+        (RunLoop::stop): Implemented by calling QCoreApplication::exit.
+
 2010-08-03  Jon Honeycutt  <jhoneycutt at apple.com>
 
         WebKitTestRunner needs to activate the Mac font ascent hack
diff --git a/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp b/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp
index 69443e9..3e77e46 100644
--- a/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp
+++ b/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp
@@ -99,6 +99,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::connectionDidClose));
         m_isConnected = m_socket->waitForConnected();
     }
     return m_isConnected;
diff --git a/WebKit2/Platform/qt/RunLoopQt.cpp b/WebKit2/Platform/qt/RunLoopQt.cpp
index 69d4db2..495398d 100644
--- a/WebKit2/Platform/qt/RunLoopQt.cpp
+++ b/WebKit2/Platform/qt/RunLoopQt.cpp
@@ -66,7 +66,7 @@ void RunLoop::run()
 
 void RunLoop::stop()
 {
-    // implement
+    QCoreApplication::exit();
 }
 
 RunLoop::RunLoop()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list