| Index: Source/platform/TaskSynchronizer.h
|
| diff --git a/Source/platform/TaskSynchronizer.h b/Source/platform/TaskSynchronizer.h
|
| deleted file mode 100644
|
| index cc9efafd0f0eefc65fe3d6f71b745d4e5c1047c1..0000000000000000000000000000000000000000
|
| --- a/Source/platform/TaskSynchronizer.h
|
| +++ /dev/null
|
| @@ -1,184 +0,0 @@
|
| -/*
|
| - * 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
|
| - * notice, this list of conditions and the following disclaimer in the
|
| - * documentation and/or other materials provided with the distribution.
|
| - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
|
| - * its contributors may be used to endorse or promote products derived
|
| - * from this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
|
| - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
| - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
| - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
|
| - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
| - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
| - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
| - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| - * (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/DatabaseBasicTypes.h"
|
| -#include "modules/webdatabase/DatabaseError.h"
|
| -#include "modules/webdatabase/SQLTransactionBackend.h"
|
| -#include "platform/Task.h"
|
| -#include "wtf/OwnPtr.h"
|
| -#include "wtf/PassOwnPtr.h"
|
| -#include "wtf/PassRefPtr.h"
|
| -#include "wtf/RefPtr.h"
|
| -#include "wtf/Threading.h"
|
| -#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
|
| -};
|
| -
|
| -class DatabaseTask : public blink::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
|
| - bool hasSynchronizer() const { return m_synchronizer; }
|
| - bool hasCheckedForTermination() const { return m_synchronizer->hasCheckedForTermination(); }
|
| -#endif
|
| -
|
| -protected:
|
| - DatabaseTask(DatabaseBackend*, DatabaseTaskSynchronizer*);
|
| -
|
| -private:
|
| - virtual void doPerformTask() = 0;
|
| - virtual void taskCancelled() { }
|
| -
|
| - RefPtrWillBeCrossThreadPersistent<DatabaseBackend> m_database;
|
| - DatabaseTaskSynchronizer* m_synchronizer;
|
| -
|
| -#if !LOG_DISABLED
|
| - virtual const char* debugTaskName() const = 0;
|
| - bool m_complete;
|
| -#endif
|
| -};
|
| -
|
| -class DatabaseBackend::DatabaseOpenTask FINAL : public DatabaseTask {
|
| -public:
|
| - static PassOwnPtr<DatabaseOpenTask> create(DatabaseBackend* db, bool setVersionInNewDatabase, DatabaseTaskSynchronizer* 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);
|
| -
|
| - virtual void doPerformTask() OVERRIDE;
|
| -#if !LOG_DISABLED
|
| - virtual const char* debugTaskName() const OVERRIDE;
|
| -#endif
|
| -
|
| - bool m_setVersionInNewDatabase;
|
| - DatabaseError& m_error;
|
| - String& m_errorMessage;
|
| - bool& m_success;
|
| -};
|
| -
|
| -class DatabaseBackend::DatabaseCloseTask FINAL : public DatabaseTask {
|
| -public:
|
| - static PassOwnPtr<DatabaseCloseTask> create(DatabaseBackend* db, DatabaseTaskSynchronizer* synchronizer)
|
| - {
|
| - return adoptPtr(new DatabaseCloseTask(db, synchronizer));
|
| - }
|
| -
|
| -private:
|
| - DatabaseCloseTask(DatabaseBackend*, DatabaseTaskSynchronizer*);
|
| -
|
| - virtual void doPerformTask() OVERRIDE;
|
| -#if !LOG_DISABLED
|
| - virtual const char* debugTaskName() const OVERRIDE;
|
| -#endif
|
| -};
|
| -
|
| -class DatabaseBackend::DatabaseTransactionTask FINAL : public DatabaseTask {
|
| -public:
|
| - virtual ~DatabaseTransactionTask();
|
| -
|
| - // Transaction task is never synchronous, so no 'synchronizer' parameter.
|
| - static PassOwnPtr<DatabaseTransactionTask> create(PassRefPtrWillBeRawPtr<SQLTransactionBackend> transaction)
|
| - {
|
| - return adoptPtr(new DatabaseTransactionTask(transaction));
|
| - }
|
| -
|
| - SQLTransactionBackend* transaction() const { return m_transaction.get(); }
|
| -
|
| -private:
|
| - explicit DatabaseTransactionTask(PassRefPtrWillBeRawPtr<SQLTransactionBackend>);
|
| -
|
| - virtual void doPerformTask() OVERRIDE;
|
| - virtual void taskCancelled() OVERRIDE;
|
| -#if !LOG_DISABLED
|
| - virtual const char* debugTaskName() const OVERRIDE;
|
| -#endif
|
| -
|
| - RefPtrWillBeCrossThreadPersistent<SQLTransactionBackend> m_transaction;
|
| -};
|
| -
|
| -class DatabaseBackend::DatabaseTableNamesTask FINAL : public DatabaseTask {
|
| -public:
|
| - static PassOwnPtr<DatabaseTableNamesTask> create(DatabaseBackend* db, DatabaseTaskSynchronizer* synchronizer, Vector<String>& names)
|
| - {
|
| - return adoptPtr(new DatabaseTableNamesTask(db, synchronizer, names));
|
| - }
|
| -
|
| -private:
|
| - DatabaseTableNamesTask(DatabaseBackend*, DatabaseTaskSynchronizer*, Vector<String>& names);
|
| -
|
| - virtual void doPerformTask() OVERRIDE;
|
| -#if !LOG_DISABLED
|
| - virtual const char* debugTaskName() const OVERRIDE;
|
| -#endif
|
| -
|
| - Vector<String>& m_tableNames;
|
| -};
|
| -
|
| -} // namespace WebCore
|
| -
|
| -#endif // DatabaseTask_h
|
|
|