| Index: third_party/WebKit/Source/modules/indexeddb/IDBRequest.h
|
| diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBRequest.h b/third_party/WebKit/Source/modules/indexeddb/IDBRequest.h
|
| index 112f0b05b1aca5bd3e614fe060397aedf708e349..9fb7d95eaf4ff921b5b23467c5ccf6643ef370b0 100644
|
| --- a/third_party/WebKit/Source/modules/indexeddb/IDBRequest.h
|
| +++ b/third_party/WebKit/Source/modules/indexeddb/IDBRequest.h
|
| @@ -44,8 +44,7 @@
|
| #include "platform/blob/BlobData.h"
|
| #include "platform/heap/Handle.h"
|
| #include "public/platform/WebBlobInfo.h"
|
| -#include "public/platform/modules/indexeddb/WebIDBCursor.h"
|
| -#include "public/platform/modules/indexeddb/WebIDBTypes.h"
|
| +#include "public/platform/modules/indexeddb/indexed_db.mojom-blink.h"
|
| #include <memory>
|
|
|
| namespace blink {
|
| @@ -53,7 +52,9 @@ namespace blink {
|
| class DOMException;
|
| class ExceptionState;
|
| class IDBCursor;
|
| +class IDBCursorProxy;
|
| struct IDBDatabaseMetadata;
|
| +class IDBDatabaseProxy;
|
| class IDBValue;
|
|
|
| class MODULES_EXPORT IDBRequest
|
| @@ -92,13 +93,13 @@ public:
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(success);
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
|
|
|
| - void setCursorDetails(IndexedDB::CursorType, WebIDBCursorDirection);
|
| + void setCursorDetails(IndexedDB::CursorType, indexed_db::mojom::blink::CursorDirection);
|
| void setPendingCursor(IDBCursor*);
|
| void abort();
|
|
|
| virtual void onError(DOMException*);
|
| virtual void onSuccess(const Vector<String>&);
|
| - virtual void onSuccess(std::unique_ptr<WebIDBCursor>, IDBKey*, IDBKey* primaryKey, PassRefPtr<IDBValue>);
|
| + virtual void onSuccess(std::unique_ptr<IDBCursorProxy>, IDBKey*, IDBKey* primaryKey, PassRefPtr<IDBValue>);
|
| virtual void onSuccess(IDBKey*);
|
| virtual void onSuccess(PassRefPtr<IDBValue>);
|
| virtual void onSuccess(const Vector<RefPtr<IDBValue>>&);
|
| @@ -107,9 +108,9 @@ public:
|
| virtual void onSuccess(IDBKey*, IDBKey* primaryKey, PassRefPtr<IDBValue>);
|
|
|
| // Only IDBOpenDBRequest instances should receive these:
|
| - virtual void onBlocked(int64_t oldVersion) { ASSERT_NOT_REACHED(); }
|
| - virtual void onUpgradeNeeded(int64_t oldVersion, std::unique_ptr<WebIDBDatabase>, const IDBDatabaseMetadata&, WebIDBDataLoss, String dataLossMessage) { ASSERT_NOT_REACHED(); }
|
| - virtual void onSuccess(std::unique_ptr<WebIDBDatabase>, const IDBDatabaseMetadata&) { ASSERT_NOT_REACHED(); }
|
| + virtual void onBlocked(int64_t oldVersion) { NOTREACHED(); }
|
| + virtual void onUpgradeNeeded(int64_t oldVersion, std::unique_ptr<IDBDatabaseProxy>, const IDBDatabaseMetadata&, indexed_db::mojom::blink::DataLoss, String dataLossMessage) { NOTREACHED(); }
|
| + virtual void onSuccess(std::unique_ptr<IDBDatabaseProxy>, const IDBDatabaseMetadata&) { NOTREACHED(); }
|
|
|
| // ActiveScriptWrappable
|
| bool hasPendingActivity() const final;
|
| @@ -160,7 +161,7 @@ private:
|
|
|
| // Only used if the result type will be a cursor.
|
| IndexedDB::CursorType m_cursorType = IndexedDB::CursorKeyAndValue;
|
| - WebIDBCursorDirection m_cursorDirection = WebIDBCursorDirectionNext;
|
| + indexed_db::mojom::blink::CursorDirection m_cursorDirection = indexed_db::mojom::blink::CursorDirection::Next;
|
| // When a cursor is continued/advanced, m_result is cleared and m_pendingCursor holds it.
|
| Member<IDBCursor> m_pendingCursor;
|
| // New state is not applied to the cursor object until the event is dispatched.
|
|
|