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

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

Issue 7692006: IndexedDB API cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Copyright presubmit Created 9 years, 4 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/in_process_webkit/indexed_db_dispatcher_host.cc
diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
index 01b152f6d4bc0f3ecc49214a98e85accb5a1876c..bf1481331e53d51655a4779d46d60ed335ded2d3 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -431,7 +431,6 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnTransaction(
int32 idb_database_id,
const std::vector<string16>& names,
int32 mode,
- int32 timeout,
int32* idb_transaction_id,
WebKit::WebExceptionCode* ec) {
WebIDBDatabase* database = parent_->GetOrTerminateProcess(
@@ -447,7 +446,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnTransaction(
*ec = 0;
WebIDBTransaction* transaction = database->transaction(
- object_stores, mode, timeout, *ec);
+ object_stores, mode, *ec);
DCHECK(!transaction != !*ec);
*idb_transaction_id =
*ec ? 0 : parent_->Add(transaction, database_url_map_[idb_database_id]);
@@ -917,18 +916,12 @@ void IndexedDBDispatcherHost::CursorDispatcherHost::OnPrimaryKey(
void IndexedDBDispatcherHost::CursorDispatcherHost::OnValue(
int32 object_id,
- SerializedScriptValue* script_value,
- IndexedDBKey* key) {
+ SerializedScriptValue* script_value) {
WebIDBCursor* idb_cursor = parent_->GetOrTerminateProcess(&map_, object_id);
if (!idb_cursor)
return;
- WebSerializedScriptValue temp_script_value;
- WebIDBKey temp_key;
- idb_cursor->value(temp_script_value, temp_key);
-
- *script_value = SerializedScriptValue(temp_script_value);
- *key = IndexedDBKey(temp_key);
+ *script_value = SerializedScriptValue(idb_cursor->value());
}
void IndexedDBDispatcherHost::CursorDispatcherHost::OnUpdate(
@@ -971,8 +964,7 @@ void IndexedDBDispatcherHost::CursorDispatcherHost::OnDelete(
return;
*ec = 0;
- // TODO(jorlow): This should be delete.
- idb_cursor->remove(
+ idb_cursor->deleteFunction(
new IndexedDBCallbacks<WebSerializedScriptValue>(parent_, response_id), *ec);
}
« no previous file with comments | « content/browser/in_process_webkit/indexed_db_dispatcher_host.h ('k') | content/common/indexed_db_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698