IndexedDB: Send cursor data along with success messages

content/browser/in_process_webkit/indexed_db_callbacks.h

 // 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.
 
 #ifndef CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_CALLBACKS_H_
 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_CALLBACKS_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h"
@@ skipping 87 matching lines @@
     NOTREACHED();
   }
 
 
  private:
   GURL origin_url_;
   int32 database_id_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBCallbacks);
 };
 
+// TODO(jsbell): Remove this preamble comment after WK92278 rolls.
+// Pre WK92278:
 // WebIDBCursor uses onSuccess(WebIDBCursor*) when a cursor has been opened,
 // onSuccessWithContinuation() when a continue() call has succeeded, or
 // onSuccess(SerializedScriptValue::nullValue()) to indicate it does
 // not contain any data, i.e., there is no key within the key range,
 // or it has reached the end.
+// Post WK92278:
+// WebIDBCursor uses:
+// * onSuccess(WebIDBCursor*, WebIDBKey, WebIDBKey, SerializedScriptValue)
+//   when an openCursor()/openKeyCursor() call has succeeded,
+// * onSuccess(WebIDBKey, WebIDBKey, SerializedScriptValue)
+//   when an advance()/continue() call has succeeded, or
+// * onSuccess(SerializedScriptValue::nullValue())
+//   to indicate it does not contain any data, i.e., there is no key within
+//   the key range, or it has reached the end.
 template <>
 class IndexedDBCallbacks<WebKit::WebIDBCursor>
     : public IndexedDBCallbacksBase {
  public:
   IndexedDBCallbacks(
       IndexedDBDispatcherHost* dispatcher_host,
       int32 thread_id,
       int32 response_id,
       int32 cursor_id)
       : IndexedDBCallbacksBase(dispatcher_host, thread_id, response_id),
         cursor_id_(cursor_id) { }
 
+  // TODO(jsbell): Remove this after WK92278 rolls.
   virtual void onSuccess(WebKit::WebIDBCursor* idb_object);
+  virtual void onSuccess(WebKit::WebIDBCursor* idb_object,
+                         const WebKit::WebIDBKey& key,
+                         const WebKit::WebIDBKey& primaryKey,
+                         const WebKit::WebSerializedScriptValue& value);
+  virtual void onSuccess(const WebKit::WebIDBKey& key,
+                         const WebKit::WebIDBKey& primaryKey,
+                         const WebKit::WebSerializedScriptValue& value);
   virtual void onSuccess(const WebKit::WebSerializedScriptValue& value);
+  // TODO(jsbell): Remove this after WK92278 rolls.
   virtual void onSuccessWithContinuation();
   virtual void onSuccessWithPrefetch(
       const WebKit::WebVector<WebKit::WebIDBKey>& keys,
       const WebKit::WebVector<WebKit::WebIDBKey>& primaryKeys,
       const WebKit::WebVector<WebKit::WebSerializedScriptValue>& values);
 
  private:
   // The id of the cursor this callback concerns, or -1 if the cursor
   // does not exist yet.
   int32 cursor_id_;
@@ skipping 53 matching lines @@
   virtual void onSuccess(const WebKit::WebSerializedScriptValue& value);
   virtual void onSuccess(const WebKit::WebSerializedScriptValue& value,
                          const WebKit::WebIDBKey& key,
                          const WebKit::WebIDBKeyPath& keyPath);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBCallbacks);
 };
 
 #endif  // CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_CALLBACKS_H_