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

[abecsi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit bb84557c38cd9001227bbe2973c11a8e558912b4
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 14:51:04 2010 +0000

    2010-09-28  Andras Becsi  <abecsi at webkit.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] ProcessLauncherHelper should not leave stray socket files in /tmp.
            https://bugs.webkit.org/show_bug.cgi?id=46722
    
            * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
            (WebKit::ProcessLauncherHelper::~ProcessLauncherHelper): close the socket.
            (WebKit::ProcessLauncherHelper::ProcessLauncherHelper): delete the helper on exit.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68515 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8b677f5..3ae34ef 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-28  Andras Becsi  <abecsi at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] ProcessLauncherHelper should not leave stray socket files in /tmp.
+        https://bugs.webkit.org/show_bug.cgi?id=46722
+
+        * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+        (WebKit::ProcessLauncherHelper::~ProcessLauncherHelper): close the socket.
+        (WebKit::ProcessLauncherHelper::ProcessLauncherHelper): delete the helper on exit.
+
 2010-09-28  Benjamin Poulain  <benjamin.poulain at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp b/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
index 6b2ee71..647c581 100644
--- a/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
+++ b/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
@@ -54,6 +54,7 @@ namespace WebKit {
 class ProcessLauncherHelper : public QObject {
     Q_OBJECT
 public:
+    ~ProcessLauncherHelper();
     void launch(WebKit::ProcessLauncher*);
     QLocalSocket* takePendingConnection();
     static ProcessLauncherHelper* instance();
@@ -98,6 +99,11 @@ QLocalSocket* ProcessLauncherHelper::takePendingConnection()
     return m_server.nextPendingConnection();
 }
 
+ProcessLauncherHelper::~ProcessLauncherHelper()
+{
+    m_server.close();
+}
+
 ProcessLauncherHelper::ProcessLauncherHelper()
 {
     srandom(time(0));
@@ -106,6 +112,7 @@ ProcessLauncherHelper::ProcessLauncherHelper()
         ASSERT_NOT_REACHED();
     }
     connect(&m_server, SIGNAL(newConnection()), this, SLOT(newConnection()));
+    connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), SLOT(deleteLater()), Qt::QueuedConnection);
 }
 
 ProcessLauncherHelper* ProcessLauncherHelper::instance()

-- 
WebKit Debian packaging