Merge TaskSynchronizer into WaitableEvent.

third_party/WebKit/Source/modules/webdatabase/DatabaseTask.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 17 matching lines @@
 
 #include "modules/webdatabase/DatabaseTask.h"
 
 #include "modules/webdatabase/Database.h"
 #include "modules/webdatabase/DatabaseContext.h"
 #include "modules/webdatabase/DatabaseThread.h"
 #include "modules/webdatabase/StorageLog.h"
 
 namespace blink {
 
-DatabaseTask::DatabaseTask(Database* database, TaskSynchronizer* synchronizer)
+DatabaseTask::DatabaseTask(Database* database, WaitableEvent* completeEvent)
     : m_database(database)
-    , m_synchronizer(synchronizer)
+    , m_completeEvent(completeEvent)
 #if DCHECK_IS_ON()
     , m_complete(false)
 #endif
 {
 }
 
 DatabaseTask::~DatabaseTask()
 {
 #if DCHECK_IS_ON()
-    ASSERT(m_complete || !m_synchronizer);
+    DCHECK(m_complete || !m_completeEvent);
 #endif
 }
 
 void DatabaseTask::run()
 {
     // Database tasks are meant to be used only once, so make sure this one hasn't been performed before.
 #if DCHECK_IS_ON()
     ASSERT(!m_complete);
 #endif
 
-    if (!m_synchronizer && !m_database->getDatabaseContext()->databaseThread()->isDatabaseOpen(m_database.get())) {
+    if (!m_completeEvent && !m_database->getDatabaseContext()->databaseThread()->isDatabaseOpen(m_database.get())) {
         taskCancelled();
 #if DCHECK_IS_ON()
         m_complete = true;
 #endif
         return;
     }
 #if DCHECK_IS_ON()
     STORAGE_DVLOG(1) << "Performing " << debugTaskName() << " " << this;
 #endif
     m_database->resetAuthorizer();
     doPerformTask();
 
-    if (m_synchronizer)
-        m_synchronizer->taskCompleted();
+    if (m_completeEvent)
+        m_completeEvent->signal();
 
 #if DCHECK_IS_ON()
     m_complete = true;
 #endif
 }
 
 // *** DatabaseOpenTask ***
 // Opens the database file and verifies the version matches the expected version.
 
-Database::DatabaseOpenTask::DatabaseOpenTask(Database* database, bool setVersionInNewDatabase, TaskSynchronizer* synchronizer, DatabaseError& error, String& errorMessage, bool& success)
-    : DatabaseTask(database, synchronizer)
+Database::DatabaseOpenTask::DatabaseOpenTask(Database* database, bool setVersionInNewDatabase, WaitableEvent* completeEvent, DatabaseError& error, String& errorMessage, bool& success)
+    : DatabaseTask(database, completeEvent)
     , m_setVersionInNewDatabase(setVersionInNewDatabase)
     , m_error(error)
     , m_errorMessage(errorMessage)
     , m_success(success)
 {
-    ASSERT(synchronizer); // A task with output parameters is supposed to be synchronous.
+    DCHECK(completeEvent); // A task with output parameters is supposed to be synchronous.
 }
 
 void Database::DatabaseOpenTask::doPerformTask()
 {
     String errorMessage;
     m_success = database()->performOpenAndVerify(m_setVersionInNewDatabase, m_error, errorMessage);
     if (!m_success)
         m_errorMessage = errorMessage.isolatedCopy();
 }
 
 #if DCHECK_IS_ON()
 const char* Database::DatabaseOpenTask::debugTaskName() const
 {
     return "DatabaseOpenTask";
 }
 #endif
 
 // *** DatabaseCloseTask ***
 // Closes the database.
 
-Database::DatabaseCloseTask::DatabaseCloseTask(Database* database, TaskSynchronizer* synchronizer)
-    : DatabaseTask(database, synchronizer)
+Database::DatabaseCloseTask::DatabaseCloseTask(Database* database, WaitableEvent* completeEvent)
+    : DatabaseTask(database, completeEvent)
 {
 }
 
 void Database::DatabaseCloseTask::doPerformTask()
 {
     database()->close();
 }
 
 #if DCHECK_IS_ON()
 const char* Database::DatabaseCloseTask::debugTaskName() const
@@ skipping 36 matching lines @@
 #if DCHECK_IS_ON()
 const char* Database::DatabaseTransactionTask::debugTaskName() const
 {
     return "DatabaseTransactionTask";
 }
 #endif
 
 // *** DatabaseTableNamesTask ***
 // Retrieves a list of all tables in the database - for WebInspector support.
 
-Database::DatabaseTableNamesTask::DatabaseTableNamesTask(Database* database, TaskSynchronizer* synchronizer, Vector<String>& names)
-    : DatabaseTask(database, synchronizer)
+Database::DatabaseTableNamesTask::DatabaseTableNamesTask(Database* database, WaitableEvent* completeEvent, Vector<String>& names)
+    : DatabaseTask(database, completeEvent)
     , m_tableNames(names)
 {
-    ASSERT(synchronizer); // A task with output parameters is supposed to be synchronous.
+    DCHECK(completeEvent); // A task with output parameters is supposed to be synchronous.
 }
 
 void Database::DatabaseTableNamesTask::doPerformTask()
 {
     m_tableNames = database()->performGetTableNames();
 }
 
 #if DCHECK_IS_ON()
 const char* Database::DatabaseTableNamesTask::debugTaskName() const
 {
     return "DatabaseTableNamesTask";
 }
 #endif
 
 } // namespace blink