IndexedDB: Replace passing identically-sized vectors with pairs

content/child/indexed_db/webidbdatabase_impl.cc

 // Copyright 2013 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.
 
 #include "content/child/indexed_db/webidbdatabase_impl.h"
 
 #include <vector>
 
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
 #include "content/child/indexed_db/indexed_db_key_builders.h"
@@ skipping 119 matching lines @@
     long long transaction_id,
     long long object_store_id,
     const WebIDBKey& primary_key,
     const WebVector<long long>& index_ids,
     const WebVector<WebIndexKeys>& index_keys) {
   IndexedDBHostMsg_DatabaseSetIndexKeys_Params params;
   params.ipc_database_id = ipc_database_id_;
   params.transaction_id = transaction_id;
   params.object_store_id = object_store_id;
   params.primary_key = IndexedDBKeyBuilder::Build(primary_key);
-  COMPILE_ASSERT(sizeof(params.index_ids[0]) == sizeof(index_ids[0]),
-                 Cant_copy);
-  params.index_ids.assign(index_ids.data(),
-                          index_ids.data() + index_ids.size());
 
-  params.index_keys.resize(index_keys.size());
-  for (size_t i = 0; i < index_keys.size(); ++i) {
-    params.index_keys[i].resize(index_keys[i].size());
+  DCHECK_EQ(index_ids.size(), index_keys.size());
+  params.index_keys.resize(index_ids.size());
+  for (size_t i = 0, len = index_ids.size(); i < len; ++i) {
+    params.index_keys[i].first = index_ids[i];
+    params.index_keys[i].second.resize(index_keys[i].size());
     for (size_t j = 0; j < index_keys[i].size(); ++j) {
-      params.index_keys[i][j] = IndexedDBKeyBuilder::Build(index_keys[i][j]);
+      params.index_keys[i].second[j] =
+          IndexedDBKey(IndexedDBKeyBuilder::Build(index_keys[i][j]));
     }
   }
+
   thread_safe_sender_->Send(new IndexedDBHostMsg_DatabaseSetIndexKeys(params));
 }
 
 void WebIDBDatabaseImpl::setIndexesReady(
     long long transaction_id,
     long long object_store_id,
     const WebVector<long long>& web_index_ids) {
   std::vector<int64> index_ids(web_index_ids.data(),
                                web_index_ids.data() + web_index_ids.size());
   thread_safe_sender_->Send(new IndexedDBHostMsg_DatabaseSetIndexesReady(
@@ skipping 92 matching lines @@
   thread_safe_sender_->Send(
       new IndexedDBHostMsg_DatabaseAbort(ipc_database_id_, transaction_id));
 }
 
 void WebIDBDatabaseImpl::commit(long long transaction_id) {
   thread_safe_sender_->Send(
       new IndexedDBHostMsg_DatabaseCommit(ipc_database_id_, transaction_id));
 }
 
 }  // namespace content