Consolidate key, primary key, value cursor messages.

content/renderer/indexed_db_dispatcher.cc

 // Copyright (c) 2011 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/renderer/indexed_db_dispatcher.h"
 
 #include "content/common/indexed_db_messages.h"
 #include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "content/renderer/renderer_webidbcursor_impl.h"
@@ skipping 366 matching lines @@
   pending_callbacks_.Remove(response_id);
 }
 
 void IndexedDBDispatcher::OnSuccessIDBTransaction(int32 response_id,
                                                   int32 object_id) {
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);
   callbacks->onSuccess(new RendererWebIDBTransactionImpl(object_id));
   pending_callbacks_.Remove(response_id);
 }
 
 void IndexedDBDispatcher::OnSuccessSerializedScriptValue(

[michaeln, 2011/09/04 23:08:16]

OnSuccessOpenCursor() is the callback for the various create or open calls, but
isn't OnSuccessSerializedScriptValue() the callback for the continue or advance
calls? If so, does that msg/method also need to carry the additional 'key' and
'primary key' values.

I guess you'd need to know what cursor_id and a way to lookup a
RendererWebIDBCursorImpl for that id, then it be a simple matter of calling...

  cursor->setCurrentKeyAndValue(key, primary_key, value);
  onSuccess(value);

[dgrogan, 2011/09/07 01:15:19]

OnSuccessOpenCursor is also used for a successful continue.  Confusing.

It looks like cursor only calls OnSuccessSerializedScriptValue when the cursor
has run out of elements.  The value in that case is null, so I think it's ok to
not set the other things.

http://codesearch.google.com/codesearch#OAMlx_jo-ck/src/third_party/WebKit/So...

     int32 response_id, const SerializedScriptValue& value) {
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);
   callbacks->onSuccess(value);
   pending_callbacks_.Remove(response_id);
 }
 
 void IndexedDBDispatcher::OnSuccessOpenCursor(int32 repsonse_id,
-                                              int32 object_id) {
+    int32 object_id, const IndexedDBKey& key, const IndexedDBKey& primaryKey,
+    const SerializedScriptValue& value) {
   WebIDBCallbacks* callbacks =
       pending_callbacks_.Lookup(repsonse_id);
-  callbacks->onSuccess(new RendererWebIDBCursorImpl(object_id));
+  callbacks->onSuccess(new RendererWebIDBCursorImpl(object_id), key,

[michaeln, 2011/09/04 23:08:16]

Might be nice if the Cursor class contained a single method to update these
three values all in one go, is there any reason to set one w/o setting the
others...

   cursor = new Cursor(id);
   cursor->setCurrentKeyAndValue(key, primary_key, value);
   onSuccess(cursor);

That same method could be useful in the continue/advance case as well.

+                       primaryKey, value);
   pending_callbacks_.Remove(repsonse_id);
 }
 
 void IndexedDBDispatcher::OnBlocked(int32 response_id) {
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);
   callbacks->onBlocked();
 }
 
 void IndexedDBDispatcher::OnError(int32 response_id, int code,
                                   const string16& message) {
@@ skipping 18 matching lines @@
 
 void IndexedDBDispatcher::OnVersionChange(int32 database_id,
                                           const string16& newVersion) {
   WebIDBDatabaseCallbacks* callbacks =
       pending_database_callbacks_.Lookup(database_id);
   // callbacks would be NULL if a versionchange event is received after close
   // has been called.
   if (callbacks)
     callbacks->onVersionChange(newVersion);
 }