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

[dimich at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 8f9f528d5e014f78f9f93e79a35241966271fae2
Author: dimich at chromium.org <dimich at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 19 23:32:05 2009 +0000

    isMainThread() on Chromium (Mac and Linux) is so slow it timeouts LayoutTests..
    https://bugs.webkit.org/show_bug.cgi?id=31693
    
    Reviewed by David Levin.
    
    * wtf/ThreadingPthreads.cpp:
    (WTF::initializeThreading): grab and use the pthread_t of the main thread instead of ThreadIdentifier.
    (WTF::isMainThread): Ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51211 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 14a1290..a47ee45 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-19  Dmitry Titov  <dimich at chromium.org>
+
+        Reviewed by David Levin.
+
+        isMainThread() on Chromium (Mac and Linux) is so slow it timeouts LayoutTests..
+        https://bugs.webkit.org/show_bug.cgi?id=31693
+
+        * wtf/ThreadingPthreads.cpp:
+        (WTF::initializeThreading): grab and use the pthread_t of the main thread instead of ThreadIdentifier.
+        (WTF::isMainThread): Ditto.
+
 2009-11-19  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Darin Adler.
diff --git a/JavaScriptCore/wtf/ThreadingPthreads.cpp b/JavaScriptCore/wtf/ThreadingPthreads.cpp
index 6cad5e3..fe7b26a 100644
--- a/JavaScriptCore/wtf/ThreadingPthreads.cpp
+++ b/JavaScriptCore/wtf/ThreadingPthreads.cpp
@@ -56,7 +56,7 @@ typedef HashMap<ThreadIdentifier, pthread_t> ThreadMap;
 static Mutex* atomicallyInitializedStaticMutex;
 
 #if !PLATFORM(DARWIN) || PLATFORM(CHROMIUM)
-static ThreadIdentifier mainThreadIdentifier; // The thread that was the first to call initializeThreading(), which must be the main thread.
+static pthread_t mainThread; // The thread that was the first to call initializeThreading(), which must be the main thread.
 #endif
 
 static Mutex& threadMapMutex()
@@ -72,7 +72,7 @@ void initializeThreading()
         threadMapMutex();
         initializeRandomNumberGenerator();
 #if !PLATFORM(DARWIN) || PLATFORM(CHROMIUM)
-        mainThreadIdentifier = currentThread();
+        mainThread = pthread_self();
 #endif
         initializeMainThread();
     }
@@ -232,7 +232,7 @@ bool isMainThread()
 #if PLATFORM(DARWIN) && !PLATFORM(CHROMIUM)
     return pthread_main_np();
 #else
-    return currentThread() == mainThreadIdentifier;
+    return pthread_equal(pthread_self(), mainThread);
 #endif
 }
 

-- 
WebKit Debian packaging