IndexedDB: Recycle cursor objects when calling continue().

content/browser/in_process_webkit/indexed_db_callbacks.h

 // 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.
 
 #ifndef CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_CALLBACKS_H_
 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_CALLBACKS_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ skipping 58 matching lines @@
     dispatcher_host()->Send(
         new typename WebIDBToMsgHelper<WebObjectType>::MsgType(response_id(),
                                                                object_id));
   }
 
  private:
   GURL origin_url_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBCallbacks);
 };
 
-// WebIDBCursor uses onSuccess(WebIDBCursor*) to indicate it has data, and
+// WebIDBCursor uses onSuccess(WebIDBCursor*) when a cursor has been opened,
+// onSuccessCursorContinue() when a continue() call has succeeded, or
 // onSuccess() without params 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 response_id)
-      : IndexedDBCallbacksBase(dispatcher_host, response_id) { }
+      IndexedDBDispatcherHost* dispatcher_host, int32 response_id,
+      int32 cursor_id)
+      : IndexedDBCallbacksBase(dispatcher_host, response_id)
+      , cursor_id_(cursor_id) { }

[michaeln, 2011/11/01 18:38:37]

chrome-style initializers don't put the ',' up front

[hans, 2011/11/02 17:16:58]

Done.

 
   virtual void onSuccess(WebKit::WebIDBCursor* idb_object);
   virtual void onSuccess(const WebKit::WebSerializedScriptValue& value);
+  virtual void onSuccessCursorContinue();
 
  private:
+  // The id of the cursor this callback concerns, or -1 if the cursor
+  // does not exist yet.
+  int32 cursor_id_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBCallbacks);
 };
 
 // WebIDBKey is implemented in WebKit as opposed to being an interface Chromium
 // implements.  Thus we pass a const ___& version and thus we need this
 // specialization.
 template <>
 class IndexedDBCallbacks<WebKit::WebIDBKey>
     : public IndexedDBCallbacksBase {
  public:
@@ skipping 35 matching lines @@
       IndexedDBDispatcherHost* dispatcher_host, int32 response_id)
       : IndexedDBCallbacksBase(dispatcher_host, response_id) { }
 
   virtual void onSuccess(const WebKit::WebSerializedScriptValue& value);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBCallbacks);
 };
 
 #endif  // CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_CALLBACKS_H_