Merge TaskSynchronizer into WaitableEvent.

third_party/WebKit/Source/modules/webdatabase/DatabaseThread.cpp

 /*
  * Copyright (C) 2007, 2008, 2013 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 16 matching lines @@
  */
 
 #include "modules/webdatabase/DatabaseThread.h"
 
 #include "modules/webdatabase/Database.h"
 #include "modules/webdatabase/DatabaseTask.h"
 #include "modules/webdatabase/SQLTransactionClient.h"
 #include "modules/webdatabase/SQLTransactionCoordinator.h"
 #include "modules/webdatabase/StorageLog.h"
 #include "platform/CrossThreadFunctional.h"
+#include "platform/WaitableEvent.h"
 #include "platform/WebThreadSupportingGC.h"
 #include "public/platform/Platform.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
 DatabaseThread::DatabaseThread()
     : m_transactionClient(wrapUnique(new SQLTransactionClient()))
     , m_cleanupSync(nullptr)
@@ skipping 23 matching lines @@
 
 void DatabaseThread::setupDatabaseThread()
 {
     m_thread->initialize();
     m_transactionCoordinator = new SQLTransactionCoordinator();
 }
 
 void DatabaseThread::terminate()
 {
     ASSERT(isMainThread());
-    TaskSynchronizer sync;
+    WaitableEvent sync;
     {
         MutexLocker lock(m_terminationRequestedMutex);
         ASSERT(!m_terminationRequested);
         m_terminationRequested = true;
         m_cleanupSync = &sync;
         STORAGE_DVLOG(1) << "DatabaseThread " << this << " was asked to terminate";
         m_thread->postTask(BLINK_FROM_HERE, crossThreadBind(&DatabaseThread::cleanupDatabaseThread, wrapCrossThreadPersistent(this)));
     }
-    sync.waitForTaskCompletion();
+    sync.wait();
     // The WebThread destructor blocks until all the tasks of the database
     // thread are processed. However, it shouldn't block at all because
     // the database thread has already finished processing the cleanup task.
     m_thread.reset();
 }
 
 void DatabaseThread::cleanupDatabaseThread()
 {
     DCHECK(isDatabaseThread());
 
@@ skipping 14 matching lines @@
     }
     m_openDatabaseSet.clear();
 
     m_thread->postTask(BLINK_FROM_HERE, WTF::bind(&DatabaseThread::cleanupDatabaseThreadCompleted, wrapCrossThreadPersistent(this)));
 }
 
 void DatabaseThread::cleanupDatabaseThreadCompleted()
 {
     m_thread->shutdown();
     if (m_cleanupSync) // Someone wanted to know when we were done cleaning up.
-        m_cleanupSync->taskCompleted();
+        m_cleanupSync->signal();
 }
 
 void DatabaseThread::recordDatabaseOpen(Database* database)
 {
     ASSERT(isDatabaseThread());
     ASSERT(database);
     ASSERT(!m_openDatabaseSet.contains(database));
     MutexLocker lock(m_terminationRequestedMutex);
     if (!m_terminationRequested)
         m_openDatabaseSet.add(database);
@@ skipping 34 matching lines @@
     {
         MutexLocker lock(m_terminationRequestedMutex);
         ASSERT(!m_terminationRequested);
     }
 #endif
     // WebThread takes ownership of the task.
     m_thread->postTask(BLINK_FROM_HERE, crossThreadBind(&DatabaseTask::run, std::move(task)));
 }
 
 } // namespace blink