Consolidate key, primary key, value cursor messages.

content/common/indexed_db_messages.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Message definition file, included multiple times, hence no include guard.
 
 #include <vector>
 
 #include "content/common/indexed_db_key.h"
 #include "content/common/indexed_db_param_traits.h"
@@ skipping 123 matching lines @@
   IPC_STRUCT_MEMBER(int32, direction)
   // The object store the cursor belongs to.
   IPC_STRUCT_MEMBER(int32, idb_object_store_id)
   // The transaction this request belongs to.
   IPC_STRUCT_MEMBER(int, transaction_id)
 IPC_STRUCT_END()
 
 // Indexed DB messages sent from the browser to the renderer.
 
 // IDBCallback message handlers.
-IPC_MESSAGE_CONTROL2(IndexedDBMsg_CallbacksSuccessIDBCursor,
+IPC_MESSAGE_CONTROL5(IndexedDBMsg_CallbacksSuccessIDBCursor,
                      int32 /* response_id */,
-                     int32 /* cursor_id */)
+                     int32 /* cursor_id */,
+                     IndexedDBKey /* key */,
+                     IndexedDBKey /* primary key */,
+                     SerializedScriptValue /* script_value */)
 IPC_MESSAGE_CONTROL2(IndexedDBMsg_CallbacksSuccessIDBDatabase,
                      int32 /* response_id */,
                      int32 /* idb_database_id */)
 IPC_MESSAGE_CONTROL2(IndexedDBMsg_CallbacksSuccessIndexedDBKey,
                      int32 /* response_id */,
                      IndexedDBKey /* indexed_db_key */)
 IPC_MESSAGE_CONTROL2(IndexedDBMsg_CallbacksSuccessIDBTransaction,
                      int32 /* response_id */,
                      int32 /* idb_transaction_id */)
 IPC_MESSAGE_CONTROL2(IndexedDBMsg_CallbacksSuccessSerializedScriptValue,
@@ skipping 19 matching lines @@
                      int32, /* database_id */
                      string16) /* new_version */
 
 // Indexed DB messages sent from the renderer to the browser.
 
 // WebIDBCursor::direction() message.
 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_CursorDirection,
                             int32, /* idb_cursor_id */
                             int32 /* direction */)
 
-// WebIDBCursor::key() message.
-IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_CursorKey,
-                            int32, /* idb_cursor_id */
-                            IndexedDBKey /* key */)
-
-// WebIDBCursor::primaryKey() message.
-IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_CursorPrimaryKey,
-                            int32, /* idb_cursor_id */
-                            IndexedDBKey /* primary_key */)
-
-// WebIDBCursor::value() message.
-IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_CursorValue,
-                            int32, /* idb_cursor_id */
-                            SerializedScriptValue /* script_value */)
-
 // WebIDBCursor::update() message.
 IPC_SYNC_MESSAGE_CONTROL3_1(IndexedDBHostMsg_CursorUpdate,
                      int32, /* idb_cursor_id */
                      int32, /* response_id */
                      SerializedScriptValue, /* value */
                      WebKit::WebExceptionCode /* ec */)
 
 // WebIDBCursor::continue() message.
 IPC_SYNC_MESSAGE_CONTROL3_1(IndexedDBHostMsg_CursorContinue,
                      int32, /* idb_cursor_id */
@@ skipping 221 matching lines @@
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionAbort,
                      int32 /* idb_transaction_id */)
 
 // IDBTransaction::DidCompleteTaskEvents() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDidCompleteTaskEvents,
                      int32 /* idb_transaction_id */)
 
 // WebIDBTransaction::~WebIDBTransaction() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDestroyed,
                      int32 /* idb_transaction_id */)