IndexedDB API cleanup.

content/renderer/renderer_webidbcursor_impl.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.h"
 
 using WebKit::WebExceptionCode;
@@ skipping 28 matching lines @@
   return key;
 }
 
 WebIDBKey RendererWebIDBCursorImpl::primaryKey() const {
   IndexedDBKey primaryKey;
   RenderThread::current()->Send(
       new IndexedDBHostMsg_CursorPrimaryKey(idb_cursor_id_, &primaryKey));
   return primaryKey;
 }
 
-void RendererWebIDBCursorImpl::value(
-    WebSerializedScriptValue& webScriptValue,
-    WebIDBKey& webKey) const {
+WebSerializedScriptValue RendererWebIDBCursorImpl::value() const {
   SerializedScriptValue scriptValue;
-  IndexedDBKey key;
   RenderThread::current()->Send(
-      new IndexedDBHostMsg_CursorValue(idb_cursor_id_, &scriptValue,
-                                       &key));
-  // Only one or the other type should have been "returned" to us.
-  DCHECK(scriptValue.is_null() != (key.type() == WebIDBKey::InvalidType));
-  webScriptValue = scriptValue;
-  webKey = key;
+      new IndexedDBHostMsg_CursorValue(idb_cursor_id_, &scriptValue));
+  return scriptValue;
 }
 
 void RendererWebIDBCursorImpl::update(const WebSerializedScriptValue& value,
                                       WebIDBCallbacks* callbacks,
                                       WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBCursorUpdate(SerializedScriptValue(value), callbacks,
                                      idb_cursor_id_, &ec);
 }
 
 void RendererWebIDBCursorImpl::continueFunction(const WebIDBKey& key,
                                                 WebIDBCallbacks* callbacks,
                                                 WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBCursorContinue(IndexedDBKey(key), callbacks,
                                        idb_cursor_id_, &ec);
 }
 
-void RendererWebIDBCursorImpl::remove(WebIDBCallbacks* callbacks,
-                                      WebExceptionCode& ec) {
+void RendererWebIDBCursorImpl::deleteFunction(WebIDBCallbacks* callbacks,
+                                              WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBCursorDelete(callbacks, idb_cursor_id_, &ec);
 }