IndexedDB: Eliminate WebIDBCursor wrapper

content/browser/indexed_db/indexed_db_callbacks.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/indexed_db/indexed_db_callbacks.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "content/browser/indexed_db/indexed_db_database_error.h"
@@ skipping 41 matching lines @@
 }
 
 void IndexedDBCallbacksBase::onUpgradeNeeded(
     long long old_version,
     WebIDBDatabaseImpl* database,
     const IndexedDBDatabaseMetadata& /*metadata*/,
     WebKit::WebIDBCallbacks::DataLoss data_loss) {
   NOTREACHED();
 }
 
-void IndexedDBCallbacksBase::onSuccess(WebIDBCursorImpl* idb_object,
+void IndexedDBCallbacksBase::onSuccess(IndexedDBCursor* idb_object,
                                        const IndexedDBKey& key,
                                        const IndexedDBKey& primaryKey,
                                        std::vector<char>* value) {
   NOTREACHED();
 }
 
 void IndexedDBCallbacksBase::onSuccess(const IndexedDBKey& key,
                                        const IndexedDBKey& primaryKey,
                                        std::vector<char>* value) {
   NOTREACHED();
@@ skipping 72 matching lines @@
   params.ipc_thread_id = ipc_thread_id();
   params.ipc_callbacks_id = ipc_callbacks_id();
   params.ipc_database_id = ipc_database_id;
   params.ipc_database_callbacks_id = ipc_database_callbacks_id_;
   params.old_version = old_version;
   params.idb_metadata = IndexedDBDispatcherHost::ConvertMetadata(metadata);
   params.data_loss = data_loss;
   dispatcher_host()->Send(new IndexedDBMsg_CallbacksUpgradeNeeded(params));
 }
 
-void IndexedDBCallbacks<WebIDBCursorImpl>::onSuccess(
-    WebIDBCursorImpl* idb_cursor,
+void IndexedDBCallbacks<IndexedDBCursor>::onSuccess(
+    IndexedDBCursor* idb_cursor,
     const IndexedDBKey& key,
     const IndexedDBKey& primaryKey,
     std::vector<char>* value) {
   int32 ipc_object_id = dispatcher_host()->Add(idb_cursor);
   IndexedDBMsg_CallbacksSuccessIDBCursor_Params params;
   params.ipc_thread_id = ipc_thread_id();
   params.ipc_callbacks_id = ipc_callbacks_id();
   params.ipc_cursor_id = ipc_object_id;
   params.key = key;
   params.primary_key = primaryKey;
   if (value && !value->empty())
     std::swap(params.value, *value);
   // TODO(alecflett): Avoid a copy here: the whole params object is
   // being copied into the message.
   dispatcher_host()->Send(new IndexedDBMsg_CallbacksSuccessIDBCursor(params));
 }
 
-void IndexedDBCallbacks<WebIDBCursorImpl>::onSuccess(std::vector<char>* value) {
+void IndexedDBCallbacks<IndexedDBCursor>::onSuccess(std::vector<char>* value) {
   std::vector<char> value_copy;
   if (value && !value->empty())
     std::swap(value_copy, *value);
   dispatcher_host()->Send(new IndexedDBMsg_CallbacksSuccessValue(
       ipc_thread_id(),
       ipc_callbacks_id(),
       // TODO(alecflett): avoid a copy here.
       value_copy));
 }
 
-void IndexedDBCallbacks<WebIDBCursorImpl>::onSuccess(
+void IndexedDBCallbacks<IndexedDBCursor>::onSuccess(
     const IndexedDBKey& key,
     const IndexedDBKey& primaryKey,
     std::vector<char>* value) {
   DCHECK_NE(ipc_cursor_id_, -1);
-  WebIDBCursorImpl* idb_cursor =
+  IndexedDBCursor* idb_cursor =
       dispatcher_host()->GetCursorFromId(ipc_cursor_id_);
 
   DCHECK(idb_cursor);
   if (!idb_cursor)
     return;
   IndexedDBMsg_CallbacksSuccessCursorContinue_Params params;
   params.ipc_thread_id = ipc_thread_id();
   params.ipc_callbacks_id = ipc_callbacks_id();
   params.ipc_cursor_id = ipc_cursor_id_;
   params.key = key;
   params.primary_key = primaryKey;
   if (value && !value->empty())
     std::swap(params.value, *value);
   // TODO(alecflett): Avoid a copy here: the whole params object is
   // being copied into the message.
   dispatcher_host()->Send(
       new IndexedDBMsg_CallbacksSuccessCursorContinue(params));
 }
 
-void IndexedDBCallbacks<WebIDBCursorImpl>::onSuccessWithPrefetch(
+void IndexedDBCallbacks<IndexedDBCursor>::onSuccessWithPrefetch(
     const std::vector<IndexedDBKey>& keys,
     const std::vector<IndexedDBKey>& primaryKeys,
     const std::vector<std::vector<char> >& values) {
   DCHECK_NE(ipc_cursor_id_, -1);
 
   std::vector<IndexedDBKey> msgKeys;
   std::vector<IndexedDBKey> msgPrimaryKeys;
 
   for (size_t i = 0; i < keys.size(); ++i) {
     msgKeys.push_back(keys[i]);
@@ skipping 65 matching lines @@
       ipc_thread_id(), ipc_callbacks_id()));
 }
 
 void IndexedDBCallbacks<std::vector<char> >::onSuccess(
     const IndexedDBKey& value) {
   dispatcher_host()->Send(new IndexedDBMsg_CallbacksSuccessIndexedDBKey(
       ipc_thread_id(), ipc_callbacks_id(), value));
 }
 
 }  // namespace content