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..470ac4ed4a33458e3eb3967e908986384ef1976e 100644
--- a/content/renderer/renderer_webidbcursor_impl.cc
+++ b/content/renderer/renderer_webidbcursor_impl.cc
@@ -29,6 +29,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 {
@@ -39,15 +42,21 @@ unsigned short RendererWebIDBCursorImpl::direction() const {
 }
 
 WebIDBKey RendererWebIDBCursorImpl::key() const {
-  return key_;

[dgrogan, 2011/10/29 00:54:28]

I think you can delete these data members.

[hans, 2011/10/31 16:11:52]

Letting them stay, and removing the maps in the dispatcher instead. It seems
cleaner to let each cursor keep track of its values etc.

+  IndexedDBDispatcher* dispatcher =
+      RenderThreadImpl::current()->indexed_db_dispatcher();
+  return dispatcher->getCursorKey(idb_cursor_id_);
 }
 
 WebIDBKey RendererWebIDBCursorImpl::primaryKey() const {
-  return primary_key_;
+  IndexedDBDispatcher* dispatcher =
+      RenderThreadImpl::current()->indexed_db_dispatcher();
+  return dispatcher->getCursorPrimaryKey(idb_cursor_id_);
 }
 
 WebSerializedScriptValue RendererWebIDBCursorImpl::value() const {
-  return value_;
+  IndexedDBDispatcher* dispatcher =
+      RenderThreadImpl::current()->indexed_db_dispatcher();
+  return dispatcher->getCursorValue(idb_cursor_id_);
 }
 
 void RendererWebIDBCursorImpl::update(const WebSerializedScriptValue& value,