Remove callOnMainThread

This API is redundant with exposing the main-thread task runner.

R=eseidel@chromium.org

Review URL: https://codereview.chromium.org/691493004

engine/platform/SharedBuffer.cpp

@@ -27,6 +27,8 @@
 #include "config.h"
 #include "platform/SharedBuffer.h"
 
+#include "base/bind.h"
+#include "public/platform/Platform.h"
 #include "wtf/unicode/Unicode.h"
 #include "wtf/unicode/UTF8.h"
 
@@ -34,7 +36,6 @@
 
 #ifdef SHARED_BUFFER_STATS
 #include "wtf/DataLog.h"
-#include "wtf/MainThread.h"
 #endif
 
 namespace blink {
@@ -106,7 +107,7 @@ static CString snippetForBuffer(SharedBuffer* sharedBuffer)
     return result;
 }
 
-static void printStats(void*)
+static void printStats()
 {
     MutexLocker locker(statsMutex());
     Vector<SharedBuffer*> buffers;
@@ -126,7 +127,7 @@ static void didCreateSharedBuffer(SharedBuffer* buffer)
     MutexLocker locker(statsMutex());
     liveBuffers().add(buffer);
 
-    callOnMainThread(printStats, 0);
+    Platform::current()->mainThreadTaskRunner()->PostTask(FROM_HERE, base::Bind(&printStats));
 }
 
 static void willDestroySharedBuffer(SharedBuffer* buffer)

engine/platform/testing/RunAllTests.cpp

@@ -53,7 +53,7 @@ int main(int argc, char** argv)
 {
     WTF::setRandomSource(AlwaysZeroNumberSource);
     WTF::initialize(CurrentTime, 0);
-    WTF::initializeMainThread(0);
+    WTF::initializeMainThread();
 
     blink::TestingPlatformSupport::Config platformConfig;
     blink::TestingPlatformSupport platform(platformConfig);

engine/public/platform/Platform.h

@@ -255,8 +255,6 @@ public:
     virtual void setSharedTimerFireInterval(double) { }
     virtual void stopSharedTimer() { }
 
-    // Callable from a background WebKit thread.
-    virtual void callOnMainThread(void (*func)(void*), void* context) { }
     virtual base::SingleThreadTaskRunner* mainThreadTaskRunner() { return 0; }
 
 

engine/testing/platform/platform_impl.cc

@@ -86,11 +86,6 @@ void PlatformImpl::stopSharedTimer() {
   shared_timer_.Stop();
 }
 
-void PlatformImpl::callOnMainThread(
-    void (*func)(void*), void* context) {
-  main_loop_->PostTask(FROM_HERE, base::Bind(func, context));
-}
-
 blink::WebUnitTestSupport* PlatformImpl::unitTestSupport() {
   return &unit_test_support_;
 }

engine/testing/platform/platform_impl.h

@@ -32,7 +32,6 @@ class PlatformImpl : public blink::Platform {
   virtual void setSharedTimerFiredFunction(void (*func)());
   virtual void setSharedTimerFireInterval(double interval_seconds);
   virtual void stopSharedTimer();
-  virtual void callOnMainThread(void (*func)(void*), void* context);
   virtual blink::WebData parseDataURL(
       const blink::WebURL& url, blink::WebString& mime_type,
       blink::WebString& charset);

engine/web/Sky.cpp

@@ -149,11 +149,6 @@ static void cryptographicallyRandomValues(unsigned char* buffer, size_t length)
     base::RandBytes(buffer, length);
 }
 
-static void callOnMainThreadFunction(WTF::MainThreadFunction function, void* context)
-{
-    Platform::current()->callOnMainThread(function, context);
-}
-
 void initializeWithoutV8(Platform* platform)
 {
     ASSERT(!s_webKitInitialized);
@@ -164,7 +159,7 @@ void initializeWithoutV8(Platform* platform)
 
     WTF::setRandomSource(cryptographicallyRandomValues);
     WTF::initialize(currentTimeFunction, monotonicallyIncreasingTimeFunction);
-    WTF::initializeMainThread(callOnMainThreadFunction);
+    WTF::initializeMainThread();
 
     DEFINE_STATIC_LOCAL(CoreInitializer, initializer, ());
     initializer.init();

engine/wtf/MainThread.cpp

@@ -38,26 +38,18 @@
 namespace WTF {
 
 static ThreadIdentifier mainThreadIdentifier;
-static void (*callOnMainThreadFunction)(MainThreadFunction, void*);
 
-void initializeMainThread(void (*function)(MainThreadFunction, void*))
+void initializeMainThread()
 {
     static bool initializedMainThread;
     if (initializedMainThread)
         return;
     initializedMainThread = true;
-    callOnMainThreadFunction = function;
 
     mainThreadIdentifier = currentThread();
-
     AtomicString::init();
 }
 
-void callOnMainThread(MainThreadFunction* function, void* context)
-{
-    (*callOnMainThreadFunction)(function, context);
-}
-
 bool isMainThread()
 {
     return currentThread() == mainThreadIdentifier;

engine/wtf/MainThread.h

@@ -39,15 +39,11 @@ namespace WTF {
 typedef uint32_t ThreadIdentifier;
 typedef void MainThreadFunction(void*);
 
-// Must be called from the main thread.
-WTF_EXPORT void initializeMainThread(void (*)(MainThreadFunction, void*));
-
-WTF_EXPORT void callOnMainThread(MainThreadFunction*, void* context);
+WTF_EXPORT void initializeMainThread();
 
 WTF_EXPORT bool isMainThread();
 
 } // namespace WTF
 
-using WTF::callOnMainThread;
 using WTF::isMainThread;
 #endif // MainThread_h

engine/wtf/testing/RunAllTests.cpp

@@ -50,6 +50,6 @@ int main(int argc, char** argv)
 {
     WTF::setRandomSource(AlwaysZeroNumberSource);
     WTF::initialize(CurrentTime, 0);
-    WTF::initializeMainThread(0);
+    WTF::initializeMainThread();
     return base::RunUnitTestsUsingBaseTestSuite(argc, argv);
 }

engine/wtf/text/StringImpl.cpp

@@ -184,7 +184,7 @@ bool operator<(const RefPtr<PerStringStats>& a, const RefPtr<PerStringStats>& b)
     return a->m_numberOfAtomicCopies < b->m_numberOfAtomicCopies;
 }
 
-static void printLiveStringStats(void*)
+static void printLiveStringStats()
 {
     MutexLocker locker(statsMutex());
     HashSet<void*>& strings = liveStrings();
@@ -255,7 +255,7 @@ void StringStats::printStats()
     double overheadPercent = (double)totalOverhead / (double)totalDataBytes * 100;
     dataLogF("         StringImpl overheader: %8u (%5.2f%%)\n", totalOverhead, overheadPercent);
 
-    callOnMainThread(printLiveStringStats, 0);
+    printLiveStringStats();
 }
 #endif
 

viewer/platform/platform_impl.cc

@@ -114,16 +114,10 @@ void PlatformImpl::stopSharedTimer() {
   shared_timer_.Stop();
 }
 
-void PlatformImpl::callOnMainThread(
-    void (*func)(void*), void* context) {
-  main_loop_->PostTask(FROM_HERE, base::Bind(func, context));
-}
-
 base::SingleThreadTaskRunner* PlatformImpl::mainThreadTaskRunner() {
   return main_thread_task_runner_.get();
 }
 
-
 bool PlatformImpl::isThreadedCompositingEnabled() {
   return true;
 }

viewer/platform/platform_impl.h

@@ -36,7 +36,6 @@ class PlatformImpl : public blink::Platform {
   virtual void setSharedTimerFiredFunction(void (*func)());
   virtual void setSharedTimerFireInterval(double interval_seconds);
   virtual void stopSharedTimer();
-  virtual void callOnMainThread(void (*func)(void*), void* context);
   virtual base::SingleThreadTaskRunner* mainThreadTaskRunner();
   virtual bool isThreadedCompositingEnabled();
   virtual blink::WebCompositorSupport* compositorSupport();