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

content/browser/indexed_db/indexed_db_database.h

Index: content/browser/indexed_db/indexed_db_database.h
diff --git a/content/browser/indexed_db/indexed_db_database.h b/content/browser/indexed_db/indexed_db_database.h
index 37f69e030006cc8fcaaa039417995cb07ef43e6f..30f063c841ce65d3ff18abf7b3dd13736fc2e16a 100644
--- a/content/browser/indexed_db/indexed_db_database.h
+++ b/content/browser/indexed_db/indexed_db_database.h
@@ -5,61 +5,30 @@
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DATABASE_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DATABASE_H_
 
+#include <list>
+#include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
 #include "content/browser/indexed_db/indexed_db.h"
-#include "content/browser/indexed_db/indexed_db_database_error.h"
-#include "content/common/indexed_db/indexed_db_key.h"
-#include "content/common/indexed_db/indexed_db_key_path.h"
-#include "content/common/indexed_db/indexed_db_key_range.h"
+#include "content/browser/indexed_db/indexed_db_callbacks_wrapper.h"
+#include "content/browser/indexed_db/indexed_db_metadata.h"
+#include "content/browser/indexed_db/indexed_db_transaction_coordinator.h"
+#include "content/browser/indexed_db/list_set.h"
 
 namespace content {
 
-class IndexedDBCallbacksWrapper;
-class IndexedDBDatabaseCallbacksWrapper;
-struct IndexedDBDatabaseMetadata;
+class IndexedDBBackingStore;
+class IndexedDBFactory;
+class IndexedDBKey;
+class IndexedDBKeyPath;
+class IndexedDBKeyRange;
+class IndexedDBTransaction;
 
-// This is implemented by IndexedDBDatabaseImpl and optionally others (in order
-// to proxy calls across process barriers). All calls to these classes should be
-// non-blocking and trigger work on a background thread if necessary.
-class IndexedDBDatabase : public base::RefCounted<IndexedDBDatabase> {
+class CONTENT_EXPORT IndexedDBDatabase
+    : NON_EXPORTED_BASE(public base::RefCounted<IndexedDBDatabase>) {
  public:
-  virtual void CreateObjectStore(int64 transaction_id,
-                                 int64 object_store_id,
-                                 const string16& name,
-                                 const IndexedDBKeyPath& key_path,
-                                 bool auto_increment) = 0;
-  virtual void DeleteObjectStore(int64 transaction_id,
-                                 int64 object_store_id) = 0;
-  virtual void CreateTransaction(
-      int64 transaction_id,
-      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks,
-      const std::vector<int64>& object_store_ids,
-      uint16 mode) = 0;
-  virtual void Close(
-      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks) = 0;
-
-  // Transaction-specific operations.
-  virtual void Commit(int64 transaction_id) = 0;
-  virtual void Abort(int64 transaction_id) = 0;
-  virtual void Abort(int64 transaction_id,
-                     const IndexedDBDatabaseError& error) = 0;
-
-  virtual void CreateIndex(int64 transaction_id,
-                           int64 object_store_id,
-                           int64 index_id,
-                           const string16& name,
-                           const IndexedDBKeyPath& key_path,
-                           bool unique,
-                           bool multi_entry) = 0;
-  virtual void DeleteIndex(int64 transaction_id,
-                           int64 object_store_id,
-                           int64 index_id) = 0;
-
   enum TaskType {
     NORMAL_TASK = 0,
     PREEMPTIVE_TASK
@@ -71,59 +40,175 @@ class IndexedDBDatabase : public base::RefCounted<IndexedDBDatabase> {
     CURSOR_UPDATE
   };
 
+  typedef std::vector<IndexedDBKey> IndexKeys;
+
+  static const int64 kInvalidId = 0;
   static const int64 kMinimumIndexId = 30;
 
-  typedef std::vector<IndexedDBKey> IndexKeys;
+  static scoped_refptr<IndexedDBDatabase> Create(
+      const string16& name,
+      IndexedDBBackingStore* database,
+      IndexedDBFactory* factory,
+      const string16& unique_identifier);
+  scoped_refptr<IndexedDBBackingStore> BackingStore() const;
+
+  int64 id() const { return metadata_.id; }
+  void AddObjectStore(const IndexedDBObjectStoreMetadata& metadata,
+                      int64 new_max_object_store_id);
+  void RemoveObjectStore(int64 object_store_id);
+  void AddIndex(int64 object_store_id,
+                const IndexedDBIndexMetadata& metadata,
+                int64 new_max_index_id);
+  void RemoveIndex(int64 object_store_id, int64 index_id);
+
+  void OpenConnection(
+      scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
+      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks,
+      int64 transaction_id,
+      int64 version);
+  void DeleteDatabase(scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+  const IndexedDBDatabaseMetadata& metadata() const { return metadata_; }
+
+  void CreateObjectStore(int64 transaction_id,
+                         int64 object_store_id,
+                         const string16& name,
+                         const IndexedDBKeyPath& key_path,
+                         bool auto_increment);
+  void DeleteObjectStore(int64 transaction_id, int64 object_store_id);
+  void CreateTransaction(
+      int64 transaction_id,
+      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks,
+      const std::vector<int64>& object_store_ids,
+      uint16 mode);
+  void Close(scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks);
+
+  void Commit(int64 transaction_id);
+  void Abort(int64 transaction_id);
+  void Abort(int64 transaction_id, const IndexedDBDatabaseError& error);
 
-  virtual void Get(int64 transaction_id,
+  void CreateIndex(int64 transaction_id,
                    int64 object_store_id,
                    int64 index_id,
-                   scoped_ptr<IndexedDBKeyRange> key_range,
-                   bool key_only,
-                   scoped_refptr<IndexedDBCallbacksWrapper> callbacks) = 0;
-  // This will swap() with value.
-  virtual void Put(int64 transaction_id,
+                   const string16& name,
+                   const IndexedDBKeyPath& key_path,
+                   bool unique,
+                   bool multi_entry);
+  void DeleteIndex(int64 transaction_id, int64 object_store_id, int64 index_id);
+
+  IndexedDBTransactionCoordinator& transaction_coordinator() {
+    return transaction_coordinator_;
+  }
+
+  void TransactionStarted(IndexedDBTransaction* transaction);
+  void TransactionFinished(IndexedDBTransaction* transaction);
+  void TransactionFinishedAndCompleteFired(IndexedDBTransaction* transaction);
+  void TransactionFinishedAndAbortFired(IndexedDBTransaction* transaction);
+
+  void Get(int64 transaction_id,
+           int64 object_store_id,
+           int64 index_id,
+           scoped_ptr<IndexedDBKeyRange> key_range,
+           bool key_only,
+           scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+  void Put(int64 transaction_id,
+           int64 object_store_id,
+           std::vector<char>* value,
+           scoped_ptr<IndexedDBKey> key,
+           PutMode mode,
+           scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
+           const std::vector<int64>& index_ids,
+           const std::vector<IndexKeys>& index_keys);
+  void SetIndexKeys(int64 transaction_id,
+                    int64 object_store_id,
+                    scoped_ptr<IndexedDBKey> primary_key,
+                    const std::vector<int64>& index_ids,
+                    const std::vector<IndexKeys>& index_keys);
+  void SetIndexesReady(int64 transaction_id,
+                       int64 object_store_id,
+                       const std::vector<int64>& index_ids);
+  void OpenCursor(int64 transaction_id,
+                  int64 object_store_id,
+                  int64 index_id,
+                  scoped_ptr<IndexedDBKeyRange> key_range,
+                  indexed_db::CursorDirection,
+                  bool key_only,
+                  TaskType task_type,
+                  scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+  void Count(int64 transaction_id,
+             int64 object_store_id,
+             int64 index_id,
+             scoped_ptr<IndexedDBKeyRange> key_range,
+             scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+  void DeleteRange(int64 transaction_id,
                    int64 object_store_id,
-                   std::vector<char>* value,
-                   scoped_ptr<IndexedDBKey> key,
-                   PutMode mode,
-                   scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
-                   const std::vector<int64>& index_ids,
-                   const std::vector<IndexKeys>& index_keys) = 0;
-  virtual void SetIndexKeys(int64 transaction_id,
-                            int64 object_store_id,
-                            scoped_ptr<IndexedDBKey> primary_key,
-                            const std::vector<int64>& index_ids,
-                            const std::vector<IndexKeys>& index_keys) = 0;
-  virtual void SetIndexesReady(int64 transaction_id,
-                               int64 object_store_id,
-                               const std::vector<int64>& index_ids) = 0;
-  virtual void OpenCursor(
+                   scoped_ptr<IndexedDBKeyRange> key_range,
+                   scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+  void Clear(int64 transaction_id,
+             int64 object_store_id,
+             scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+
+ private:
+  friend class base::RefCounted<IndexedDBDatabase>;
+
+  IndexedDBDatabase(const string16& name,
+                    IndexedDBBackingStore* database,
+                    IndexedDBFactory* factory,
+                    const string16& unique_identifier);
+  ~IndexedDBDatabase();
+
+  bool IsOpenConnectionBlocked() const;
+  bool OpenInternal();
+  void RunVersionChangeTransaction(
+      scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
+      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks,
       int64 transaction_id,
-      int64 object_store_id,
-      int64 index_id,
-      scoped_ptr<IndexedDBKeyRange> key_range,
-      indexed_db::CursorDirection direction,
-      bool key_only,
-      TaskType task_type,
-      scoped_refptr<IndexedDBCallbacksWrapper> callbacks) = 0;
-  virtual void Count(int64 transaction_id,
-                     int64 object_store_id,
-                     int64 index_id,
-                     scoped_ptr<IndexedDBKeyRange> key_range,
-                     scoped_refptr<IndexedDBCallbacksWrapper> callbacks) = 0;
-  virtual void DeleteRange(
+      int64 requested_version);
+  void RunVersionChangeTransactionFinal(
+      scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
+      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks,
       int64 transaction_id,
-      int64 object_store_id,
-      scoped_ptr<IndexedDBKeyRange> key_range,
-      scoped_refptr<IndexedDBCallbacksWrapper> callbacks) = 0;
-  virtual void Clear(int64 transaction_id,
-                     int64 object_store_id,
-                     scoped_refptr<IndexedDBCallbacksWrapper> callbacks) = 0;
-
- protected:
-  virtual ~IndexedDBDatabase() {}
-  friend class base::RefCounted<IndexedDBDatabase>;
+      int64 requested_version);
+  size_t ConnectionCount() const;
+  void ProcessPendingCalls();
+
+  bool IsDeleteDatabaseBlocked() const;
+  void DeleteDatabaseFinal(scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+
+  class VersionChangeOperation;
+
+  // When a "versionchange" transaction aborts, these restore the back-end
+  // object hierarchy.
+  class VersionChangeAbortOperation;
+
+  scoped_refptr<IndexedDBBackingStore> backing_store_;
+  IndexedDBDatabaseMetadata metadata_;
+
+  string16 identifier_;
+  // This might not need to be a scoped_refptr since the factory's lifetime is
+  // that of the page group, but it's better to be conservitive than sorry.
+  scoped_refptr<IndexedDBFactory> factory_;
+
+  IndexedDBTransactionCoordinator transaction_coordinator_;
+  IndexedDBTransaction* running_version_change_transaction_;
+
+  typedef std::map<int64, IndexedDBTransaction*> TransactionMap;
+  TransactionMap transactions_;
+
+  class PendingOpenCall;
+  typedef std::list<PendingOpenCall*> PendingOpenCallList;
+  PendingOpenCallList pending_open_calls_;
+  scoped_ptr<PendingOpenCall> pending_run_version_change_transaction_call_;
+  scoped_ptr<PendingOpenCall> pending_second_half_open_;
+
+  class PendingDeleteCall;
+  typedef std::list<PendingDeleteCall*> PendingDeleteCallList;
+  PendingDeleteCallList pending_delete_calls_;
+
+  typedef list_set<scoped_refptr<IndexedDBDatabaseCallbacksWrapper> >
+      DatabaseCallbacksSet;
+  DatabaseCallbacksSet database_callbacks_set_;
+
+  bool closing_connection_;
 };
 
 }  // namespace content