Commit 046ca9e7 authored by beidson@apple.com's avatar beidson@apple.com

Remove last vestiges of IDBBackingStore* from IDBTransactionBackend.

https://bugs.webkit.org/show_bug.cgi?id=124436

Reviewed by Tim Horton.

Source/WebCore:

* Modules/indexeddb/IDBFactoryBackendInterface.h: Removed createCursorBackend.
* Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.cpp: Removed createCursorBackend.
* Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h: Removed createCursorBackend.

* Modules/indexeddb/IDBCursorBackend.h:

* Modules/indexeddb/IDBTransactionBackend.cpp:
* Modules/indexeddb/IDBTransactionBackend.h:

* Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp:
(WebCore::IDBServerConnectionLevelDB::openCursor):

Source/WebKit2:

* WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp: Removed createCursorBackend.
* WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159362 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6fec6783
2013-11-15 Brady Eidson <beidson@apple.com>
Remove last vestiges of IDBBackingStore* from IDBTransactionBackend.
https://bugs.webkit.org/show_bug.cgi?id=124436
Reviewed by Tim Horton.
* Modules/indexeddb/IDBFactoryBackendInterface.h: Removed createCursorBackend.
* Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.cpp: Removed createCursorBackend.
* Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h: Removed createCursorBackend.
* Modules/indexeddb/IDBCursorBackend.h:
* Modules/indexeddb/IDBTransactionBackend.cpp:
* Modules/indexeddb/IDBTransactionBackend.h:
* Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp:
(WebCore::IDBServerConnectionLevelDB::openCursor):
2013-11-15 Brady Eidson <beidson@apple.com>
Make IDBIndexWriter a LevelDB specific concept
......
......@@ -29,6 +29,7 @@
#if ENABLE(INDEXED_DATABASE)
#include "IDBBackingStoreCursorInterface.h"
#include "IDBDatabaseBackend.h"
#include "IDBTransactionBackend.h"
#include "SharedBuffer.h"
......
......@@ -67,8 +67,6 @@ public:
virtual void removeIDBDatabaseBackend(const String& uniqueIdentifier) = 0;
virtual PassRefPtr<IDBTransactionBackend> maybeCreateTransactionBackend(IDBDatabaseBackend*, int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>& objectStoreIds, IndexedDB::TransactionMode) = 0;
virtual PassRefPtr<IDBCursorBackend> createCursorBackend(IDBTransactionBackend&, IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackend::TaskType, int64_t objectStoreId) = 0;
};
} // namespace WebCore
......
......@@ -352,11 +352,6 @@ void IDBTransactionBackend::scheduleClearObjectStoreOperation(int64_t objectStor
scheduleTask(ClearObjectStoreOperation::create(this, objectStoreId, callbacks));
}
PassRefPtr<IDBCursorBackend> IDBTransactionBackend::createCursorBackend(IDBBackingStoreCursorInterface& cursor, IndexedDB::CursorType cursorType, IDBDatabaseBackend::TaskType taskType, int64_t objectStoreId)
{
return m_database->factoryBackend().createCursorBackend(*this, cursor, cursorType, taskType, objectStoreId);
}
};
#endif // ENABLE(INDEXED_DATABASE)
......@@ -28,7 +28,6 @@
#if ENABLE(INDEXED_DATABASE)
#include "IDBBackingStoreCursorInterface.h"
#include "IDBDatabaseBackend.h"
#include "IDBDatabaseError.h"
#include "IDBOperation.h"
......@@ -79,8 +78,6 @@ public:
void scheduleDeleteRangeOperation(int64_t objectStoreId, PassRefPtr<IDBKeyRange>, PassRefPtr<IDBCallbacks>);
void scheduleClearObjectStoreOperation(int64_t objectStoreId, PassRefPtr<IDBCallbacks>);
PassRefPtr<IDBCursorBackend> createCursorBackend(IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackend::TaskType, int64_t objectStoreId);
int64_t id() const { return m_id; }
private:
......
......@@ -200,12 +200,6 @@ PassRefPtr<IDBTransactionBackend> IDBFactoryBackendLevelDB::maybeCreateTransacti
return IDBTransactionBackend::create(static_cast<IDBDatabaseBackend*>(backend), transactionId, databaseCallbacks, objectStoreIds, mode);
}
PassRefPtr<IDBCursorBackend> IDBFactoryBackendLevelDB::createCursorBackend(IDBTransactionBackend& transactionBackend, IDBBackingStoreCursorInterface& backingStoreCursor, IndexedDB::CursorType cursorType, IDBDatabaseBackend::TaskType taskType, int64_t objectStoreId)
{
return IDBCursorBackend::create(&backingStoreCursor, cursorType, taskType, &transactionBackend, objectStoreId);
}
} // namespace WebCore
#endif // ENABLE(INDEXED_DATABASE) && USE(LEVELDB)
......@@ -65,8 +65,6 @@ public:
virtual PassRefPtr<IDBTransactionBackend> maybeCreateTransactionBackend(IDBDatabaseBackend*, int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>&, IndexedDB::TransactionMode) OVERRIDE FINAL;
virtual PassRefPtr<IDBCursorBackend> createCursorBackend(IDBTransactionBackend&, IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackend::TaskType, int64_t objectStoreId);
protected:
virtual PassRefPtr<IDBBackingStoreLevelDB> openBackingStore(const SecurityOrigin&, const String& dataDir);
......
......@@ -32,6 +32,7 @@
#include "IDBBackingStoreLevelDB.h"
#include "IDBBackingStoreTransactionLevelDB.h"
#include "IDBCursorBackend.h"
#include "IDBFactoryBackendLevelDB.h"
#include "IDBIndexWriterLevelDB.h"
#include <wtf/MainThread.h>
......@@ -453,7 +454,8 @@ void IDBServerConnectionLevelDB::openCursor(IDBTransactionBackend& transaction,
IDBDatabaseBackend::TaskType taskType(static_cast<IDBDatabaseBackend::TaskType>(operation.taskType()));
RefPtr<IDBCursorBackend> cursor = transaction.createCursorBackend(*backingStoreCursor, operation.cursorType(), taskType, operation.objectStoreID());
RefPtr<IDBCursorBackend> cursor = IDBCursorBackend::create(backingStoreCursor, operation.cursorType(), taskType, &transaction, operation.objectStoreID());
operation.callbacks()->onSuccess(cursor, cursor->key(), cursor->primaryKey(), cursor->value());
EMPTY_ASYNC_COMPLETION_CALLBACK(completionCallback);
......
2013-11-15 Brady Eidson <beidson@apple.com>
Remove last vestiges of IDBBackingStore* from IDBTransactionBackend.
https://bugs.webkit.org/show_bug.cgi?id=124436
Reviewed by Tim Horton.
* WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp: Removed createCursorBackend.
* WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h:
2013-11-15 Dan Bernstein <mitz@apple.com>
Give the policy client the originating frame of a navigation action
......
......@@ -106,12 +106,6 @@ PassRefPtr<IDBTransactionBackend> WebIDBFactoryBackend::maybeCreateTransactionBa
return 0;
}
PassRefPtr<IDBCursorBackend> WebIDBFactoryBackend::createCursorBackend(IDBTransactionBackend&, IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackend::TaskType, int64_t)
{
notImplemented();
return 0;
}
} // namespace WebKit
#endif // ENABLE(DATABASE_PROCESS)
......
......@@ -47,8 +47,6 @@ public:
virtual PassRefPtr<WebCore::IDBTransactionBackend> maybeCreateTransactionBackend(WebCore::IDBDatabaseBackend*, int64_t transactionId, PassRefPtr<WebCore::IDBDatabaseCallbacks>, const Vector<int64_t>&, WebCore::IndexedDB::TransactionMode) OVERRIDE;
virtual PassRefPtr<WebCore::IDBCursorBackend> createCursorBackend(WebCore::IDBTransactionBackend&, WebCore::IDBBackingStoreCursorInterface&, WebCore::IndexedDB::CursorType, WebCore::IDBDatabaseBackend::TaskType, int64_t objectStoreId) OVERRIDE;
private:
explicit WebIDBFactoryBackend(const String& databaseDirectoryIdentifier);
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment