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

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

Issue 12326023: Proxy new WebData-based onSuccess() calls. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix more .data()-related android bustage Created 7 years, 10 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 b04e56f3ad85802b10265954e8a8c7ac79dd290e..1a3b151679933b0a3c30c577309babed50ab170b 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -48,7 +48,6 @@ using WebKit::WebIDBKey;
using WebKit::WebIDBMetadata;
using WebKit::WebIDBObjectStore;
using WebKit::WebSecurityOrigin;
-using WebKit::WebSerializedScriptValue;
using WebKit::WebVector;
namespace content {
@@ -275,9 +274,9 @@ void IndexedDBDispatcherHost::OnIDBFactoryDeleteDatabase(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
Context()->GetIDBFactory()->deleteDatabase(
params.name,
- new IndexedDBCallbacks<WebSerializedScriptValue>(this,
- params.ipc_thread_id,
- params.ipc_response_id),
+ new IndexedDBCallbacks<WebData>(this,
+ params.ipc_thread_id,
+ params.ipc_response_id),
WebSecurityOrigin::createFromDatabaseIdentifier(params.origin), NULL,
webkit_base::FilePathToWebString(indexed_db_path));
}
@@ -467,7 +466,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnGet(
return;
scoped_ptr<WebIDBCallbacks> callbacks(
- new IndexedDBCallbacks<WebSerializedScriptValue>(
+ new IndexedDBCallbacks<WebData>(
parent_, params.ipc_thread_id,
params.ipc_response_id));
database->get(parent_->HostTransactionId(params.transaction_id),
@@ -570,7 +569,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnCount(
return;
scoped_ptr<WebIDBCallbacks> callbacks(
- new IndexedDBCallbacks<WebSerializedScriptValue>(
+ new IndexedDBCallbacks<WebData>(
parent_, params.ipc_thread_id,
params.ipc_response_id));
database->count(
@@ -588,7 +587,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnDeleteRange(
return;
scoped_ptr<WebIDBCallbacks> callbacks(
- new IndexedDBCallbacks<WebSerializedScriptValue>(
+ new IndexedDBCallbacks<WebData>(
parent_, params.ipc_thread_id,
params.ipc_response_id));
database->deleteRange(parent_->HostTransactionId(params.transaction_id),
@@ -609,7 +608,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnClear(
return;
scoped_ptr<WebIDBCallbacks> callbacks(
- new IndexedDBCallbacks<WebSerializedScriptValue>(
+ new IndexedDBCallbacks<WebData>(
parent_, ipc_thread_id,
ipc_response_id));
@@ -806,8 +805,8 @@ void IndexedDBDispatcherHost::CursorDispatcherHost::OnDelete(
WebKit::WebExceptionCode ec = 0;
idb_cursor->deleteFunction(
- new IndexedDBCallbacks<WebSerializedScriptValue>(parent_, ipc_thread_id,
- ipc_response_id), ec);
+ new IndexedDBCallbacks<WebData>(parent_, ipc_thread_id,
+ ipc_response_id), ec);
DCHECK(!ec);
}
« no previous file with comments | « content/browser/in_process_webkit/indexed_db_callbacks.cc ('k') | content/common/indexed_db/indexed_db_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698