Chromium Code Reviews| Index: Source/modules/indexeddb/IDBAny.h |
| diff --git a/Source/modules/indexeddb/IDBAny.h b/Source/modules/indexeddb/IDBAny.h |
| index 7965ec8f283aea50b5194d73d5494bc536dea605..645e6b0c73c74db93351e158faca8e8fbb2a089b 100644 |
| --- a/Source/modules/indexeddb/IDBAny.h |
| +++ b/Source/modules/indexeddb/IDBAny.h |
| @@ -37,6 +37,7 @@ |
| namespace WebCore { |
| +class BlobInfo; |
| class DOMStringList; |
| class IDBCursor; |
| class IDBCursorWithValue; |
| @@ -62,6 +63,10 @@ public: |
| { |
| return adoptRef(new IDBAny(idbObject)); |
| } |
| + static PassRefPtr<IDBAny> create(PassRefPtr<SharedBuffer> value, const Vector<BlobInfo>* blobInfo) |
| + { |
| + return adoptRef(new IDBAny(value, blobInfo)); |
| + } |
| template<typename T> |
| static PassRefPtr<IDBAny> create(PassRefPtr<T> idbObject) |
| { |
| @@ -71,9 +76,9 @@ public: |
| { |
| return adoptRef(new IDBAny(value)); |
| } |
| - static PassRefPtr<IDBAny> create(PassRefPtr<SharedBuffer> value, PassRefPtr<IDBKey> key, const IDBKeyPath& keyPath) |
| + static PassRefPtr<IDBAny> create(PassRefPtr<SharedBuffer> value, const Vector<BlobInfo>* blobInfo, PassRefPtr<IDBKey> key, const IDBKeyPath& keyPath) |
| { |
| - return adoptRef(new IDBAny(value, key, keyPath)); |
| + return adoptRef(new IDBAny(value, blobInfo, key, keyPath)); |
| } |
| ~IDBAny(); |
| @@ -107,6 +112,7 @@ public: |
| IDBObjectStore* idbObjectStore(); |
| IDBTransaction* idbTransaction(); |
| SharedBuffer* buffer(); |
| + const Vector<BlobInfo>* blobInfo() const; |
| int64_t integer(); |
| const String& string(); |
| IDBKey* key(); |
| @@ -124,13 +130,13 @@ private: |
| explicit IDBAny(PassRefPtr<IDBKey>); |
| explicit IDBAny(const IDBKeyPath&); |
| explicit IDBAny(const String&); |
| - explicit IDBAny(PassRefPtr<SharedBuffer>); |
| - explicit IDBAny(PassRefPtr<SharedBuffer>, PassRefPtr<IDBKey>, const IDBKeyPath&); |
| + explicit IDBAny(PassRefPtr<SharedBuffer>, const Vector<BlobInfo>*); |
|
jsbell
2013/12/20 19:13:54
Nit: Don't need explicit on multi-parameter constr
ericu
2014/02/12 19:12:55
Done.
|
| + explicit IDBAny(PassRefPtr<SharedBuffer>, const Vector<BlobInfo>*, PassRefPtr<IDBKey>, const IDBKeyPath&); |
| explicit IDBAny(int64_t); |
| const Type m_type; |
| - // Only one of the following should ever be in use at any given time. |
| + // Only one of the following should ever be in use at any given time, except that BufferType uses two and BufferKeyAndKeyPathType uses four. |
|
jsbell
2013/12/20 19:13:54
Thanks for the comment update.
|
| const RefPtr<DOMStringList> m_domStringList; |
| const RefPtr<IDBCursor> m_idbCursor; |
| const RefPtr<IDBDatabase> m_idbDatabase; |
| @@ -141,6 +147,7 @@ private: |
| const RefPtr<IDBKey> m_idbKey; |
| const IDBKeyPath m_idbKeyPath; |
| const RefPtr<SharedBuffer> m_buffer; |
| + const Vector<BlobInfo>* m_blobInfo; |
| const String m_string; |
| const int64_t m_integer; |
| }; |