Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(878)

Unified Diff: content/browser/indexed_db/indexed_db_dispatcher_host.cc

Issue 138703002: IndexedDB: Replace passing identically-sized vectors with pairs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased again Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/indexed_db/indexed_db_dispatcher_host.cc
diff --git a/content/browser/indexed_db/indexed_db_dispatcher_host.cc b/content/browser/indexed_db/indexed_db_dispatcher_host.cc
index c31881531d0acb04d14b41cb4a77125f6f39cd86..ffa628c401669cd85a1d4934d867a9e4992be4d4 100644
--- a/content/browser/indexed_db/indexed_db_dispatcher_host.cc
+++ b/content/browser/indexed_db/indexed_db_dispatcher_host.cc
@@ -531,16 +531,6 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnPut(
parent_, params.ipc_thread_id, params.ipc_callbacks_id));
int64 host_transaction_id = parent_->HostTransactionId(params.transaction_id);
- if (params.index_ids.size() != params.index_keys.size()) {
- connection->database()->Abort(
- host_transaction_id,
- IndexedDBDatabaseError(
- blink::WebIDBDatabaseExceptionUnknownError,
- "Malformed IPC message: index_ids.size() != index_keys.size()"));
- parent_->BadMessageReceived();
- return;
- }
-
// TODO(alecflett): Avoid a copy here.
std::string value_copy(params.value);
connection->database()->Put(
@@ -550,7 +540,6 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnPut(
make_scoped_ptr(new IndexedDBKey(params.key)),
static_cast<IndexedDBDatabase::PutMode>(params.put_mode),
callbacks,
- params.index_ids,
params.index_keys);
TransactionIDToSizeMap* map =
&parent_->database_dispatcher_host_->transaction_size_map_;
@@ -569,21 +558,10 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnSetIndexKeys(
return;
int64 host_transaction_id = parent_->HostTransactionId(params.transaction_id);
- if (params.index_ids.size() != params.index_keys.size()) {
- connection->database()->Abort(
- host_transaction_id,
- IndexedDBDatabaseError(
- blink::WebIDBDatabaseExceptionUnknownError,
- "Malformed IPC message: index_ids.size() != index_keys.size()"));
- parent_->BadMessageReceived();
- return;
- }
-
connection->database()->SetIndexKeys(
host_transaction_id,
params.object_store_id,
make_scoped_ptr(new IndexedDBKey(params.primary_key)),
- params.index_ids,
params.index_keys);
}
« no previous file with comments | « content/browser/indexed_db/indexed_db_database.cc ('k') | content/browser/indexed_db/indexed_db_index_writer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698