IndexedDB: Simplify cursor data callbacks.

content/common/indexed_db/proxy_webidbcursor_impl.h

 // 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.
 
 #ifndef CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBCURSOR_IMPL_H_
 #define CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBCURSOR_IMPL_H_
 
 #include <deque>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "content/common/indexed_db/indexed_db_key.h"
 #include "content/public/common/serialized_script_value.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCursor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h"
 
 class RendererWebIDBCursorImpl : public WebKit::WebIDBCursor {
  public:
   explicit RendererWebIDBCursorImpl(int32 idb_cursor_id);
   virtual ~RendererWebIDBCursorImpl();
 
-  // TODO(jsbell): Remove the following three methods after WK92278 rolls.
-  virtual WebKit::WebIDBKey key() const;
-  virtual WebKit::WebIDBKey primaryKey() const;
-  virtual WebKit::WebSerializedScriptValue value() const;
   virtual void advance(unsigned long count,
                        WebKit::WebIDBCallbacks* callback,
                        WebKit::WebExceptionCode& ec);
   virtual void continueFunction(const WebKit::WebIDBKey& key,
                                 WebKit::WebIDBCallbacks* callback,
                                 WebKit::WebExceptionCode& ec);
   virtual void deleteFunction(WebKit::WebIDBCallbacks* callback,
                               WebKit::WebExceptionCode& ec);
   virtual void postSuccessHandlerCallback();
 
-  // TODO(jsbell): Remove the following method after WK92278 rolls.
-  void SetKeyAndValue(const content::IndexedDBKey& key,
-                      const content::IndexedDBKey& primary_key,
-                      const content::SerializedScriptValue& value);
   void SetPrefetchData(
       const std::vector<content::IndexedDBKey>& keys,
       const std::vector<content::IndexedDBKey>& primary_keys,
       const std::vector<content::SerializedScriptValue>& values);
 
   void CachedContinue(WebKit::WebIDBCallbacks* callbacks);
   void ResetPrefetchCache();
 
  private:
   int32 idb_cursor_id_;
 
-  // TODO(jsbell): Remove the following three members after WK92278 rolls.
-  content::IndexedDBKey key_;
-  content::IndexedDBKey primary_key_;
-  content::SerializedScriptValue value_;
-
   // Prefetch cache.
   std::deque<content::IndexedDBKey> prefetch_keys_;
   std::deque<content::IndexedDBKey> prefetch_primary_keys_;
   std::deque<content::SerializedScriptValue> prefetch_values_;
 
   // Number of continue calls that would qualify for a pre-fetch.
   int continue_count_;
 
   // Number of items used from the last prefetch.
   int used_prefetches_;
 
   // Number of onsuccess handlers we are waiting for.
   int pending_onsuccess_callbacks_;
 
   // Number of items to request in next prefetch.
   int prefetch_amount_;
 
   enum { kPrefetchContinueThreshold = 2 };
   enum { kMinPrefetchAmount = 5 };
   enum { kMaxPrefetchAmount = 100 };
 };
 
 #endif  // CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBCURSOR_IMPL_H_