| Index: third_party/WebKit/Source/modules/indexeddb/IDBCursor.h
|
| diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBCursor.h b/third_party/WebKit/Source/modules/indexeddb/IDBCursor.h
|
| index 57c97d5b7636f65e6c513fcb46c153ae89f6bb30..6edf5bb084302e017db3c85ae16338c8579827f8 100644
|
| --- a/third_party/WebKit/Source/modules/indexeddb/IDBCursor.h
|
| +++ b/third_party/WebKit/Source/modules/indexeddb/IDBCursor.h
|
| @@ -28,11 +28,10 @@
|
|
|
| #include "bindings/core/v8/ScriptValue.h"
|
| #include "bindings/core/v8/ScriptWrappable.h"
|
| +#include "modules/indexeddb/IDBCursorProxy.h"
|
| #include "modules/indexeddb/IDBKey.h"
|
| #include "modules/indexeddb/IDBRequest.h"
|
| #include "modules/indexeddb/IndexedDB.h"
|
| -#include "public/platform/modules/indexeddb/WebIDBCursor.h"
|
| -#include "public/platform/modules/indexeddb/WebIDBTypes.h"
|
| #include "wtf/PassRefPtr.h"
|
| #include "wtf/RefPtr.h"
|
| #include <memory>
|
| @@ -48,9 +47,9 @@ class ScriptState;
|
| class IDBCursor : public GarbageCollectedFinalized<IDBCursor>, public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| - static WebIDBCursorDirection stringToDirection(const String& modeString);
|
| + static indexed_db::mojom::blink::CursorDirection stringToDirection(const String& modeString);
|
|
|
| - static IDBCursor* create(std::unique_ptr<WebIDBCursor>, WebIDBCursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*);
|
| + static IDBCursor* create(std::unique_ptr<IDBCursorProxy>, indexed_db::mojom::blink::CursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*);
|
| virtual ~IDBCursor();
|
| DECLARE_TRACE();
|
| void contextWillBeDestroyed() { m_backend.reset(); }
|
| @@ -84,14 +83,14 @@ public:
|
| virtual bool isCursorWithValue() const { return false; }
|
|
|
| protected:
|
| - IDBCursor(std::unique_ptr<WebIDBCursor>, WebIDBCursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*);
|
| + IDBCursor(std::unique_ptr<IDBCursorProxy>, indexed_db::mojom::blink::CursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*);
|
|
|
| private:
|
| IDBObjectStore* effectiveObjectStore() const;
|
|
|
| - std::unique_ptr<WebIDBCursor> m_backend;
|
| + std::unique_ptr<IDBCursorProxy> m_backend;
|
| Member<IDBRequest> m_request;
|
| - const WebIDBCursorDirection m_direction;
|
| + const indexed_db::mojom::blink::CursorDirection m_direction;
|
| Member<IDBAny> m_source;
|
| Member<IDBTransaction> m_transaction;
|
| bool m_gotValue = false;
|
|
|