| Index: third_party/WebKit/Source/modules/indexeddb/IDBTransaction.h
|
| diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.h b/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.h
|
| index 2f507ba53cfe06998325f8ed455f4564371c75ed..b93a693a779edb7455a43a3afbf6f34d3246233f 100644
|
| --- a/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.h
|
| +++ b/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.h
|
| @@ -26,6 +26,7 @@
|
| #ifndef IDBTransaction_h
|
| #define IDBTransaction_h
|
|
|
| +#include "Source/modules/indexeddb/indexed_db.mojom-blink.h"
|
| #include "bindings/core/v8/ActiveScriptWrappable.h"
|
| #include "bindings/core/v8/ScriptState.h"
|
| #include "core/dom/ActiveDOMObject.h"
|
| @@ -37,7 +38,6 @@
|
| #include "modules/indexeddb/IDBMetadata.h"
|
| #include "modules/indexeddb/IndexedDB.h"
|
| #include "platform/heap/Handle.h"
|
| -#include "public/platform/modules/indexeddb/WebIDBDatabase.h"
|
| #include "public/platform/modules/indexeddb/WebIDBTypes.h"
|
| #include "wtf/HashSet.h"
|
|
|
| @@ -46,6 +46,7 @@ namespace blink {
|
| class DOMException;
|
| class ExceptionState;
|
| class IDBDatabase;
|
| +class IDBDatabaseProxy;
|
| class IDBObjectStore;
|
| class IDBOpenDBRequest;
|
| struct IDBObjectStoreMetadata;
|
| @@ -57,22 +58,22 @@ class MODULES_EXPORT IDBTransaction final
|
| USING_GARBAGE_COLLECTED_MIXIN(IDBTransaction);
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| - static IDBTransaction* create(ScriptState*, int64_t, const HashSet<String>& objectStoreNames, WebIDBTransactionMode, IDBDatabase*);
|
| + static IDBTransaction* create(ScriptState*, int64_t, const HashSet<String>& objectStoreNames, indexed_db::mojom::blink::TransactionMode, IDBDatabase*);
|
| static IDBTransaction* create(ScriptState*, int64_t, IDBDatabase*, IDBOpenDBRequest*, const IDBDatabaseMetadata& previousMetadata);
|
| ~IDBTransaction() override;
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| - static WebIDBTransactionMode stringToMode(const String&);
|
| + static indexed_db::mojom::blink::TransactionMode stringToMode(const String&);
|
|
|
| // When the connection is closed backend will be 0.
|
| - WebIDBDatabase* backendDB() const;
|
| + IDBDatabaseProxy* 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 == WebIDBTransactionModeReadOnly; }
|
| - bool isVersionChange() const { return m_mode == WebIDBTransactionModeVersionChange; }
|
| + bool isReadOnly() const { return m_mode == indexed_db::mojom::blink::TransactionMode::ReadOnly; }
|
| + bool isVersionChange() const { return m_mode == indexed_db::mojom::blink::TransactionMode::VersionChange; }
|
|
|
| // Implement the IDBTransaction IDL
|
| const String& mode() const;
|
| @@ -111,7 +112,7 @@ protected:
|
| DispatchEventResult dispatchEventInternal(Event*) override;
|
|
|
| private:
|
| - IDBTransaction(ScriptState*, int64_t, const HashSet<String>&, WebIDBTransactionMode, IDBDatabase*, IDBOpenDBRequest*, const IDBDatabaseMetadata&);
|
| + IDBTransaction(ScriptState*, int64_t, const HashSet<String>&, indexed_db::mojom::blink::TransactionMode, IDBDatabase*, IDBOpenDBRequest*, const IDBDatabaseMetadata&);
|
|
|
| void enqueueEvent(Event*);
|
|
|
| @@ -126,7 +127,7 @@ private:
|
| Member<IDBDatabase> m_database;
|
| const HashSet<String> m_objectStoreNames;
|
| Member<IDBOpenDBRequest> m_openDBRequest;
|
| - const WebIDBTransactionMode m_mode;
|
| + const indexed_db::mojom::blink::TransactionMode m_mode;
|
| State m_state = Active;
|
| bool m_hasPendingActivity = true;
|
| bool m_contextStopped = false;
|
|
|