IndexedDB: Recycle cursor objects when calling continue().

content/renderer/renderer_webidbcursor_impl.cc

Index: content/renderer/renderer_webidbcursor_impl.cc
diff --git a/content/renderer/renderer_webidbcursor_impl.cc b/content/renderer/renderer_webidbcursor_impl.cc
index 82996f48cadacdbff0609c030749d67ba45e0195..845f49e34238faae897dc0f47a6f5bc9a015303a 100644
--- a/content/renderer/renderer_webidbcursor_impl.cc
+++ b/content/renderer/renderer_webidbcursor_impl.cc
@@ -13,13 +13,8 @@ using WebKit::WebIDBCallbacks;
 using WebKit::WebIDBKey;
 using WebKit::WebSerializedScriptValue;
 
-RendererWebIDBCursorImpl::RendererWebIDBCursorImpl(int32 idb_cursor_id,
-    const IndexedDBKey& key, const IndexedDBKey& primary_key,
-    const content::SerializedScriptValue& value)
-    : idb_cursor_id_(idb_cursor_id),
-      key_(key),
-      primary_key_(primary_key),
-      value_(value) {
+RendererWebIDBCursorImpl::RendererWebIDBCursorImpl(int32 idb_cursor_id)
+    : idb_cursor_id_(idb_cursor_id) {
 }
 
 RendererWebIDBCursorImpl::~RendererWebIDBCursorImpl() {
@@ -29,6 +24,9 @@ RendererWebIDBCursorImpl::~RendererWebIDBCursorImpl() {
   // any such pointers.
   RenderThreadImpl::current()->Send(new IndexedDBHostMsg_CursorDestroyed(
       idb_cursor_id_));
+  IndexedDBDispatcher* dispatcher =
+      RenderThreadImpl::current()->indexed_db_dispatcher();
+  dispatcher->CursorDestroyed(idb_cursor_id_);
 }
 
 unsigned short RendererWebIDBCursorImpl::direction() const {
@@ -74,3 +72,11 @@ void RendererWebIDBCursorImpl::deleteFunction(WebIDBCallbacks* callbacks,
       RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBCursorDelete(callbacks, idb_cursor_id_, &ec);
 }
+
+void RendererWebIDBCursorImpl::setKeyAndValue(const IndexedDBKey& key,

[michaeln, 2011/10/31 18:58:25]

nit: args should all line up

[hans, 2011/11/01 14:57:45]

Done.

+    const IndexedDBKey& primary_key,
+    const content::SerializedScriptValue& value) {
+  key_ = key;
+  primary_key_ = primary_key;
+  value_ = value;
+}