Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228

2 files changed, 29 insertions, 6 deletions

diff --git a/JavaScriptCore/wtf/chromium/ChromiumThreading.h b/JavaScriptCore/wtf/chromium/ChromiumThreading.h
index b2c5075..3938621 100644
--- 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
index 394370f..9e6592b 100644
--- 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