[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the webkit-1.2 branch:
commit 85cf7659eaecc6fde2a82732e23da1562f68eaf2
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 24 17:34:34 2009 +0000

    2009-12-24  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Unreviewed; revert of r52550.
    
            The change regressed the following LayoutTests for QtWebKit.
    
            fast/workers/worker-call.html -> crashed
            fast/workers/worker-close.html -> crashed
    
            * wtf/qt/ThreadingQt.cpp:
            (WTF::waitForThreadCompletion):
            (WTF::detachThread):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52551 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3c5e9b4..d5cff5f 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-24  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Unreviewed; revert of r52550.
+
+        The change regressed the following LayoutTests for QtWebKit.
+
+        fast/workers/worker-call.html -> crashed
+        fast/workers/worker-close.html -> crashed
+
+        * wtf/qt/ThreadingQt.cpp:
+        (WTF::waitForThreadCompletion):
+        (WTF::detachThread):
+
 2009-12-24  Shu Chang  <Chang.Shu at nokia.com>
 
         Reviewed by Laszlo Gombos.
diff --git a/JavaScriptCore/wtf/qt/ThreadingQt.cpp b/JavaScriptCore/wtf/qt/ThreadingQt.cpp
index 6e0e0de..9aee0ac 100644
--- a/JavaScriptCore/wtf/qt/ThreadingQt.cpp
+++ b/JavaScriptCore/wtf/qt/ThreadingQt.cpp
@@ -180,19 +180,11 @@ int waitForThreadCompletion(ThreadIdentifier threadID, void** result)
     if (result)
         *result = static_cast<ThreadPrivate*>(thread)->getReturnValue();
 
-    delete thread;
-
     return !res;
 }
 
-void detachThread(ThreadIdentifier threadID)
+void detachThread(ThreadIdentifier)
 {
-    ASSERT(threadID);
-
-    QThread* thread = threadForIdentifier(threadID);
-    if (thread)
-        thread->deleteLater();
-    clearThreadForIdentifier(threadID);
 }
 
 ThreadIdentifier currentThread()

-- 
WebKit Debian packaging