content/browser/indexed_db/indexed_db_database.cc - Issue 138703002: IndexedDB: Replace passing identically-sized vectors with pairs

Unified Diff: content/browser/indexed_db/indexed_db_database.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_database.cc

diff --git a/content/browser/indexed_db/indexed_db_database.cc b/content/browser/indexed_db/indexed_db_database.cc

index 3f7f98a947157119f6ec73f7a5ce9dfcc02b6e9c..fcbd7a0dc4a1657604c8499279fc467fd78292d0 100644

--- a/content/browser/indexed_db/indexed_db_database.cc

+++ b/content/browser/indexed_db/indexed_db_database.cc

@@ -698,7 +698,6 @@ struct IndexedDBDatabase::PutOperationParams {

scoped_ptr<IndexedDBKey> key;

IndexedDBDatabase::PutMode put_mode;

scoped_refptr<IndexedDBCallbacks> callbacks;

- std::vector<int64> index_ids;

std::vector<IndexKeys> index_keys;

DISALLOW_COPY_AND_ASSIGN(PutOperationParams);

@@ -710,7 +709,6 @@ void IndexedDBDatabase::Put(int64 transaction_id,

scoped_ptr<IndexedDBKey> key,

PutMode put_mode,

scoped_refptr<IndexedDBCallbacks> callbacks,

- const std::vector<int64>& index_ids,

const std::vector<IndexKeys>& index_keys) {

IDB_TRACE("IndexedDBDatabase::Put");

IndexedDBTransaction* transaction = GetTransaction(transaction_id);

@@ -728,7 +726,6 @@ void IndexedDBDatabase::Put(int64 transaction_id,

params->key = key.Pass();

params->put_mode = put_mode;

params->callbacks = callbacks;

- params->index_ids = index_ids;

params->index_keys = index_keys;

transaction->ScheduleTask(base::Bind(

&IndexedDBDatabase::PutOperation, this, base::Passed(&params)));

@@ -738,7 +735,6 @@ void IndexedDBDatabase::PutOperation(scoped_ptr<PutOperationParams> params,

IndexedDBTransaction* transaction) {

IDB_TRACE("IndexedDBDatabase::PutOperation");

DCHECK_NE(transaction->mode(), indexed_db::TRANSACTION_READ_ONLY);

- DCHECK_EQ(params->index_ids.size(), params->index_keys.size());

bool key_was_generated = false;

DCHECK(metadata_.object_stores.find(params->object_store_id) !=

@@ -799,7 +795,6 @@ void IndexedDBDatabase::PutOperation(scoped_ptr<PutOperationParams> params,

object_store,

*key,

key_was_generated,

- params->index_ids,

params->index_keys,

&index_writers,

&error_message,

@@ -864,7 +859,6 @@ void IndexedDBDatabase::PutOperation(scoped_ptr<PutOperationParams> params,

void IndexedDBDatabase::SetIndexKeys(int64 transaction_id,

int64 object_store_id,

scoped_ptr<IndexedDBKey> primary_key,

- const std::vector<int64>& index_ids,

const std::vector<IndexKeys>& index_keys) {

IDB_TRACE("IndexedDBDatabase::SetIndexKeys");

IndexedDBTransaction* transaction = GetTransaction(transaction_id);

@@ -909,7 +903,6 @@ void IndexedDBDatabase::SetIndexKeys(int64 transaction_id,

object_store_metadata,

*primary_key,

false,

- index_ids,

index_keys,

&index_writers,

&error_message,

« no previous file with comments | « content/browser/indexed_db/indexed_db_database.h ('k') | content/browser/indexed_db/indexed_db_dispatcher_host.cc » ('j') | no next file with comments »