Diff
Modified: trunk/Source/WebCore/ChangeLog (159361 => 159362)
--- trunk/Source/WebCore/ChangeLog 2013-11-15 23:21:53 UTC (rev 159361)
+++ trunk/Source/WebCore/ChangeLog 2013-11-15 23:22:13 UTC (rev 159362)
@@ -1,5 +1,24 @@
2013-11-15 Brady Eidson <beid...@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 <beid...@apple.com>
+
Make IDBIndexWriter a LevelDB specific concept
https://bugs.webkit.org/show_bug.cgi?id=124434
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursorBackend.h (159361 => 159362)
--- trunk/Source/WebCore/Modules/indexeddb/IDBCursorBackend.h 2013-11-15 23:21:53 UTC (rev 159361)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursorBackend.h 2013-11-15 23:22:13 UTC (rev 159362)
@@ -29,6 +29,7 @@
#if ENABLE(INDEXED_DATABASE)
+#include "IDBBackingStoreCursorInterface.h"
#include "IDBDatabaseBackend.h"
#include "IDBTransactionBackend.h"
#include "SharedBuffer.h"
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.h (159361 => 159362)
--- trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.h 2013-11-15 23:21:53 UTC (rev 159361)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.h 2013-11-15 23:22:13 UTC (rev 159362)
@@ -67,8 +67,6 @@
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
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp (159361 => 159362)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp 2013-11-15 23:21:53 UTC (rev 159361)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp 2013-11-15 23:22:13 UTC (rev 159362)
@@ -352,11 +352,6 @@
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)
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.h (159361 => 159362)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.h 2013-11-15 23:21:53 UTC (rev 159361)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.h 2013-11-15 23:22:13 UTC (rev 159362)
@@ -28,7 +28,6 @@
#if ENABLE(INDEXED_DATABASE)
-#include "IDBBackingStoreCursorInterface.h"
#include "IDBDatabaseBackend.h"
#include "IDBDatabaseError.h"
#include "IDBOperation.h"
@@ -79,8 +78,6 @@
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:
Modified: trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.cpp (159361 => 159362)
--- trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.cpp 2013-11-15 23:21:53 UTC (rev 159361)
+++ trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.cpp 2013-11-15 23:22:13 UTC (rev 159362)
@@ -200,12 +200,6 @@
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)
Modified: trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h (159361 => 159362)
--- trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h 2013-11-15 23:21:53 UTC (rev 159361)
+++ trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBFactoryBackendLevelDB.h 2013-11-15 23:22:13 UTC (rev 159362)
@@ -65,8 +65,6 @@
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);
Modified: trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp (159361 => 159362)
--- trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp 2013-11-15 23:21:53 UTC (rev 159361)
+++ trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp 2013-11-15 23:22:13 UTC (rev 159362)
@@ -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 @@
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);
Modified: trunk/Source/WebKit2/ChangeLog (159361 => 159362)
--- trunk/Source/WebKit2/ChangeLog 2013-11-15 23:21:53 UTC (rev 159361)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-15 23:22:13 UTC (rev 159362)
@@ -1,3 +1,13 @@
+2013-11-15 Brady Eidson <beid...@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 <m...@apple.com>
Give the policy client the originating frame of a navigation action
Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp (159361 => 159362)
--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp 2013-11-15 23:21:53 UTC (rev 159361)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp 2013-11-15 23:22:13 UTC (rev 159362)
@@ -106,12 +106,6 @@
return 0;
}
-PassRefPtr<IDBCursorBackend> WebIDBFactoryBackend::createCursorBackend(IDBTransactionBackend&, IDBBackingStoreCursorInterface&, IndexedDB::CursorType, IDBDatabaseBackend::TaskType, int64_t)
-{
- notImplemented();
- return 0;
-}
-
} // namespace WebKit
#endif // ENABLE(DATABASE_PROCESS)
Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h (159361 => 159362)
--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h 2013-11-15 23:21:53 UTC (rev 159361)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h 2013-11-15 23:22:13 UTC (rev 159362)
@@ -47,8 +47,6 @@
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);
};
