X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fmodules%2Findexeddb%2FIDBTransaction.cpp;h=e3e275ae74079bf2ecd0b2474b62d66e8608c12a;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=d2acb3cd55055059423ee661cfec811a92f10ff1;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.cpp b/src/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.cpp index d2acb3c..e3e275a 100644 --- a/src/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.cpp +++ b/src/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.cpp @@ -39,9 +39,11 @@ #include "modules/indexeddb/IDBPendingTransactionMonitor.h" #include "modules/indexeddb/IDBTracing.h" +using blink::WebIDBDatabase; + namespace WebCore { -PassRefPtr IDBTransaction::create(ExecutionContext* context, int64_t id, const Vector& objectStoreNames, IndexedDB::TransactionMode mode, IDBDatabase* db) +PassRefPtr IDBTransaction::create(ExecutionContext* context, int64_t id, const Vector& objectStoreNames, WebIDBDatabase::TransactionMode mode, IDBDatabase* db) { IDBOpenDBRequest* openDBRequest = 0; RefPtr transaction(adoptRef(new IDBTransaction(context, id, objectStoreNames, mode, db, openDBRequest, IDBDatabaseMetadata()))); @@ -51,7 +53,7 @@ PassRefPtr IDBTransaction::create(ExecutionContext* context, int PassRefPtr IDBTransaction::create(ExecutionContext* context, int64_t id, IDBDatabase* db, IDBOpenDBRequest* openDBRequest, const IDBDatabaseMetadata& previousMetadata) { - RefPtr transaction(adoptRef(new IDBTransaction(context, id, Vector(), IndexedDB::TransactionVersionChange, db, openDBRequest, previousMetadata))); + RefPtr transaction(adoptRef(new IDBTransaction(context, id, Vector(), WebIDBDatabase::TransactionVersionChange, db, openDBRequest, previousMetadata))); transaction->suspendIfNeeded(); return transaction.release(); } @@ -74,7 +76,7 @@ const AtomicString& IDBTransaction::modeVersionChange() return versionchange; } -IDBTransaction::IDBTransaction(ExecutionContext* context, int64_t id, const Vector& objectStoreNames, IndexedDB::TransactionMode mode, IDBDatabase* db, IDBOpenDBRequest* openDBRequest, const IDBDatabaseMetadata& previousMetadata) +IDBTransaction::IDBTransaction(ExecutionContext* context, int64_t id, const Vector& objectStoreNames, WebIDBDatabase::TransactionMode mode, IDBDatabase* db, IDBOpenDBRequest* openDBRequest, const IDBDatabaseMetadata& previousMetadata) : ActiveDOMObject(context) , m_id(id) , m_database(db) @@ -87,7 +89,7 @@ IDBTransaction::IDBTransaction(ExecutionContext* context, int64_t id, const Vect , m_previousMetadata(previousMetadata) { ScriptWrappable::init(this); - if (mode == IndexedDB::TransactionVersionChange) { + if (mode == WebIDBDatabase::TransactionVersionChange) { // Not active until the callback. m_state = Inactive; } @@ -294,30 +296,30 @@ bool IDBTransaction::hasPendingActivity() const return m_hasPendingActivity && !m_contextStopped; } -IndexedDB::TransactionMode IDBTransaction::stringToMode(const String& modeString, ExceptionState& exceptionState) +WebIDBDatabase::TransactionMode IDBTransaction::stringToMode(const String& modeString, ExceptionState& exceptionState) { if (modeString.isNull() || modeString == IDBTransaction::modeReadOnly()) - return IndexedDB::TransactionReadOnly; + return WebIDBDatabase::TransactionReadOnly; if (modeString == IDBTransaction::modeReadWrite()) - return IndexedDB::TransactionReadWrite; + return WebIDBDatabase::TransactionReadWrite; exceptionState.throwTypeError("The mode provided ('" + modeString + "') is not one of 'readonly' or 'readwrite'."); - return IndexedDB::TransactionReadOnly; + return WebIDBDatabase::TransactionReadOnly; } -const AtomicString& IDBTransaction::modeToString(IndexedDB::TransactionMode mode) +const AtomicString& IDBTransaction::modeToString(WebIDBDatabase::TransactionMode mode) { switch (mode) { - case IndexedDB::TransactionReadOnly: + case WebIDBDatabase::TransactionReadOnly: return IDBTransaction::modeReadOnly(); break; - case IndexedDB::TransactionReadWrite: + case WebIDBDatabase::TransactionReadWrite: return IDBTransaction::modeReadWrite(); break; - case IndexedDB::TransactionVersionChange: + case WebIDBDatabase::TransactionVersionChange: return IDBTransaction::modeVersionChange(); break; }