Chromium glue for Preemptive cursors and passing keys from renderer to browser

content/common/indexed_db/indexed_db_messages.h

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 2a478fd945a409be03e0c564284809150c80dcf7..7b3a308417d7bbea18466cb966081ce011fdd63b 100644
--- a/content/common/indexed_db/indexed_db_messages.h
+++ b/content/common/indexed_db/indexed_db_messages.h
@@ -15,14 +15,18 @@
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebExceptionCode.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCursor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBMetadata.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransaction.h"
 
 #define IPC_MESSAGE_START IndexedDBMsgStart
 
 // Argument structures used in messages
 
 IPC_ENUM_TRAITS(WebKit::WebIDBObjectStore::PutMode)
+IPC_ENUM_TRAITS(WebKit::WebIDBCursor::Direction)
+IPC_ENUM_TRAITS(WebKit::WebIDBTransaction::TaskType)
 
 // Used to enumerate indexed databases.
 IPC_STRUCT_BEGIN(IndexedDBHostMsg_FactoryGetDatabaseNames_Params)
@@ -146,7 +150,9 @@ IPC_STRUCT_BEGIN(IndexedDBHostMsg_ObjectStoreOpenCursor_Params)
   // The serialized key range.
   IPC_STRUCT_MEMBER(content::IndexedDBKeyRange, key_range)
   // The direction of this cursor.
-  IPC_STRUCT_MEMBER(int32, direction)
+  IPC_STRUCT_MEMBER(WebKit::WebIDBCursor::Direction, direction)
+  // The priority of this cursor.
+  IPC_STRUCT_MEMBER(WebKit::WebIDBTransaction::TaskType, task_type)
   // The object store the cursor belongs to.
   IPC_STRUCT_MEMBER(int32, idb_object_store_id)
   // The transaction this request belongs to.
@@ -454,6 +460,21 @@ IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_ObjectStorePut,
                             IndexedDBHostMsg_ObjectStorePut_Params,
                             WebKit::WebExceptionCode /* ec */)
 
+// WebIDBObjectStore::setIndexKeys() message.
+IPC_MESSAGE_CONTROL5(IndexedDBHostMsg_ObjectStoreSetIndexKeys,
+                     int32, /* idb_object_store_id */
+                     content::IndexedDBKey, /* primary_key */
+                     std::vector<string16>, /* index_names */
+                     std::vector<std::vector<content::IndexedDBKey> >,
+                     /* index_keys */
+                     int32 /* transaction_id */)
+
+// WebIDBObjectStore::setIndexesReady() message.
+IPC_MESSAGE_CONTROL3(IndexedDBHostMsg_ObjectStoreSetIndexesReady,
+                     int32, /* idb_object_store_id */
+                     std::vector<string16>, /* index_names */
+                     int32 /* transaction_id */)
+
 // WebIDBObjectStore::delete() message.
 IPC_SYNC_MESSAGE_CONTROL5_1(IndexedDBHostMsg_ObjectStoreDelete,
                             int32, /* idb_object_store_id */