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

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

Issue 2449953008: Port messages sent by WebIDBDatabaseImpl to Mojo. (Closed)
Patch Set: Address cmumford@ and jsbell@'s comments. Created 4 years, 1 month 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 516dfc4f7760978c5da234e04ed9302b53ee9453..85b6f9d6911e032eca78054e44ad448925585203 100644
--- a/content/browser/indexed_db/indexed_db_database.cc
+++ b/content/browser/indexed_db/indexed_db_database.cc
@@ -1206,7 +1206,7 @@ void IndexedDBDatabase::GetAllOperation(
if (!cursor) {
// Doesn't matter if key or value array here - will be empty array when it
// hits JavaScript.
- callbacks->OnSuccessArray(&found_values, object_store_metadata.key_path);
+ callbacks->OnSuccessArray(&found_values);
return;
}
@@ -1272,7 +1272,7 @@ void IndexedDBDatabase::GetAllOperation(
// to return an array of keys - no need to create our own array of keys.
callbacks->OnSuccess(IndexedDBKey(found_keys));
} else {
- callbacks->OnSuccessArray(&found_values, object_store_metadata.key_path);
+ callbacks->OnSuccessArray(&found_values);
}
}
@@ -1319,7 +1319,7 @@ struct IndexedDBDatabase::PutOperationParams {
std::unique_ptr<IndexedDBKey> key;
blink::WebIDBPutMode put_mode;
scoped_refptr<IndexedDBCallbacks> callbacks;
- std::vector<IndexKeys> index_keys;
+ std::vector<IndexedDBIndexKeys> index_keys;
private:
DISALLOW_COPY_AND_ASSIGN(PutOperationParams);
@@ -1333,7 +1333,7 @@ void IndexedDBDatabase::Put(
std::unique_ptr<IndexedDBKey> key,
blink::WebIDBPutMode put_mode,
scoped_refptr<IndexedDBCallbacks> callbacks,
- const std::vector<IndexKeys>& index_keys) {
+ const std::vector<IndexedDBIndexKeys>& index_keys) {
IDB_TRACE1("IndexedDBDatabase::Put", "txn.id", transaction_id);
IndexedDBTransaction* transaction = GetTransaction(transaction_id);
if (!transaction)
@@ -1501,10 +1501,11 @@ void IndexedDBDatabase::PutOperation(std::unique_ptr<PutOperationParams> params,
IndexedDBKeyRange(*key));
}
-void IndexedDBDatabase::SetIndexKeys(int64_t transaction_id,
- int64_t object_store_id,
- std::unique_ptr<IndexedDBKey> primary_key,
- const std::vector<IndexKeys>& index_keys) {
+void IndexedDBDatabase::SetIndexKeys(
+ int64_t transaction_id,
+ int64_t object_store_id,
+ std::unique_ptr<IndexedDBKey> primary_key,
+ const std::vector<IndexedDBIndexKeys>& index_keys) {
IDB_TRACE1("IndexedDBDatabase::SetIndexKeys", "txn.id", transaction_id);
IndexedDBTransaction* transaction = GetTransaction(transaction_id);
if (!transaction)

Powered by Google App Engine
This is Rietveld 408576698