Changeset 41013 in webkit for trunk/JavaScriptCore/wtf/ThreadingQt.cpp

Timestamp:

Feb 13, 2009, 5:48:09 PM (16 years ago)

Author:

[email protected]

Message:

2009-02-13 Adam Treat <​[email protected]>

Reviewed by George Staikos.

​https://bugs.webkit.org/show_bug.cgi?id=23960
Crash Fix.

Don't depend on 'initializeThreading()' to come before a call to 'isMainThread()'
as QtWebKit only calls 'initializeThreading()' during QWebPage construction.

A client app may well make a call to QWebSettings::iconForUrl() for instance
before creating a QWebPage and that call to QWebSettings triggers an
ASSERT(isMainThread()) deep within WebCore.

• wtf/ThreadingQt.cpp: (WTF::isMainThread):

File:

• trunk/JavaScriptCore/wtf/ThreadingQt.cpp (modified) (1 diff)

trunk/JavaScriptCore/wtf/ThreadingQt.cpp

@@ -192 +192 @@
 bool isMainThread()
 {
-    return currentThread() == mainThreadIdentifier;
+    return QThread::currentThread() == QCoreApplication::instance()->thread();
 }