Changeset 58179 in webkit for trunk/JavaScriptCore/wtf/qt/ThreadingQt.cpp

Timestamp:

Apr 23, 2010, 11:59:56 AM (15 years ago)

Author:

[email protected]

Message:

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=38022
Move isMainThread predicate function to MainThread.h

Reviewed by Anders Carlsson.

JavaScriptCore:

• wtf/MainThread.cpp:

(WTF::initializeMainThread):
(WTF::isMainThread):

• wtf/MainThread.h:
• wtf/Threading.h:
• wtf/ThreadingPthreads.cpp:

(WTF::initializeThreading):

• wtf/ThreadingWin.cpp:

(WTF::initializeThreading):

• wtf/gtk/ThreadingGtk.cpp:

(WTF::initializeThreading):

• wtf/mac/MainThreadMac.mm:

(WTF::initializeMainThreadPlatform):
(WTF::isMainThread):

• wtf/qt/MainThreadQt.cpp:

(WTF::isMainThread):

• wtf/qt/ThreadingQt.cpp:

(WTF::initializeThreading):

• wtf/text/AtomicString.cpp:

JavaScriptGlue:

Added forwarding header for MainThread.h

• ForwardingHeaders/wtf/MainThread.h: Added.

WebKitTools:

Added forwarding header for MainThread.h

• DumpRenderTree/ForwardingHeaders/wtf/MainThread.h: Added.

File:

• trunk/JavaScriptCore/wtf/qt/ThreadingQt.cpp (modified) (3 diffs)

trunk/JavaScriptCore/wtf/qt/ThreadingQt.cpp

@@ -85 +85 @@
 static Mutex* atomicallyInitializedStaticMutex;
 
-static ThreadIdentifier mainThreadIdentifier;
-
 static Mutex& threadMapMutex()
 {
@@ -147 +145 @@
         threadMapMutex();
         initializeRandomNumberGenerator();
-        QThread* mainThread = QCoreApplication::instance()->thread();
-        mainThreadIdentifier = identifierByQthreadHandle(mainThread);
-        if (!mainThreadIdentifier)
-            mainThreadIdentifier = establishIdentifierForThread(mainThread);
         initializeMainThread();
     }
@@ -216 +210 @@
 }
 
-bool isMainThread()
-{
-    return QThread::currentThread() == QCoreApplication::instance()->thread();
-}
-
 Mutex::Mutex()
     : m_mutex(new QMutex())