Index: content/common/indexed_db/indexed_db_messages.h |
diff --git a/content/common/indexed_db/indexed_db_messages.h b/content/common/indexed_db/indexed_db_messages.h |
index 918be9d3a012b270326bcb51a25fb6a753e45a9b..3c43b1c5cd156cd5aec870fc3a1c7fddb39f478f 100644 |
--- a/content/common/indexed_db/indexed_db_messages.h |
+++ b/content/common/indexed_db/indexed_db_messages.h |
@@ -14,6 +14,7 @@ |
#include "ipc/ipc_param_traits.h" |
#include "third_party/WebKit/public/platform/WebIDBCursor.h" |
#include "third_party/WebKit/public/platform/WebIDBDatabase.h" |
+#include "url/gurl.h" |
#define IPC_MESSAGE_START IndexedDBMsgStart |
@@ -112,6 +113,16 @@ IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseGet_Params) |
IPC_STRUCT_MEMBER(bool, key_only) |
IPC_STRUCT_END() |
+IPC_STRUCT_BEGIN(IndexedDBMsg_BlobOrFileInfo) |
+ IPC_STRUCT_MEMBER(bool, is_file) |
+ IPC_STRUCT_MEMBER(GURL, url) //TODO(ericu): UUID now? |
+ IPC_STRUCT_MEMBER(string16, mime_type) |
+ IPC_STRUCT_MEMBER(uint64, size) |
+ IPC_STRUCT_MEMBER(string16, file_path) |
+ IPC_STRUCT_MEMBER(string16, file_name) |
+ IPC_STRUCT_MEMBER(double, last_modified) |
+IPC_STRUCT_END() |
+ |
// Used to set a value in an object store. |
IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabasePut_Params) |
// The id any response should contain. |
@@ -137,6 +148,8 @@ IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabasePut_Params) |
// to each index named in index_names, respectively. |
IPC_STRUCT_MEMBER(std::vector<std::vector<content::IndexedDBKey> >, |
index_keys) |
+ // Sideband data for any blob or file encoded in value. |
+ IPC_STRUCT_MEMBER(std::vector<IndexedDBMsg_BlobOrFileInfo>, blob_or_file_info) |
IPC_STRUCT_END() |
// Used to open both cursors and object cursors in IndexedDB. |
@@ -236,6 +249,8 @@ IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessIDBCursor_Params) |
IPC_STRUCT_MEMBER(content::IndexedDBKey, key) |
IPC_STRUCT_MEMBER(content::IndexedDBKey, primary_key) |
IPC_STRUCT_MEMBER(std::string, value) |
+ // Sideband data for any blob or file encoded in value. |
+ IPC_STRUCT_MEMBER(std::vector<IndexedDBMsg_BlobOrFileInfo>, blob_or_file_info) |
IPC_STRUCT_END() |
IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessCursorContinue_Params) |
@@ -245,6 +260,8 @@ IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessCursorContinue_Params) |
IPC_STRUCT_MEMBER(content::IndexedDBKey, key) |
IPC_STRUCT_MEMBER(content::IndexedDBKey, primary_key) |
IPC_STRUCT_MEMBER(std::string, value) |
+ // Sideband data for any blob or file encoded in value. |
+ IPC_STRUCT_MEMBER(std::vector<IndexedDBMsg_BlobOrFileInfo>, blob_or_file_info) |
IPC_STRUCT_END() |
IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params) |
@@ -254,6 +271,27 @@ IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params) |
IPC_STRUCT_MEMBER(std::vector<content::IndexedDBKey>, keys) |
IPC_STRUCT_MEMBER(std::vector<content::IndexedDBKey>, primary_keys) |
IPC_STRUCT_MEMBER(std::vector<std::string>, values) |
+ // Sideband data for any blob or file encoded in value. |
+ IPC_STRUCT_MEMBER(std::vector<std::vector<IndexedDBMsg_BlobOrFileInfo> >, |
+ blob_or_file_infos) |
+IPC_STRUCT_END() |
+ |
+IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessValue_Params) |
+ IPC_STRUCT_MEMBER(int32, ipc_thread_id) |
+ IPC_STRUCT_MEMBER(int32, ipc_callbacks_id) |
+ IPC_STRUCT_MEMBER(std::string, value) |
+ // Sideband data for any blob or file encoded in value. |
+ IPC_STRUCT_MEMBER(std::vector<IndexedDBMsg_BlobOrFileInfo>, blob_or_file_info) |
+IPC_STRUCT_END() |
+ |
+IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessValueWithKey_Params) |
+ IPC_STRUCT_MEMBER(int32, ipc_thread_id) |
+ IPC_STRUCT_MEMBER(int32, ipc_callbacks_id) |
+ IPC_STRUCT_MEMBER(std::string, value) |
+ IPC_STRUCT_MEMBER(content::IndexedDBKey, primary_key) |
+ IPC_STRUCT_MEMBER(content::IndexedDBKeyPath, key_path) |
+ // Sideband data for any blob or file encoded in value. |
+ IPC_STRUCT_MEMBER(std::vector<IndexedDBMsg_BlobOrFileInfo>, blob_or_file_info) |
IPC_STRUCT_END() |
IPC_STRUCT_BEGIN(IndexedDBIndexMetadata) |
@@ -321,16 +359,13 @@ IPC_MESSAGE_CONTROL3(IndexedDBMsg_CallbacksSuccessIndexedDBKey, |
int32 /* ipc_thread_id */, |
int32 /* ipc_callbacks_id */, |
content::IndexedDBKey /* indexed_db_key */) |
-IPC_MESSAGE_CONTROL3(IndexedDBMsg_CallbacksSuccessValue, |
- int32 /* ipc_thread_id */, |
- int32 /* ipc_callbacks_id */, |
- std::string /* value */) |
-IPC_MESSAGE_CONTROL5(IndexedDBMsg_CallbacksSuccessValueWithKey, |
- int32 /* ipc_thread_id */, |
- int32 /* ipc_callbacks_id */, |
- std::string /* value */, |
- content::IndexedDBKey /* indexed_db_key */, |
- content::IndexedDBKeyPath /* indexed_db_keypath */) |
+ |
+IPC_MESSAGE_CONTROL1(IndexedDBMsg_CallbacksSuccessValue, |
+ IndexedDBMsg_CallbacksSuccessValue_Params) |
+ |
+IPC_MESSAGE_CONTROL1(IndexedDBMsg_CallbacksSuccessValueWithKey, |
+ IndexedDBMsg_CallbacksSuccessValueWithKey_Params) |
+ |
IPC_MESSAGE_CONTROL3(IndexedDBMsg_CallbacksSuccessInteger, |
int32 /* ipc_thread_id */, |
int32 /* ipc_callbacks_id */, |