Merge TaskSynchronizer into WaitableEvent.

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

 /*
  * Copyright (C) 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 30 matching lines @@
 #include "modules/webdatabase/SQLError.h"
 #include "modules/webdatabase/SQLTransaction.h"
 #include "modules/webdatabase/SQLTransactionBackend.h"
 #include "modules/webdatabase/SQLTransactionCallback.h"
 #include "modules/webdatabase/SQLTransactionClient.h"
 #include "modules/webdatabase/SQLTransactionCoordinator.h"
 #include "modules/webdatabase/SQLTransactionErrorCallback.h"
 #include "modules/webdatabase/StorageLog.h"
 #include "modules/webdatabase/sqlite/SQLiteStatement.h"
 #include "modules/webdatabase/sqlite/SQLiteTransaction.h"
+#include "platform/WaitableEvent.h"
 #include "platform/heap/SafePoint.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebDatabaseObserver.h"
 #include "public/platform/WebSecurityOrigin.h"
 #include "wtf/Atomics.h"
 #include "wtf/CurrentTime.h"
 #include <memory>
 
 // Registering "opened" databases with the DatabaseTracker
 // =======================================================
@@ skipping 191 matching lines @@
 
 DEFINE_TRACE(Database)
 {
     visitor->trace(m_databaseContext);
     visitor->trace(m_sqliteDatabase);
     visitor->trace(m_databaseAuthorizer);
 }
 
 bool Database::openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage)
 {
-    TaskSynchronizer synchronizer;
+    WaitableEvent event;
     if (!getDatabaseContext()->databaseThreadAvailable())
         return false;
 
     DatabaseTracker::tracker().prepareToOpenDatabase(this);
     bool success = false;
-    std::unique_ptr<DatabaseOpenTask> task = DatabaseOpenTask::create(this, setVersionInNewDatabase, &synchronizer, error, errorMessage, success);
+    std::unique_ptr<DatabaseOpenTask> task = DatabaseOpenTask::create(this, setVersionInNewDatabase, &event, error, errorMessage, success);
     getDatabaseContext()->databaseThread()->scheduleTask(std::move(task));
-    synchronizer.waitForTaskCompletion();
+    event.wait();
 
     return success;
 }
 
 void Database::close()
 {
     ASSERT(getDatabaseContext()->databaseThread());
     ASSERT(getDatabaseContext()->databaseThread()->isDatabaseThread());
 
     {
@@ skipping 595 matching lines @@
 
     return tableNames;
 }
 
 Vector<String> Database::tableNames()
 {
     // FIXME: Not using isolatedCopy on these strings looks ok since threads
     // take strict turns in dealing with them. However, if the code changes,
     // this may not be true anymore.
     Vector<String> result;
-    TaskSynchronizer synchronizer;
+    WaitableEvent event;
     if (!getDatabaseContext()->databaseThreadAvailable())
         return result;
 
-    std::unique_ptr<DatabaseTableNamesTask> task = DatabaseTableNamesTask::create(this, &synchronizer, result);
+    std::unique_ptr<DatabaseTableNamesTask> task = DatabaseTableNamesTask::create(this, &event, result);
     getDatabaseContext()->databaseThread()->scheduleTask(std::move(task));
-    synchronizer.waitForTaskCompletion();
+    event.wait();
 
     return result;
 }
 
 SecurityOrigin* Database::getSecurityOrigin() const
 {
     if (getExecutionContext()->isContextThread())
         return m_contextThreadSecurityOrigin.get();
     if (getDatabaseContext()->databaseThread()->isDatabaseThread())
         return m_databaseThreadSecurityOrigin.get();
     return 0;
 }
 
 bool Database::opened()
 {
     return static_cast<bool>(acquireLoad(&m_opened));
 }
 
 } // namespace blink