Merge IDBTransactionBackendInterface and IDBTransactionBackendImpl

[WebKit-https.git] / Source / WebCore / Modules / indexeddb / leveldb / IDBFactoryBackendLevelDB.h

diff --git a/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h b/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h
index 03caada..3c3c776 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h
+++ b/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h
@@ -49,9 +49,9 @@ class IDBDatabaseBackendImpl;
 
 class IDBFactoryBackendLevelDB : public IDBFactoryBackendInterface {
 public:
-    static PassRefPtr<IDBFactoryBackendLevelDB> create()
+    static PassRefPtr<IDBFactoryBackendLevelDB> create(const String& databaseDirectory)
     {
-        return adoptRef(new IDBFactoryBackendLevelDB());
+        return adoptRef(new IDBFactoryBackendLevelDB(databaseDirectory));
     }
     virtual ~IDBFactoryBackendLevelDB();
 
@@ -59,18 +59,20 @@ public:
     virtual void removeIDBDatabaseBackend(const String& uniqueIdentifier) OVERRIDE FINAL;
 
     virtual void getDatabaseNames(PassRefPtr<IDBCallbacks>, PassRefPtr<SecurityOrigin>, ScriptExecutionContext*, const String& dataDir) OVERRIDE FINAL;
-    virtual void open(const String& name, int64_t version, int64_t transactionId, PassRefPtr<IDBCallbacks>, PassRefPtr<IDBDatabaseCallbacks>, PassRefPtr<SecurityOrigin>, ScriptExecutionContext*, const String& dataDir) OVERRIDE FINAL;
+    virtual void open(const String& name, uint64_t version, int64_t transactionId, PassRefPtr<IDBCallbacks>, PassRefPtr<IDBDatabaseCallbacks>, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin) OVERRIDE FINAL;
 
     virtual void deleteDatabase(const String& name, PassRefPtr<IDBCallbacks>, PassRefPtr<SecurityOrigin>, ScriptExecutionContext*, const String& dataDir) OVERRIDE FINAL;
 
-    virtual PassRefPtr<IDBTransactionBackendInterface> maybeCreateTransactionBackend(IDBDatabaseBackendInterface*, int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>&, IndexedDB::TransactionMode) OVERRIDE FINAL;
+    virtual PassRefPtr<IDBTransactionBackend> maybeCreateTransactionBackend(IDBDatabaseBackendInterface*, int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>&, IndexedDB::TransactionMode) OVERRIDE FINAL;
 
+    virtual PassRefPtr<IDBCursorBackend> createCursorBackend(IDBTransactionBackend&, IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackendInterface::TaskType, int64_t objectStoreId);
 
 protected:
-    IDBFactoryBackendLevelDB();
-    virtual PassRefPtr<IDBBackingStoreLevelDB> openBackingStore(PassRefPtr<SecurityOrigin>, const String& dataDir);
+    virtual PassRefPtr<IDBBackingStoreLevelDB> openBackingStore(const SecurityOrigin&, const String& dataDir);
 
 private:
+    explicit IDBFactoryBackendLevelDB(const String& databaseDirectory);
+
     typedef HashMap<String, RefPtr<IDBDatabaseBackendImpl> > IDBDatabaseBackendMap;
     IDBDatabaseBackendMap m_databaseBackendMap;
 
@@ -79,8 +81,7 @@ private:
 
     HashSet<RefPtr<IDBBackingStoreLevelDB> > m_sessionOnlyBackingStores;
 
-    // Only one instance of the factory should exist at any given time.
-    static IDBFactoryBackendLevelDB* idbFactoryBackendImpl;
+    String m_databaseDirectory;
 };
 
 } // namespace WebCore