Introduce WebTaskRunner Patch 3/5

Source/platform/heap/HeapTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 447 matching lines @@
 int IntWrapper::s_destructorCalls = 0;
 int OffHeapInt::s_destructorCalls = 0;
 
 class ThreadedTesterBase {
 protected:
     static void test(ThreadedTesterBase* tester)
     {
         Vector<OwnPtr<WebThread>, numberOfThreads> m_threads;
         for (int i = 0; i < numberOfThreads; i++) {
             m_threads.append(adoptPtr(Platform::current()->createThread("blink gc testing thread")));
-            m_threads.last()->postTask(FROM_HERE, new Task(threadSafeBind(threadFunc, AllowCrossThreadAccess(tester))));
+            m_threads.last()->taskRunner()->postTask(FROM_HERE, new Task(threadSafeBind(threadFunc, AllowCrossThreadAccess(tester))));
         }
         while (tester->m_threadsToFinish) {
             SafePointScope scope(ThreadState::NoHeapPointersOnStack);
             Platform::current()->yieldCurrentThread();
         }
         delete tester;
     }
 
     virtual void runThread() = 0;
 
@@ skipping 4152 matching lines @@
     }
     preciselyCollectGarbage();
     EXPECT_EQ(3, IntWrapper::s_destructorCalls);
 }
 
 class GCParkingThreadTester {
 public:
     static void test()
     {
         OwnPtr<WebThread> sleepingThread = adoptPtr(Platform::current()->createThread("SleepingThread"));
-        sleepingThread->postTask(FROM_HERE, new Task(threadSafeBind(sleeperMainFunc)));
+        sleepingThread->taskRunner()->postTask(FROM_HERE, new Task(threadSafeBind(sleeperMainFunc)));
 
         // Wait for the sleeper to run.
         while (!s_sleeperRunning) {
             Platform::current()->yieldCurrentThread();
         }
 
         {
             // Expect the first attempt to park the sleeping thread to fail
             TestGCScope scope(ThreadState::NoHeapPointersOnStack);
             EXPECT_FALSE(scope.allThreadsParked());
@@ skipping 649 matching lines @@
 }
 
 class DeadBitTester {
 public:
     static void test()
     {
         IntWrapper::s_destructorCalls = 0;
 
         MutexLocker locker(mainThreadMutex());
         OwnPtr<WebThread> workerThread = adoptPtr(Platform::current()->createThread("Test Worker Thread"));
-        workerThread->postTask(FROM_HERE, new Task(threadSafeBind(workerThreadMain)));
+        workerThread->taskRunner()->postTask(FROM_HERE, new Task(threadSafeBind(workerThreadMain)));
 
         // Wait for the worker thread to have done its initialization,
         // IE. the worker allocates an object and then throw aways any
         // pointers to it.
         parkMainThread();
 
         // Now do a GC. This will not find the worker threads object since it
         // is not referred from any of the threads. Even a conservative
         // GC will not find it.
         // Also at this point the worker is waiting for the main thread
@@ skipping 82 matching lines @@
 }
 
 class ThreadedStrongificationTester {
 public:
     static void test()
     {
         IntWrapper::s_destructorCalls = 0;
 
         MutexLocker locker(mainThreadMutex());
         OwnPtr<WebThread> workerThread = adoptPtr(Platform::current()->createThread("Test Worker Thread"));
-        workerThread->postTask(FROM_HERE, new Task(threadSafeBind(workerThreadMain)));
+        workerThread->taskRunner()->postTask(FROM_HERE, new Task(threadSafeBind(workerThreadMain)));
 
         // Wait for the worker thread initialization. The worker
         // allocates a weak collection where both collection and
         // contents are kept alive via persistent pointers.
         parkMainThread();
 
         // Perform two garbage collections where the worker thread does
         // not wake up in between. This will cause us to remove marks
         // and mark unmarked objects dead. The collection on the worker
         // heap is found through the persistent and the backing should
@@ skipping 182 matching lines @@
 int DestructorLockingObject::s_destructorCalls = 0;
 
 class RecursiveLockingTester {
 public:
     static void test()
     {
         DestructorLockingObject::s_destructorCalls = 0;
 
         MutexLocker locker(mainThreadMutex());
         OwnPtr<WebThread> workerThread = adoptPtr(Platform::current()->createThread("Test Worker Thread"));
-        workerThread->postTask(FROM_HERE, new Task(threadSafeBind(workerThreadMain)));
+        workerThread->taskRunner()->postTask(FROM_HERE, new Task(threadSafeBind(workerThreadMain)));
 
         // Park the main thread until the worker thread has initialized.
         parkMainThread();
 
         {
             SafePointAwareMutexLocker recursiveLocker(recursiveMutex());
 
             // Let the worker try to acquire the above mutex. It won't get it
             // until the main thread has done its GC.
             wakeWorkerThread();
@@ skipping 53 matching lines @@
 {
     RecursiveLockingTester::test();
 }
 
 class CrossThreadPersistentOnMainThreadTester {
 public:
     static void test()
     {
         MutexLocker locker(mainThreadMutex());
         OwnPtr<WebThread> workerThread = adoptPtr(Platform::current()->createThread("Test Worker Thread"));
-        workerThread->postTask(FROM_HERE, new Task(threadSafeBind(workerThreadMain)));
+        workerThread->taskRunner()->postTask(FROM_HERE, new Task(threadSafeBind(workerThreadMain)));
 
         parkMainThread();
 
         // (Temporarily) detach main thread and wake the worker thread, so that it
         // can do its detach().
         ThreadState::detachMainThread();
         wakeWorkerThread();
 
         parkMainThread();
         ThreadState::attachMainThread();
@@ skipping 697 matching lines @@
     // Create an object in the worker thread, have a CrossThreadWeakPersistent pointing to it on the main thread,
     // clear the reference in the worker thread, run a GC in the worker thread, and see if the
     // CrossThreadWeakPersistent is cleared.
 
     DestructorLockingObject::s_destructorCalls = 0;
 
     // Step 1: Initiate a worker thread, and wait for |object| to get allocated on the worker thread.
     MutexLocker mainThreadMutexLocker(mainThreadMutex());
     OwnPtr<WebThread> workerThread = adoptPtr(Platform::current()->createThread("Test Worker Thread"));
     DestructorLockingObject* object = nullptr;
-    workerThread->postTask(FROM_HERE, new Task(threadSafeBind(workerThreadMainForCrossThreadWeakPersistentTest, AllowCrossThreadAccessWrapper<DestructorLockingObject**>(&object))));
+    workerThread->taskRunner()->postTask(FROM_HERE, new Task(threadSafeBind(workerThreadMainForCrossThreadWeakPersistentTest, AllowCrossThreadAccessWrapper<DestructorLockingObject**>(&object))));
     parkMainThread();
 
     // Step 3: Set up a CrossThreadWeakPersistent.
     ASSERT_TRUE(object);
     CrossThreadWeakPersistent<DestructorLockingObject> crossThreadWeakPersistent(object);
     object = nullptr;
     {
         SafePointAwareMutexLocker recursiveMutexLocker(recursiveMutex());
         EXPECT_EQ(0, DestructorLockingObject::s_destructorCalls);
     }
@@ skipping 10 matching lines @@
     {
         SafePointAwareMutexLocker recursiveMutexLocker(recursiveMutex());
         EXPECT_EQ(1, DestructorLockingObject::s_destructorCalls);
     }
 
     wakeWorkerThread();
     parkMainThread();
 }
 
 } // namespace blink