IndexedDB: Simplify cursor data callbacks.

content/common/indexed_db/proxy_webidbcursor_impl.cc

 // Copyright (c) 2012 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/common/indexed_db/proxy_webidbcursor_impl.h"
 
 #include <vector>
 
 #include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
@@ skipping 19 matching lines @@
   // 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.
   IndexedDBDispatcher::Send(new IndexedDBHostMsg_CursorDestroyed(
       idb_cursor_id_));
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
   dispatcher->CursorDestroyed(idb_cursor_id_);
 }
 
-// TODO(jsbell): Remove the following method after WK92278 rolls.
-WebIDBKey RendererWebIDBCursorImpl::key() const {
-  return key_;
-}
-
-// TODO(jsbell): Remove the following method after WK92278 rolls.
-WebIDBKey RendererWebIDBCursorImpl::primaryKey() const {
-  return primary_key_;
-}
-
-// TODO(jsbell): Remove the following method after WK92278 rolls.
-WebSerializedScriptValue RendererWebIDBCursorImpl::value() const {
-  return value_;
-}
-
 void RendererWebIDBCursorImpl::advance(unsigned long count,
                                        WebIDBCallbacks* callbacks_ptr,
                                        WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
   ResetPrefetchCache();
   dispatcher->RequestIDBCursorAdvance(count, callbacks.release(),
                                       idb_cursor_id_, &ec);
 }
@@ skipping 51 matching lines @@
   // If the onsuccess callback called continue() on the cursor again,
   // and that continue was served by the prefetch cache, then
   // pending_onsuccess_callbacks_ would be incremented.
   // If not, it means the callback did something else, or nothing at all,
   // in which case we need to reset the cache.
 
   if (pending_onsuccess_callbacks_ == 0)
     ResetPrefetchCache();
 }
 
-// TODO(jsbell): Remove the following method after WK92278 rolls.
-void RendererWebIDBCursorImpl::SetKeyAndValue(
-    const IndexedDBKey& key,
-    const IndexedDBKey& primary_key,
-    const SerializedScriptValue& value) {
-  key_ = key;
-  primary_key_ = primary_key;
-  value_ = value;
-}
-
 void RendererWebIDBCursorImpl::SetPrefetchData(
     const std::vector<IndexedDBKey>& keys,
     const std::vector<IndexedDBKey>& primary_keys,
     const std::vector<SerializedScriptValue>& values) {
   prefetch_keys_.assign(keys.begin(), keys.end());
   prefetch_primary_keys_.assign(primary_keys.begin(), primary_keys.end());
   prefetch_values_.assign(values.begin(), values.end());
 
   used_prefetches_ = 0;
   pending_onsuccess_callbacks_ = 0;
 }
 
 void RendererWebIDBCursorImpl::CachedContinue(
     WebKit::WebIDBCallbacks* callbacks) {
   DCHECK_GT(prefetch_keys_.size(), 0ul);
   DCHECK(prefetch_primary_keys_.size() == prefetch_keys_.size());
   DCHECK(prefetch_values_.size() == prefetch_keys_.size());
 
-  // TODO(jsbell): Turn these three variables into locals after WK92278 rolls.
-  key_ = prefetch_keys_.front();
-  primary_key_ = prefetch_primary_keys_.front();
-  value_ = prefetch_values_.front();
+  IndexedDBKey key = prefetch_keys_.front();
+  IndexedDBKey primary_key = prefetch_primary_keys_.front();
+  SerializedScriptValue value = prefetch_values_.front();
 
   prefetch_keys_.pop_front();
   prefetch_primary_keys_.pop_front();
   prefetch_values_.pop_front();
   used_prefetches_++;
 
   pending_onsuccess_callbacks_++;
 
-  // TODO(jsbell): Remove the ...WithContinuation call after WK92278 rolls.
-  callbacks->onSuccessWithContinuation();
-  callbacks->onSuccess(key_, primary_key_, value_);
+  callbacks->onSuccess(key, primary_key, value);
 }
 
 void RendererWebIDBCursorImpl::ResetPrefetchCache() {
   continue_count_ = 0;
   prefetch_amount_ = kMinPrefetchAmount;
 
   if (!prefetch_keys_.size()) {
     // No prefetch cache, so no need to reset the cursor in the back-end.
     return;
   }
 
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
   dispatcher->RequestIDBCursorPrefetchReset(used_prefetches_,
                                             prefetch_keys_.size(),
                                             idb_cursor_id_);
   prefetch_keys_.clear();
   prefetch_primary_keys_.clear();
   prefetch_values_.clear();
 
   pending_onsuccess_callbacks_ = 0;
 }