IPC implementation for create/delete ObjectStore/Index

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 51 matching lines @@
   // The response should have these ids.
   IPC_STRUCT_MEMBER(int32, ipc_thread_id)
   IPC_STRUCT_MEMBER(int32, ipc_response_id)
   // The origin doing the initiating.
   IPC_STRUCT_MEMBER(string16, origin)
   // The name of the database.
   IPC_STRUCT_MEMBER(string16, name)
 IPC_STRUCT_END()
 
 // Used to create an object store.
-IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCreateObjectStore_Params)
+IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCreateObjectStoreOld_Params)
   // The storage id of the object store.
   IPC_STRUCT_MEMBER(int64, id)
   // The name of the object store.
   IPC_STRUCT_MEMBER(string16, name)
   // The keyPath of the object store.
   IPC_STRUCT_MEMBER(content::IndexedDBKeyPath, key_path)
   // Whether the object store created should have a key generator.
   IPC_STRUCT_MEMBER(bool, auto_increment)
   // The transaction this is associated with.
   IPC_STRUCT_MEMBER(int32, ipc_transaction_id)
   // The database the object store belongs to.
   IPC_STRUCT_MEMBER(int32, ipc_database_id)
 IPC_STRUCT_END()
 
+// Used to create an object store.
+IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCreateObjectStore_Params)
+  // The database the object store belongs to.
+  IPC_STRUCT_MEMBER(int32, ipc_database_id)
+  // The transaction id used if a database upgrade is needed.

[jsbell, 2013/01/08 18:44:36]

Nit: This comment reads a little strangely. If this is being used at all, then a
database upgrade is in progress.

+  IPC_STRUCT_MEMBER(int64, transaction_id)
+  // The storage id of the object store.
+  IPC_STRUCT_MEMBER(int64, object_store_id)
+  // The name of the object store.
+  IPC_STRUCT_MEMBER(string16, name)
+  // The keyPath of the object store.
+  IPC_STRUCT_MEMBER(content::IndexedDBKeyPath, key_path)
+  // Whether the object store created should have a key generator.
+  IPC_STRUCT_MEMBER(bool, auto_increment)
+IPC_STRUCT_END()
+
 IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseGet_Params)
   IPC_STRUCT_MEMBER(int32, ipc_thread_id)
   // The id any response should contain.
   IPC_STRUCT_MEMBER(int32, ipc_response_id)
   // The database the object store belongs to.
   IPC_STRUCT_MEMBER(int32, ipc_database_id)
   // The transaction its associated with.
   IPC_STRUCT_MEMBER(int64, transaction_id)
   // The object store's id.
   IPC_STRUCT_MEMBER(int64, object_store_id)
@@ skipping 147 matching lines @@
   // The object store key that we're setting index keys for.
   IPC_STRUCT_MEMBER(content::IndexedDBKey, primary_key)
   // The indexes that we're setting keys on.
   IPC_STRUCT_MEMBER(std::vector<int64>, index_ids)
   // A list of index keys for each index.
   IPC_STRUCT_MEMBER(std::vector<std::vector<content::IndexedDBKey> >,
                     index_keys)
 IPC_STRUCT_END()
 
 // Used to create an index.
+IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCreateIndex_Params)
+  // The transaction this is associated with.
+  IPC_STRUCT_MEMBER(int64, transaction_id)
+  // The database being used.
+  IPC_STRUCT_MEMBER(int32, ipc_database_id)
+  // The object store the index belongs to.
+  IPC_STRUCT_MEMBER(int64, object_store_id)
+  // The storage id of the index.
+  IPC_STRUCT_MEMBER(int64, index_id)
+  // The name of the index.
+  IPC_STRUCT_MEMBER(string16, name)
+  // The keyPath of the index.
+  IPC_STRUCT_MEMBER(content::IndexedDBKeyPath, key_path)
+  // Whether the index created has unique keys.
+  IPC_STRUCT_MEMBER(bool, unique)
+  // Whether the index created produces keys for each array entry.
+  IPC_STRUCT_MEMBER(bool, multi_entry)
+IPC_STRUCT_END()
+
+// Used to create an index.
 IPC_STRUCT_BEGIN(IndexedDBHostMsg_ObjectStoreCreateIndex_Params)
   // The storage id of the index.
   IPC_STRUCT_MEMBER(int64, id)
   // The name of the index.
   IPC_STRUCT_MEMBER(string16, name)
   // The keyPath of the index.
   IPC_STRUCT_MEMBER(content::IndexedDBKeyPath, key_path)
   // Whether the index created has unique keys.
   IPC_STRUCT_MEMBER(bool, unique)
   // Whether the index created produces keys for each array entry.
@@ skipping 230 matching lines @@
   IPC_STRUCT_MEMBER(int64, max_object_store_id)
   IPC_STRUCT_MEMBER(std::vector<IndexedDBObjectStoreMetadata>, object_stores)
 IPC_STRUCT_END()
 
 // WebIDBDatabase::metadata() message.
 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_DatabaseMetadata,
                             int32, /* ipc_database_id */
                             IndexedDBDatabaseMetadata /* metadata */)
 
 // WebIDBDatabase::createObjectStore() message.
-IPC_SYNC_MESSAGE_CONTROL1_2(IndexedDBHostMsg_DatabaseCreateObjectStore,
-                            IndexedDBHostMsg_DatabaseCreateObjectStore_Params,
-                            int32, /* ipc_object_store_id */
-                            WebKit::WebExceptionCode /* ec */)
+IPC_SYNC_MESSAGE_CONTROL1_2(
+    IndexedDBHostMsg_DatabaseCreateObjectStoreOld,
+    IndexedDBHostMsg_DatabaseCreateObjectStoreOld_Params,
+    int32, /* ipc_object_store_id */
+    WebKit::WebExceptionCode /* ec */)
+
+// WebIDBDatabase::createObjectStore() message.
+IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseCreateObjectStore,
+                     IndexedDBHostMsg_DatabaseCreateObjectStore_Params)
 
 // WebIDBDatabase::deleteObjectStore() message.
-IPC_SYNC_MESSAGE_CONTROL3_1(IndexedDBHostMsg_DatabaseDeleteObjectStore,
+IPC_SYNC_MESSAGE_CONTROL3_1(IndexedDBHostMsg_DatabaseDeleteObjectStoreOld,
                             int32, /* ipc_database_id */
                             int64, /* object_store_id */
                             int32, /* ipc_transaction_id */
                             WebKit::WebExceptionCode /* ec */)
 
+// WebIDBDatabase::deleteObjectStore() message.
+IPC_MESSAGE_CONTROL3(IndexedDBHostMsg_DatabaseDeleteObjectStore,
+                     int32, /* ipc_database_id */
+                     int64, /* transaction_id */
+                     int64) /* object_store_id */
+
 // WebIDBDatabase::createTransaction() message.
 // TODO: make this message async.
 IPC_SYNC_MESSAGE_CONTROL5_1(IndexedDBHostMsg_DatabaseCreateTransaction,
                             int32, /* ipc_thread_id */
                             int32, /* ipc_database_id */
                             int64, /* transaction_id */
                             std::vector<int64>, /* object_stores */
                             int32, /* mode */
                             int32) /* ipc_transaction_id */
 
@@ skipping 37 matching lines @@
                      IndexedDBHostMsg_DatabaseDeleteRange_Params)
 
 // WebIDBDatabase::clear() message.
 IPC_MESSAGE_CONTROL5(IndexedDBHostMsg_DatabaseClear,
                      int32, /* ipc_thread_id */
                      int32, /* ipc_response_id */
                      int32, /* ipc_database_id */
                      int64, /* transaction_id */
                      int64) /* object_store_id */
 
+// WebIDBDatabase::createIndex() message.
+IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseCreateIndex,
+                     IndexedDBHostMsg_DatabaseCreateIndex_Params)
+
+// WebIDBDatabase::deleteIndex() message.
+IPC_MESSAGE_CONTROL4(IndexedDBHostMsg_DatabaseDeleteIndex,
+                     int32, /* ipc_database_id */
+                     int64, /* transaction_id */
+                     int64, /* object_store_id */
+                     int64) /* index_id */
+
 // WebIDBIndex::openObjectCursor() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_IndexOpenObjectCursor,
                      IndexedDBHostMsg_IndexOpenCursor_Params)
 
 // WebIDBIndex::openKeyCursor() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_IndexOpenKeyCursor,
                      IndexedDBHostMsg_IndexOpenCursor_Params)
 
 // WebIDBIndex::count() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_IndexCount,
@@ skipping 111 matching lines @@
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionAbort,
                      int32 /* ipc_transaction_id */)
 
 // IDBTransaction::DidCompleteTaskEvents() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDidCompleteTaskEvents,
                      int32 /* ipc_transaction_id */)
 
 // WebIDBTransaction::~WebIDBTransaction() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDestroyed,
                      int32 /* ipc_transaction_id */)