| Index: Source/modules/indexeddb/IDBTransaction.h
|
| diff --git a/Source/modules/indexeddb/IDBTransaction.h b/Source/modules/indexeddb/IDBTransaction.h
|
| index 07881f93006597d0bbabdbd7d5a15079d9e170ab..5fdc3e8149317c68be13153aac55eaf34f957d19 100644
|
| --- a/Source/modules/indexeddb/IDBTransaction.h
|
| +++ b/Source/modules/indexeddb/IDBTransaction.h
|
| @@ -55,7 +55,7 @@ class IDBTransaction FINAL
|
| DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<IDBTransaction>);
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(IDBTransaction);
|
| public:
|
| - static IDBTransaction* create(ExecutionContext*, int64_t, const Vector<String>& objectStoreNames, blink::WebIDBTransactionMode, IDBDatabase*);
|
| + static IDBTransaction* create(ExecutionContext*, int64_t, const Vector<String>& objectStoreNames, WebIDBTransactionMode, IDBDatabase*);
|
| static IDBTransaction* create(ExecutionContext*, int64_t, IDBDatabase*, IDBOpenDBRequest*, const IDBDatabaseMetadata& previousMetadata);
|
| virtual ~IDBTransaction();
|
| virtual void trace(Visitor*) OVERRIDE;
|
| @@ -64,18 +64,18 @@ public:
|
| static const AtomicString& modeReadWrite();
|
| static const AtomicString& modeVersionChange();
|
|
|
| - static blink::WebIDBTransactionMode stringToMode(const String&, ExceptionState&);
|
| - static const AtomicString& modeToString(blink::WebIDBTransactionMode);
|
| + static WebIDBTransactionMode stringToMode(const String&, ExceptionState&);
|
| + static const AtomicString& modeToString(WebIDBTransactionMode);
|
|
|
| // When the connection is closed backend will be 0.
|
| - blink::WebIDBDatabase* backendDB() const;
|
| + WebIDBDatabase* backendDB() const;
|
|
|
| int64_t id() const { return m_id; }
|
| bool isActive() const { return m_state == Active; }
|
| bool isFinished() const { return m_state == Finished; }
|
| bool isFinishing() const { return m_state == Finishing; }
|
| - bool isReadOnly() const { return m_mode == blink::WebIDBTransactionModeReadOnly; }
|
| - bool isVersionChange() const { return m_mode == blink::WebIDBTransactionModeVersionChange; }
|
| + bool isReadOnly() const { return m_mode == WebIDBTransactionModeReadOnly; }
|
| + bool isVersionChange() const { return m_mode == WebIDBTransactionModeVersionChange; }
|
|
|
| // Implement the IDBTransaction IDL
|
| const String& mode() const;
|
| @@ -110,7 +110,7 @@ public:
|
| virtual void stop() OVERRIDE;
|
|
|
| private:
|
| - IDBTransaction(ExecutionContext*, int64_t, const Vector<String>&, blink::WebIDBTransactionMode, IDBDatabase*, IDBOpenDBRequest*, const IDBDatabaseMetadata&);
|
| + IDBTransaction(ExecutionContext*, int64_t, const Vector<String>&, WebIDBTransactionMode, IDBDatabase*, IDBOpenDBRequest*, const IDBDatabaseMetadata&);
|
|
|
| void enqueueEvent(PassRefPtrWillBeRawPtr<Event>);
|
|
|
| @@ -125,7 +125,7 @@ private:
|
| Member<IDBDatabase> m_database;
|
| const Vector<String> m_objectStoreNames;
|
| Member<IDBOpenDBRequest> m_openDBRequest;
|
| - const blink::WebIDBTransactionMode m_mode;
|
| + const WebIDBTransactionMode m_mode;
|
| State m_state;
|
| bool m_hasPendingActivity;
|
| bool m_contextStopped;
|
|
|