Source/modules/indexeddb/IDBRequest.h - Issue 18590006: Blob support for IDB [Blink]

Unified Diff: Source/modules/indexeddb/IDBRequest.h

Issue 18590006: Blob support for IDB [Blink] (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Merge fixes [builds, untested] Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: Source/modules/indexeddb/IDBRequest.h

diff --git a/Source/modules/indexeddb/IDBRequest.h b/Source/modules/indexeddb/IDBRequest.h

index bbe66caa82a76c89f373a14561ef24f457566052..694c26091ac1540f90b5c99f82e51d324bac7638 100644

--- a/Source/modules/indexeddb/IDBRequest.h

+++ b/Source/modules/indexeddb/IDBRequest.h

@@ -80,13 +80,13 @@ public:

// IDBCallbacks

virtual void onError(PassRefPtr<DOMError>);

virtual void onSuccess(const Vector<String>&);

- virtual void onSuccess(PassRefPtr<IDBCursorBackendInterface>, PassRefPtr<IDBKey>, PassRefPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer>);

+ virtual void onSuccess(PassRefPtr<IDBCursorBackendInterface>, PassRefPtr<IDBKey>, PassRefPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer>, const Vector<BlobInfo>&);

jsbell 2013/09/12 22:52:17 I think this becomes more readable if the tuple be

ericu 2013/11/20 23:06:08 Done.

virtual void onSuccess(PassRefPtr<IDBKey>);

- virtual void onSuccess(PassRefPtr<SharedBuffer>);

- virtual void onSuccess(PassRefPtr<SharedBuffer>, PassRefPtr<IDBKey>, const IDBKeyPath&);

+ virtual void onSuccess(PassRefPtr<SharedBuffer>, const Vector<BlobInfo>&);

+ virtual void onSuccess(PassRefPtr<SharedBuffer>, const Vector<BlobInfo>&, PassRefPtr<IDBKey>, const IDBKeyPath&);

virtual void onSuccess(int64_t);

virtual void onSuccess();

- virtual void onSuccess(PassRefPtr<IDBKey>, PassRefPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer>);

+ virtual void onSuccess(PassRefPtr<IDBKey>, PassRefPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer>, const Vector<BlobInfo>&);

// ActiveDOMObject

virtual bool hasPendingActivity() const OVERRIDE;

@@ -139,7 +139,7 @@ private:

virtual EventTargetData* eventTargetData();

virtual EventTargetData* ensureEventTargetData();

- void setResultCursor(PassRefPtr<IDBCursor>, PassRefPtr<IDBKey>, PassRefPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer> value);

+ void setResultCursor(PassRefPtr<IDBCursor>, PassRefPtr<IDBKey>, PassRefPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer> value, const Vector<BlobInfo>&);

void checkForReferenceCycle();

@@ -156,6 +156,7 @@ private:

RefPtr<IDBKey> m_cursorKey;

RefPtr<IDBKey> m_cursorPrimaryKey;

RefPtr<SharedBuffer> m_cursorValue;

+ Vector<BlobInfo> m_cursorBlobInfo;

bool m_didFireUpgradeNeededEvent;

bool m_preventPropagation;

« Source/modules/indexeddb/IDBObjectStore.cpp ('K') | « Source/modules/indexeddb/IDBObjectStore.cpp ('k') | Source/modules/indexeddb/IDBRequest.cpp » ('j') | no next file with comments »