IndexedDB: Send cursor data along with success messages

content/browser/in_process_webkit/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/in_process_webkit/indexed_db_callbacks.h"
 
 #include "content/common/indexed_db/indexed_db_messages.h"
 #include "webkit/quota/quota_manager.h"
 
 using content::IndexedDBKey;
@@ skipping 35 matching lines @@
                                                 origin_url_);
   int32 database_id = dispatcher_host()->Add(database, thread_id(),
                                              origin_url_);
   database_id_ = database_id;
   dispatcher_host()->Send(
       new IndexedDBMsg_CallbacksUpgradeNeeded(
           thread_id(), response_id(), transaction_id, database_id,
           old_version));
 }
 
+// TODO(jsbell): Remove this after WK92278 rolls.
 void IndexedDBCallbacks<WebKit::WebIDBCursor>::onSuccess(
     WebKit::WebIDBCursor* idb_object) {
   int32 object_id = dispatcher_host()->Add(idb_object);
   IndexedDBMsg_CallbacksSuccessIDBCursor_Params params;
   params.thread_id = thread_id();
   params.response_id = response_id();
   params.cursor_id = object_id;
   params.key = IndexedDBKey(idb_object->key());
   params.primary_key = IndexedDBKey(idb_object->primaryKey());
   params.serialized_value = SerializedScriptValue(idb_object->value());
   dispatcher_host()->Send(new IndexedDBMsg_CallbacksSuccessIDBCursor(params));
 }
 
 void IndexedDBCallbacks<WebKit::WebIDBCursor>::onSuccess(
+    WebKit::WebIDBCursor* idb_object,
+    const WebKit::WebIDBKey& key,
+    const WebKit::WebIDBKey& primaryKey,
+    const WebKit::WebSerializedScriptValue& value) {
+  int32 object_id = dispatcher_host()->Add(idb_object);
+  IndexedDBMsg_CallbacksSuccessIDBCursor_Params params;
+  params.thread_id = thread_id();
+  params.response_id = response_id();
+  params.cursor_id = object_id;
+  params.key = IndexedDBKey(key);
+  params.primary_key = IndexedDBKey(primaryKey);
+  params.serialized_value = SerializedScriptValue(value);
+  dispatcher_host()->Send(new IndexedDBMsg_CallbacksSuccessIDBCursor(params));
+}
+
+void IndexedDBCallbacks<WebKit::WebIDBCursor>::onSuccess(
     const WebKit::WebSerializedScriptValue& value) {
   dispatcher_host()->Send(
       new IndexedDBMsg_CallbacksSuccessSerializedScriptValue(
           thread_id(), response_id(), SerializedScriptValue(value)));
 }
 
+// TODO(jsbell): Remove this after WK92278 rolls.
 void IndexedDBCallbacks<WebKit::WebIDBCursor>::onSuccessWithContinuation() {
   DCHECK(cursor_id_ != -1);
   WebKit::WebIDBCursor* idb_cursor = dispatcher_host()->GetCursorFromId(
       cursor_id_);
 
   DCHECK(idb_cursor);
   if (!idb_cursor)
     return;
   IndexedDBMsg_CallbacksSuccessCursorContinue_Params params;
   params.thread_id = thread_id();
   params.response_id = response_id();
   params.cursor_id = cursor_id_;
   params.key = IndexedDBKey(idb_cursor->key());
   params.primary_key = IndexedDBKey(idb_cursor->primaryKey());
   params.serialized_value = SerializedScriptValue(idb_cursor->value());
-
   dispatcher_host()->Send(
       new IndexedDBMsg_CallbacksSuccessCursorContinue(params));
 }
+
+void IndexedDBCallbacks<WebKit::WebIDBCursor>::onSuccess(
+    const WebKit::WebIDBKey& key,
+    const WebKit::WebIDBKey& primaryKey,
+    const WebKit::WebSerializedScriptValue& value) {
+  DCHECK(cursor_id_ != -1);
+  WebKit::WebIDBCursor* idb_cursor = dispatcher_host()->GetCursorFromId(
+      cursor_id_);
+
+  DCHECK(idb_cursor);
+  if (!idb_cursor)
+    return;
+  IndexedDBMsg_CallbacksSuccessCursorContinue_Params params;
+  params.thread_id = thread_id();
+  params.response_id = response_id();
+  params.cursor_id = cursor_id_;
+  params.key = IndexedDBKey(key);
+  params.primary_key = IndexedDBKey(primaryKey);
+  params.serialized_value = SerializedScriptValue(value);
+  dispatcher_host()->Send(
+      new IndexedDBMsg_CallbacksSuccessCursorContinue(params));
+}
 
 void IndexedDBCallbacks<WebKit::WebIDBCursor>::onSuccessWithPrefetch(
     const WebKit::WebVector<WebKit::WebIDBKey>& keys,
     const WebKit::WebVector<WebKit::WebIDBKey>& primaryKeys,
     const WebKit::WebVector<WebKit::WebSerializedScriptValue>& values) {
   DCHECK(cursor_id_ != -1);
 
   std::vector<IndexedDBKey> msgKeys;
   std::vector<IndexedDBKey> msgPrimaryKeys;
   std::vector<SerializedScriptValue> msgValues;
@@ skipping 43 matching lines @@
 
 void IndexedDBCallbacks<WebKit::WebSerializedScriptValue>::onSuccess(
     const WebKit::WebSerializedScriptValue& value,
     const WebKit::WebIDBKey& primaryKey,
     const WebKit::WebIDBKeyPath& keyPath) {
   dispatcher_host()->Send(
       new IndexedDBMsg_CallbacksSuccessSerializedScriptValueWithKey(
           thread_id(), response_id(), SerializedScriptValue(value),
           IndexedDBKey(primaryKey), IndexedDBKeyPath(keyPath)));
 }