| Index: Source/modules/indexeddb/IDBTransaction.cpp
|
| diff --git a/Source/modules/indexeddb/IDBTransaction.cpp b/Source/modules/indexeddb/IDBTransaction.cpp
|
| index 3a2453fee13820d0cb838c76cf1d38a707ddf00b..654fb777a8218642db30d48d5645950c6ca8e09d 100644
|
| --- a/Source/modules/indexeddb/IDBTransaction.cpp
|
| +++ b/Source/modules/indexeddb/IDBTransaction.cpp
|
| @@ -31,6 +31,7 @@
|
| #include "core/dom/ExecutionContext.h"
|
| #include "core/events/EventQueue.h"
|
| #include "core/inspector/ScriptCallStack.h"
|
| +#include "modules/IndexedDBNames.h"
|
| #include "modules/indexeddb/IDBDatabase.h"
|
| #include "modules/indexeddb/IDBEventDispatcher.h"
|
| #include "modules/indexeddb/IDBIndex.h"
|
| @@ -58,24 +59,6 @@ IDBTransaction* IDBTransaction::create(ExecutionContext* context, int64_t id, ID
|
| return transaction;
|
| }
|
|
|
| -const AtomicString& IDBTransaction::modeReadOnly()
|
| -{
|
| - DEFINE_STATIC_LOCAL(AtomicString, readonly, ("readonly", AtomicString::ConstructFromLiteral));
|
| - return readonly;
|
| -}
|
| -
|
| -const AtomicString& IDBTransaction::modeReadWrite()
|
| -{
|
| - DEFINE_STATIC_LOCAL(AtomicString, readwrite, ("readwrite", AtomicString::ConstructFromLiteral));
|
| - return readwrite;
|
| -}
|
| -
|
| -const AtomicString& IDBTransaction::modeVersionChange()
|
| -{
|
| - DEFINE_STATIC_LOCAL(AtomicString, versionchange, ("versionchange", AtomicString::ConstructFromLiteral));
|
| - return versionchange;
|
| -}
|
| -
|
| IDBTransaction::IDBTransaction(ExecutionContext* context, int64_t id, const Vector<String>& objectStoreNames, blink::WebIDBTransactionMode mode, IDBDatabase* db, IDBOpenDBRequest* openDBRequest, const IDBDatabaseMetadata& previousMetadata)
|
| : ActiveDOMObject(context)
|
| , m_id(id)
|
| @@ -117,11 +100,6 @@ void IDBTransaction::trace(Visitor* visitor)
|
| EventTargetWithInlineData::trace(visitor);
|
| }
|
|
|
| -const String& IDBTransaction::mode() const
|
| -{
|
| - return modeToString(m_mode);
|
| -}
|
| -
|
| void IDBTransaction::setError(PassRefPtrWillBeRawPtr<DOMError> error)
|
| {
|
| ASSERT(m_state != Finished);
|
| @@ -301,33 +279,30 @@ bool IDBTransaction::hasPendingActivity() const
|
|
|
| blink::WebIDBTransactionMode IDBTransaction::stringToMode(const String& modeString, ExceptionState& exceptionState)
|
| {
|
| - if (modeString == IDBTransaction::modeReadOnly())
|
| + if (modeString == IndexedDBNames::readonly)
|
| return blink::WebIDBTransactionModeReadOnly;
|
| - if (modeString == IDBTransaction::modeReadWrite())
|
| + if (modeString == IndexedDBNames::readwrite)
|
| return blink::WebIDBTransactionModeReadWrite;
|
|
|
| exceptionState.throwTypeError("The mode provided ('" + modeString + "') is not one of 'readonly' or 'readwrite'.");
|
| return blink::WebIDBTransactionModeReadOnly;
|
| }
|
|
|
| -const AtomicString& IDBTransaction::modeToString(blink::WebIDBTransactionMode mode)
|
| +const String& IDBTransaction::mode() const
|
| {
|
| - switch (mode) {
|
| + switch (m_mode) {
|
| case blink::WebIDBTransactionModeReadOnly:
|
| - return IDBTransaction::modeReadOnly();
|
| - break;
|
| + return IndexedDBNames::readonly;
|
|
|
| case blink::WebIDBTransactionModeReadWrite:
|
| - return IDBTransaction::modeReadWrite();
|
| - break;
|
| + return IndexedDBNames::readwrite;
|
|
|
| case blink::WebIDBTransactionModeVersionChange:
|
| - return IDBTransaction::modeVersionChange();
|
| - break;
|
| + return IndexedDBNames::versionchange;
|
| }
|
|
|
| ASSERT_NOT_REACHED();
|
| - return IDBTransaction::modeReadOnly();
|
| + return IndexedDBNames::readonly;
|
| }
|
|
|
| const AtomicString& IDBTransaction::interfaceName() const
|
|
|