Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/modules/webdatabase/Database.h b/src/third_party/WebKit/Source/modules/webdatabase/Database.h
index a9f7f03..7d4054e 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webdatabase/Database.h
+++ b/src/third_party/WebKit/Source/modules/webdatabase/Database.h
@@ -39,7 +39,6 @@ namespace blink {
 class ChangeVersionData;
 class DatabaseAuthorizer;
 class DatabaseContext;
-class DatabaseServer;
 class ExecutionContext;
 class SQLTransaction;
 class SQLTransactionBackend;
@@ -49,7 +48,7 @@ class SQLTransactionCoordinator;
 class SQLTransactionErrorCallback;
 class VoidCallback;
 
-class Database FINAL : public ThreadSafeRefCountedWillBeGarbageCollectedFinalized<Database>, public ScriptWrappable {
+class Database final : public GarbageCollectedFinalized<Database>, public ScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
 public:
     virtual ~Database();
@@ -58,7 +57,7 @@ public:
     bool openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
     void close();
 
-    PassRefPtrWillBeRawPtr<SQLTransactionBackend> runTransaction(PassRefPtrWillBeRawPtr<SQLTransaction>, bool readOnly, const ChangeVersionData*);
+    SQLTransactionBackend* runTransaction(SQLTransaction*, bool readOnly, const ChangeVersionData*);
     void scheduleTransactionStep(SQLTransactionBackend*);
     void inProgressTransactionCompleted();
 
@@ -153,7 +152,7 @@ private:
 
     RefPtr<SecurityOrigin> m_contextThreadSecurityOrigin;
     RefPtr<SecurityOrigin> m_databaseThreadSecurityOrigin;
-    RefPtrWillBeMember<DatabaseContext> m_databaseContext; // Associated with m_executionContext.
+    Member<DatabaseContext> m_databaseContext; // Associated with m_executionContext.
 
     String m_name;
     String m_expectedVersion;
@@ -167,9 +166,9 @@ private:
 
     SQLiteDatabase m_sqliteDatabase;
 
-    RefPtrWillBeMember<DatabaseAuthorizer> m_databaseAuthorizer;
+    Member<DatabaseAuthorizer> m_databaseAuthorizer;
 
-    Deque<RefPtrWillBeMember<SQLTransactionBackend> > m_transactionQueue;
+    HeapDeque<Member<SQLTransactionBackend> > m_transactionQueue;
     Mutex m_transactionInProgressMutex;
     bool m_transactionInProgress;
     bool m_isTransactionQueueEnabled;