IndexedDB: Eliminate interfaces for IndexedDB{Factory,Database,Cursor}

content/browser/indexed_db/indexed_db_cursor.h

Index: content/browser/indexed_db/indexed_db_cursor.h
diff --git a/content/browser/indexed_db/indexed_db_cursor.h b/content/browser/indexed_db/indexed_db_cursor.h
index 7156c90fb99846adc1b786b60e94a13aae4c008c..290d92050609c6fd42fa40e797823ff601827354 100644
--- a/content/browser/indexed_db/indexed_db_cursor.h
+++ b/content/browser/indexed_db/indexed_db_cursor.h
@@ -5,30 +5,82 @@
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CURSOR_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CURSOR_H_
 
+#include <vector>
+
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "content/common/indexed_db/indexed_db_key.h"
+#include "base/memory/scoped_ptr.h"
+#include "content/browser/indexed_db/indexed_db_backing_store.h"
+#include "content/browser/indexed_db/indexed_db_database.h"
+#include "content/common/indexed_db/indexed_db_key_range.h"
 
 namespace content {
 
-class IndexedDBCallbacksWrapper;
+class IndexedDBDatabase;
+class IndexedDBTransaction;
 
-class IndexedDBCursor : public base::RefCounted<IndexedDBCursor> {
+class CONTENT_EXPORT IndexedDBCursor
+    : NON_EXPORTED_BASE(public base::RefCounted<IndexedDBCursor>) {
  public:
-  virtual void Advance(uint32 count,
-                       scoped_refptr<IndexedDBCallbacksWrapper> callbacks) = 0;
-  virtual void ContinueFunction(
-      scoped_ptr<IndexedDBKey> key,
-      scoped_refptr<IndexedDBCallbacksWrapper> callbacks) = 0;
-  virtual void PrefetchContinue(
-      int number_to_fetch,
-      scoped_refptr<IndexedDBCallbacksWrapper> callbacks) = 0;
-  virtual void PrefetchReset(int used_prefetches, int unused_prefetches) = 0;
-  virtual void PostSuccessHandlerCallback() = 0;
-
- protected:
-  virtual ~IndexedDBCursor() {}
+  static scoped_refptr<IndexedDBCursor> Create(
+      scoped_ptr<IndexedDBBackingStore::Cursor> cursor,
+      indexed_db::CursorType cursor_type,
+      IndexedDBTransaction* transaction) {
+    return make_scoped_refptr(
+        new IndexedDBCursor(cursor.Pass(),
+                            cursor_type,
+                            IndexedDBDatabase::NORMAL_TASK,
+                            transaction));
+  }
+  static scoped_refptr<IndexedDBCursor> Create(
+      scoped_ptr<IndexedDBBackingStore::Cursor> cursor,
+      indexed_db::CursorType cursor_type,
+      IndexedDBDatabase::TaskType task_type,
+      IndexedDBTransaction* transaction) {
+    return make_scoped_refptr(new IndexedDBCursor(
+        cursor.Pass(), cursor_type, task_type, transaction));
+  }
+
+  // IndexedDBCursor
+  void Advance(uint32 count,
+               scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+  void ContinueFunction(scoped_ptr<IndexedDBKey> key,
+                        scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+  void PrefetchContinue(int number_to_fetch,
+                        scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+  void PrefetchReset(int used_prefetches, int unused_prefetches);
+
+  const IndexedDBKey& key() const { return cursor_->key(); }
+  const IndexedDBKey& primary_key() const { return cursor_->primary_key(); }
+  std::vector<char>* Value() const {
+    return (cursor_type_ == indexed_db::CURSOR_KEY_ONLY) ? NULL
+                                                         : cursor_->Value();
+  }
+  void Close();
+
+ private:
   friend class base::RefCounted<IndexedDBCursor>;
+
+  IndexedDBCursor(scoped_ptr<IndexedDBBackingStore::Cursor> cursor,
+                  indexed_db::CursorType cursor_type,
+                  IndexedDBDatabase::TaskType task_type,
+                  IndexedDBTransaction* transaction);
+  ~IndexedDBCursor();
+
+  class CursorIterationOperation;
+  class CursorAdvanceOperation;
+  class CursorPrefetchIterationOperation;
+
+  IndexedDBDatabase::TaskType task_type_;
+  indexed_db::CursorType cursor_type_;
+  const scoped_refptr<IndexedDBTransaction> transaction_;
+
+  // Must be destroyed before transaction_.
+  scoped_ptr<IndexedDBBackingStore::Cursor> cursor_;
+  // Must be destroyed before transaction_.
+  scoped_ptr<IndexedDBBackingStore::Cursor> saved_cursor_;
+
+  bool closed_;
 };
 
 }  // namespace content