Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / webdatabase / DatabaseTask.h

diff --git a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseTask.h b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseTask.h
index cc9efaf..ea4ceb8 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseTask.h
+++ b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseTask.h
@@ -25,15 +25,17 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #ifndef DatabaseTask_h
 #define DatabaseTask_h
 
-#include "heap/Handle.h"
-#include "modules/webdatabase/DatabaseBackend.h"
+#include "modules/webdatabase/Database.h"
 #include "modules/webdatabase/DatabaseBasicTypes.h"
 #include "modules/webdatabase/DatabaseError.h"
 #include "modules/webdatabase/SQLTransactionBackend.h"
 #include "platform/Task.h"
+#include "platform/TaskSynchronizer.h"
+#include "platform/heap/Handle.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
@@ -42,57 +44,29 @@
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
-namespace WebCore {
-
-// Can be used to wait until DatabaseTask is completed.
-// Has to be passed into DatabaseTask::create to be associated with the task.
-class DatabaseTaskSynchronizer {
-    WTF_MAKE_NONCOPYABLE(DatabaseTaskSynchronizer);
-public:
-    DatabaseTaskSynchronizer();
-
-    // Called from main thread to wait until task is completed.
-    void waitForTaskCompletion();
-
-    // Called by the task.
-    void taskCompleted();
-
-#ifndef NDEBUG
-    bool hasCheckedForTermination() const { return m_hasCheckedForTermination; }
-    void setHasCheckedForTermination() { m_hasCheckedForTermination = true; }
-#endif
-
-private:
-    bool m_taskCompleted;
-    Mutex m_synchronousMutex;
-    ThreadCondition m_synchronousCondition;
-#ifndef NDEBUG
-    bool m_hasCheckedForTermination;
-#endif
-};
+namespace blink {
 
-class DatabaseTask : public blink::WebThread::Task {
+class DatabaseTask : public WebThread::Task {
     WTF_MAKE_NONCOPYABLE(DatabaseTask); WTF_MAKE_FAST_ALLOCATED;
 public:
     virtual ~DatabaseTask();
 
     virtual void run() OVERRIDE FINAL;
 
-    DatabaseBackend* database() const { return m_database.get(); }
-#ifndef NDEBUG
+    Database* database() const { return m_database.get(); }
+#if ENABLE(ASSERT)
     bool hasSynchronizer() const { return m_synchronizer; }
-    bool hasCheckedForTermination() const { return m_synchronizer->hasCheckedForTermination(); }
 #endif
 
 protected:
-    DatabaseTask(DatabaseBackend*, DatabaseTaskSynchronizer*);
+    DatabaseTask(Database*, TaskSynchronizer*);
 
 private:
     virtual void doPerformTask() = 0;
     virtual void taskCancelled() { }
 
-    RefPtrWillBeCrossThreadPersistent<DatabaseBackend> m_database;
-    DatabaseTaskSynchronizer* m_synchronizer;
+    RefPtrWillBeCrossThreadPersistent<Database> m_database;
+    TaskSynchronizer* m_synchronizer;
 
 #if !LOG_DISABLED
     virtual const char* debugTaskName() const = 0;
@@ -100,15 +74,15 @@ private:
 #endif
 };
 
-class DatabaseBackend::DatabaseOpenTask FINAL : public DatabaseTask {
+class Database::DatabaseOpenTask FINAL : public DatabaseTask {
 public:
-    static PassOwnPtr<DatabaseOpenTask> create(DatabaseBackend* db, bool setVersionInNewDatabase, DatabaseTaskSynchronizer* synchronizer, DatabaseError& error, String& errorMessage, bool& success)
+    static PassOwnPtr<DatabaseOpenTask> create(Database* db, bool setVersionInNewDatabase, TaskSynchronizer* synchronizer, DatabaseError& error, String& errorMessage, bool& success)
     {
         return adoptPtr(new DatabaseOpenTask(db, setVersionInNewDatabase, synchronizer, error, errorMessage, success));
     }
 
 private:
-    DatabaseOpenTask(DatabaseBackend*, bool setVersionInNewDatabase, DatabaseTaskSynchronizer*, DatabaseError&, String& errorMessage, bool& success);
+    DatabaseOpenTask(Database*, bool setVersionInNewDatabase, TaskSynchronizer*, DatabaseError&, String& errorMessage, bool& success);
 
     virtual void doPerformTask() OVERRIDE;
 #if !LOG_DISABLED
@@ -121,15 +95,15 @@ private:
     bool& m_success;
 };
 
-class DatabaseBackend::DatabaseCloseTask FINAL : public DatabaseTask {
+class Database::DatabaseCloseTask FINAL : public DatabaseTask {
 public:
-    static PassOwnPtr<DatabaseCloseTask> create(DatabaseBackend* db, DatabaseTaskSynchronizer* synchronizer)
+    static PassOwnPtr<DatabaseCloseTask> create(Database* db, TaskSynchronizer* synchronizer)
     {
         return adoptPtr(new DatabaseCloseTask(db, synchronizer));
     }
 
 private:
-    DatabaseCloseTask(DatabaseBackend*, DatabaseTaskSynchronizer*);
+    DatabaseCloseTask(Database*, TaskSynchronizer*);
 
     virtual void doPerformTask() OVERRIDE;
 #if !LOG_DISABLED
@@ -137,7 +111,7 @@ private:
 #endif
 };
 
-class DatabaseBackend::DatabaseTransactionTask FINAL : public DatabaseTask {
+class Database::DatabaseTransactionTask FINAL : public DatabaseTask {
 public:
     virtual ~DatabaseTransactionTask();
 
@@ -161,15 +135,15 @@ private:
     RefPtrWillBeCrossThreadPersistent<SQLTransactionBackend> m_transaction;
 };
 
-class DatabaseBackend::DatabaseTableNamesTask FINAL : public DatabaseTask {
+class Database::DatabaseTableNamesTask FINAL : public DatabaseTask {
 public:
-    static PassOwnPtr<DatabaseTableNamesTask> create(DatabaseBackend* db, DatabaseTaskSynchronizer* synchronizer, Vector<String>& names)
+    static PassOwnPtr<DatabaseTableNamesTask> create(Database* db, TaskSynchronizer* synchronizer, Vector<String>& names)
     {
         return adoptPtr(new DatabaseTableNamesTask(db, synchronizer, names));
     }
 
 private:
-    DatabaseTableNamesTask(DatabaseBackend*, DatabaseTaskSynchronizer*, Vector<String>& names);
+    DatabaseTableNamesTask(Database*, TaskSynchronizer*, Vector<String>& names);
 
     virtual void doPerformTask() OVERRIDE;
 #if !LOG_DISABLED
@@ -179,6 +153,6 @@ private:
     Vector<String>& m_tableNames;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // DatabaseTask_h