2010-04-28 Darin Fisher <darin@chromium.org>

Darin Fisher · Darin Fisher · commit bd55760ff94f · 2010-04-28T20:35:17.000Z
Reviewed by David Levin. [Chromium] callOnMainThread should equate to MessageLoop::PostTask https://bugs.webkit.org/show_bug.cgi?id=38276 * JavaScriptCore.gyp/JavaScriptCore.gyp: * wtf/MainThread.cpp: * wtf/chromium/ChromiumThreading.h: * wtf/chromium/MainThreadChromium.cpp: (WTF::initializeMainThread): (WTF::callOnMainThread): (WTF::callOnMainThreadAndWait): (WTF::setMainThreadCallbacksPaused): (WTF::isMainThread): Canonical link: https://commits.webkit.org/49694@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@58425 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-04-28  Darin Fisher  <darin@chromium.org>
+
+        Reviewed by David Levin.
+
+        [Chromium] callOnMainThread should equate to MessageLoop::PostTask
+        https://bugs.webkit.org/show_bug.cgi?id=38276
+
+        * JavaScriptCore.gyp/JavaScriptCore.gyp:
+        * wtf/MainThread.cpp:
+        * wtf/chromium/ChromiumThreading.h:
+        * wtf/chromium/MainThreadChromium.cpp:
+        (WTF::initializeMainThread):
+        (WTF::callOnMainThread):
+        (WTF::callOnMainThreadAndWait):
+        (WTF::setMainThreadCallbacksPaused):
+        (WTF::isMainThread):
+
 2010-04-28  Simon Hausmann  <simon.hausmann@nokia.com>, Kent Hansen <kent.hansen@nokia.com>
 
         Reviewed by Darin Adler.
diff --git a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
@@ -117,6 +117,7 @@
         ['exclude', '/(gtk|glib|gobject)/.*\\.(cpp|h)$'],
         ['exclude', '(Default|Gtk|Mac|None|Qt|Win|Wx)\\.(cpp|mm)$'],
         ['exclude', 'wtf/CurrentTime\\.cpp$'],
+        ['exclude', 'wtf/MainThread.cpp$'],
         ['exclude', 'wtf/TC.*\\.(cpp|h)$'],
       ],
       'direct_dependent_settings': {
diff --git a/JavaScriptCore/wtf/MainThread.cpp b/JavaScriptCore/wtf/MainThread.cpp
@@ -34,6 +34,10 @@
 #include "StdLibExtras.h"
 #include "Threading.h"
 
+#if PLATFORM(CHROMIUM)
+#error Chromium uses a different main thread implementation
+#endif
+
 namespace WTF {
 
 struct FunctionWithContext {
diff --git a/JavaScriptCore/wtf/chromium/ChromiumThreading.h b/JavaScriptCore/wtf/chromium/ChromiumThreading.h
@@ -36,8 +36,7 @@ namespace WTF {
 // An interface to the embedding layer, which provides threading support.
 class ChromiumThreading {
 public:
-    static void initializeMainThread();
-    static void scheduleDispatchFunctionsOnMainThread();
+    static void callOnMainThread(void (*func)(void*), void* context);
 };
 
 } // namespace WTF
diff --git a/JavaScriptCore/wtf/chromium/MainThreadChromium.cpp b/JavaScriptCore/wtf/chromium/MainThreadChromium.cpp
@@ -31,18 +31,42 @@
 #include "config.h"
 #include "MainThread.h"
 
+#include "Assertions.h"
 #include "ChromiumThreading.h"
+#include "Threading.h"
 
 namespace WTF {
 
-void initializeMainThreadPlatform()
+static ThreadIdentifier mainThreadIdentifier;
+
+void initializeMainThread()
+{
+    static bool initializedMainThread;
+    if (initializedMainThread)
+        return;
+    initializedMainThread = true;
+
+    mainThreadIdentifier = currentThread();
+}
+
+void callOnMainThread(MainThreadFunction* function, void* context)
+{
+    ChromiumThreading::callOnMainThread(function, context);
+}
+
+void callOnMainThreadAndWait(MainThreadFunction*, void*)
+{
+    ASSERT_NOT_REACHED();
+}
+
+void setMainThreadCallbacksPaused(bool)
 {
-    ChromiumThreading::initializeMainThread();
+    ASSERT_NOT_REACHED();
 }
 
-void scheduleDispatchFunctionsOnMainThread()
+bool isMainThread()
 {
-    ChromiumThreading::scheduleDispatchFunctionsOnMainThread();
+    return currentThread() == mainThreadIdentifier;
 }
 
 } // namespace WTF
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-04-28  Darin Fisher  <darin@chromium.org>
+
+        Reviewed by David Levin.
+
+        [Chromium] callOnMainThread should equate to MessageLoop::PostTask
+        https://bugs.webkit.org/show_bug.cgi?id=38276
+
+        * public/WebKitClient.h:
+        (WebKit::WebKitClient::callOnMainThread):
+        * src/ChromiumThreading.cpp:
+        (WTF::ChromiumThreading::callOnMainThread):
+
 2010-04-27  John Abd-El-Malek  <jam@chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h
@@ -263,7 +263,8 @@ class WebKitClient {
     virtual void stopSharedTimer() { }
 
     // Callable from a background WebKit thread.
-    virtual void callOnMainThread(void (*func)()) { }
+    virtual void callOnMainThread(void (*func)()) { } // DEPRECATED
+    virtual void callOnMainThread(void (*func)(void*), void* context) { }
 
     // WebGL --------------------------------------------------------------
 
diff --git a/WebKit/chromium/src/ChromiumThreading.cpp b/WebKit/chromium/src/ChromiumThreading.cpp
@@ -38,13 +38,9 @@
 
 namespace WTF {
 
-void ChromiumThreading::initializeMainThread()
+void ChromiumThreading::callOnMainThread(void (*func)(void*), void* context)
 {
-}
-
-void ChromiumThreading::scheduleDispatchFunctionsOnMainThread()
-{
-    WebKit::webKitClient()->callOnMainThread(&WTF::dispatchFunctionsFromMainThread);
+    WebKit::webKitClient()->callOnMainThread(func, context);
 }
 
 }  // namespace WTF

Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,9 @@`
`38`	`38`
`39`	`39`	`namespace WTF {`
`40`	`40`
`41`		`-void ChromiumThreading::initializeMainThread()`
	`41`	`+void ChromiumThreading::callOnMainThread(void (func)(void), void* context)`
`42`	`42`	`{`
`43`		`-}`
`44`		`-`
`45`		`-void ChromiumThreading::scheduleDispatchFunctionsOnMainThread()`
`46`		`-{`
`47`		`- WebKit::webKitClient()->callOnMainThread(&WTF::dispatchFunctionsFromMainThread);`
	`43`	`+ WebKit::webKitClient()->callOnMainThread(func, context);`
`48`	`44`	`}`
`49`	`45`
`50`	`46`	`} // namespace WTF`