Chromium side of "consolidate two-phase connection to avoid race conditions".

content/common/indexed_db/indexed_db_messages.h

 // Copyright (c) 2012 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/indexed_db_key.h"
 #include "content/common/indexed_db/indexed_db_key_path.h"
@@ skipping 23 matching lines @@
   IPC_STRUCT_MEMBER(int32, thread_id)
   IPC_STRUCT_MEMBER(int32, response_id)
   // The origin doing the initiating.
   IPC_STRUCT_MEMBER(string16, origin)
 IPC_STRUCT_END()
 
 // Used to open an indexed database.
 IPC_STRUCT_BEGIN(IndexedDBHostMsg_FactoryOpen_Params)
   // The response should have these ids.
   IPC_STRUCT_MEMBER(int32, thread_id)
+  // Identifier of the request
   IPC_STRUCT_MEMBER(int32, response_id)
+  // Identifier for database callbacks
+  IPC_STRUCT_MEMBER(int32, database_response_id)
   // The origin doing the initiating.
   IPC_STRUCT_MEMBER(string16, origin)
   // The name of the database.
   IPC_STRUCT_MEMBER(string16, name)
   // The requested version of the database.
   IPC_STRUCT_MEMBER(int64, version)
 IPC_STRUCT_END()
 
 // Used to delete an indexed database.
 IPC_STRUCT_BEGIN(IndexedDBHostMsg_FactoryDeleteDatabase_Params)
@@ skipping 264 matching lines @@
 IPC_SYNC_MESSAGE_CONTROL3_1(IndexedDBHostMsg_CursorDelete,
                      int32, /* idb_cursor_id */
                      int32, /* thread_id */
                      int32, /* response_id */
                      WebKit::WebExceptionCode /* ec */)
 
 // WebIDBFactory::getDatabaseNames() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_FactoryGetDatabaseNames,
                      IndexedDBHostMsg_FactoryGetDatabaseNames_Params)
 
+// TODO(jsbell): Remove this once WK90411 rolls.
+// WebIDBFactory::open() message.
+IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_FactoryOpenLegacy,
+                     IndexedDBHostMsg_FactoryOpen_Params)
 // WebIDBFactory::open() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_FactoryOpen,
                      IndexedDBHostMsg_FactoryOpen_Params)
 
 // WebIDBFactory::deleteDatabase() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_FactoryDeleteDatabase,
                      IndexedDBHostMsg_FactoryDeleteDatabase_Params)
 
 // WebIDBDatabase::metadata() payload
 IPC_STRUCT_BEGIN(IndexedDBIndexMetadata)
@@ skipping 49 matching lines @@
 // IDs to temporary IDs. We can then update the transaction
 // to its real ID asynchronously.
 IPC_SYNC_MESSAGE_CONTROL4_2(IndexedDBHostMsg_DatabaseTransaction,
                             int32, /* thread_id */
                             int32, /* idb_database_id */
                             std::vector<string16>, /* object_stores */
                             int32, /* mode */
                             int32, /* idb_transaction_id */
                             WebKit::WebExceptionCode /* ec */)
 
+// TODO(jsbell): Remove once WK90411 has rolled.
 // WebIDBDatabase::open() message.
 IPC_MESSAGE_CONTROL3(IndexedDBHostMsg_DatabaseOpen,
                      int32, /* idb_database_id */
                      int32 /* thread_id */,
                      int32 /* response_id */)
 
 // WebIDBDatabase::close() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseClose,
                      int32 /* idb_database_id */)
 
@@ skipping 137 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 */)