IndexedDB: chromium side of IDBCursor.advance().

content/common/indexed_db/indexed_db_dispatcher.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/common/indexed_db/indexed_db_dispatcher.h"
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
 #include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
@@ skipping 62 matching lines @@
 
 void IndexedDBDispatcher::OnWorkerRunLoopStopped() {
   delete this;
 }
 
 void IndexedDBDispatcher::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(IndexedDBDispatcher, msg)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIDBCursor,
                         OnSuccessOpenCursor)
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessCursorAdvance,
+                        OnSuccessCursorAdvance)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessCursorContinue,
                         OnSuccessCursorContinue)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessCursorPrefetch,
                         OnSuccessCursorPrefetch)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIDBDatabase,
                         OnSuccessIDBDatabase)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIndexedDBKey,
                         OnSuccessIndexedDBKey)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIDBTransaction,
                         OnSuccessIDBTransaction)
@@ skipping 36 matching lines @@
     return;
   }
   int32 response_id = pending_callbacks_.Add(callbacks.release());
   Send(
       new IndexedDBHostMsg_CursorUpdate(idb_cursor_id, CurrentWorkerId(),
                                         response_id, value, ec));
   if (*ec)
     pending_callbacks_.Remove(response_id);
 }
 
+void IndexedDBDispatcher::RequestIDBCursorAdvance(
+    unsigned long count,
+    WebIDBCallbacks* callbacks_ptr,
+    int32 idb_cursor_id,
+    WebExceptionCode* ec) {
+  // Reset all cursor prefetch caches except for this cursor.
+  ResetCursorPrefetchCaches(idb_cursor_id);
+
+  scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
+
+  int32 response_id = pending_callbacks_.Add(callbacks.release());
+  Send(new IndexedDBHostMsg_CursorAdvance(idb_cursor_id, CurrentWorkerId(),
+                                          response_id, count, ec));
+  if (*ec)
+    pending_callbacks_.Remove(response_id);
+}
+
 void IndexedDBDispatcher::RequestIDBCursorContinue(
     const IndexedDBKey& key,
     WebIDBCallbacks* callbacks_ptr,
     int32 idb_cursor_id,
     WebExceptionCode* ec) {
   // Reset all cursor prefetch caches except for this cursor.
   ResetCursorPrefetchCaches(idb_cursor_id);
 
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
@@ skipping 468 matching lines @@
     return;
 
   RendererWebIDBCursorImpl* cursor = new RendererWebIDBCursorImpl(object_id);
   cursors_[object_id] = cursor;
   cursor->SetKeyAndValue(key, primary_key, value);
   callbacks->onSuccess(cursor);
 
   pending_callbacks_.Remove(response_id);
 }
 
+void IndexedDBDispatcher::OnSuccessCursorAdvance(
+    const IndexedDBMsg_CallbacksSuccessCursorAdvance_Params& p) {
+  DCHECK_EQ(p.thread_id, CurrentWorkerId());
+  int32 response_id = p.response_id;

[jsbell, 2012/04/24 15:41:08]

This method is much simpler than OnSuccessCursorContinue - it doesn't have the
SetKeyAndValue() logic. Is that coming in a future patch or is it not needed
here?

[alecflett, 2012/04/24 16:34:22]

Oops, I removed this as an experiment, and thought I added it back. Now to make
a test that forces this to fail...

+
+  WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(response_id);
+  if (!callbacks)
+    return;
+  callbacks->onSuccessWithContinuation();
+
+  pending_callbacks_.Remove(response_id);
+}
+
 void IndexedDBDispatcher::OnSuccessCursorContinue(
     const IndexedDBMsg_CallbacksSuccessCursorContinue_Params& p) {
   DCHECK_EQ(p.thread_id, CurrentWorkerId());
   int32 response_id = p.response_id;
   int32 cursor_id = p.cursor_id;
   const IndexedDBKey& key = p.key;
   const IndexedDBKey& primary_key = p.primary_key;
   const content::SerializedScriptValue& value = p.serialized_value;
 
   RendererWebIDBCursorImpl* cursor = cursors_[cursor_id];
@@ skipping 77 matching lines @@
 }
 
 void IndexedDBDispatcher::ResetCursorPrefetchCaches(int32 exception_cursor_id) {
   typedef std::map<int32, RendererWebIDBCursorImpl*>::iterator Iterator;
   for (Iterator i = cursors_.begin(); i != cursors_.end(); ++i) {
     if (i->first == exception_cursor_id)
       continue;
     i->second->ResetPrefetchCache();
   }
 }