IndexedDB: Recycle cursor objects when calling continue().

content/renderer/renderer_webidbcursor_impl.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/renderer_webidbcursor_impl.h"
 
 #include "content/common/indexed_db_messages.h"
 #include "content/renderer/indexed_db_dispatcher.h"
 #include "content/renderer/render_thread_impl.h"
 
@@ skipping 11 matching lines @@
       value_(value) {
 }
 
 RendererWebIDBCursorImpl::~RendererWebIDBCursorImpl() {
   // It's not possible for there to be pending callbacks that address this
   // object since inside WebKit, they hold a reference to the object wich owns
   // this object. But, if that ever changed, then we'd need to invalidate
   // 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 {
   int direction;
   RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_CursorDirection(idb_cursor_id_, &direction));
   return direction;
 }
 
 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,
                                       WebIDBCallbacks* callbacks,
                                       WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBCursorUpdate(
       content::SerializedScriptValue(value), callbacks, idb_cursor_id_, &ec);
 }
 
 void RendererWebIDBCursorImpl::continueFunction(const WebIDBKey& key,
                                                 WebIDBCallbacks* callbacks,
                                                 WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBCursorContinue(IndexedDBKey(key), callbacks,
                                        idb_cursor_id_, &ec);
 }
 
 void RendererWebIDBCursorImpl::deleteFunction(WebIDBCallbacks* callbacks,
                                               WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBCursorDelete(callbacks, idb_cursor_id_, &ec);
 }