Diff
Modified: trunk/LayoutTests/ChangeLog (96792 => 96793)
--- trunk/LayoutTests/ChangeLog 2011-10-06 08:09:54 UTC (rev 96792)
+++ trunk/LayoutTests/ChangeLog 2011-10-06 09:00:08 UTC (rev 96793)
@@ -1,3 +1,15 @@
+2011-10-03 Hans Wennborg <h...@chromium.org>
+
+ IndexedDB: Remove SQLite-LevelDB migration code
+ https://bugs.webkit.org/show_bug.cgi?id=69264
+
+ Reviewed by Tony Chang.
+
+ Remove layout test covering migration.
+
+ * storage/indexeddb/migrate-basics-expected.txt: Removed.
+ * storage/indexeddb/migrate-basics.html: Removed.
+
2011-10-06 Philippe Normand <pnorm...@igalia.com>
Unreviewed, GTK rebaseline after r96620.
Deleted: trunk/LayoutTests/storage/indexeddb/migrate-basics-expected.txt (96792 => 96793)
--- trunk/LayoutTests/storage/indexeddb/migrate-basics-expected.txt 2011-10-06 08:09:54 UTC (rev 96792)
+++ trunk/LayoutTests/storage/indexeddb/migrate-basics-expected.txt 2011-10-06 09:00:08 UTC (rev 96793)
@@ -1,51 +0,0 @@
-Test migration from SQLite to LevelDB.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-webkitIndexedDB.open('MigrationDatabase')
-sqliteCreateSuccess():
-db = event.target.result
-db.setVersion('new version')
-sqliteSetVersionSuccess():
-window.db.createObjectStore('MigrationPlainOldStore', {autoIncrement: false})
-store = window.db.createObjectStore('MigrationStoreWithKeyPath', {keyPath: 'id', autoIncrement: true})
-window.db.createObjectStore('MigrationStoreWithAutoIncrement', {autoIncrement: true})
-trans = db.transaction([], webkitIDBTransaction.READ_WRITE)
-index = store.createIndex('ExampleIndex','id', false)
-sqliteTestAddRecords1():
-store = trans.objectStore('MigrationPlainOldStore')
-store = store.add({name: 'George'},1)
-sqliteTestAddRecords2():
-store = trans.objectStore('MigrationStoreWithKeyPath')
-store.add({name: 'Thomas', id: 3})
-sqliteTestAddRecords3():
-store = trans.objectStore('MigrationStoreWithAutoIncrement')
-store.add({name: 'Lincoln', number: '7012'}, 5)
-leveldbOpenSuccess():
-db = event.target.result
-trans = db.transaction([], webkitIDBTransaction.READ_WRITE, 0)
-leveldbCheckPlainOldStore():
-store = trans.objectStore('MigrationPlainOldStore')
-request = store.openCursor(keyRange)
-leveldbCheckPlainOldStoreCursorNext():
-PASS cursor.value.name == 'George' is true
-leveldbCheckPlainOldStoreCursorNext():
-leveldbCheckStoreWithKeyPath():
-store = trans.objectStore('MigrationStoreWithKeyPath')
-leveldbCheckStoreWithKeyPathCursorNext():
-PASS ((window.index = window.store.index('ExampleIndex')) != undefined) is true
-PASS (window.keyIndexCursor.key == 3) is true
-PASS cursor.value.name == 'Thomas' is true
-PASS cursor.value.id == '3' is true
-leveldbCheckStoreWithKeyPathCursorNext():
-leveldbCheckStoreWithAutoIncrement():
-store = trans.objectStore('MigrationStoreWithAutoIncrement')
-leveldbCheckStoreWithAutoIncrementCursorNext():
-PASS cursor.value.name == 'Lincoln' is true
-PASS cursor.value.number == '7012' is true
-leveldbCheckStoreWithAutoIncrementCursorNext():
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/storage/indexeddb/migrate-basics.html (96792 => 96793)
--- trunk/LayoutTests/storage/indexeddb/migrate-basics.html 2011-10-06 08:09:54 UTC (rev 96792)
+++ trunk/LayoutTests/storage/indexeddb/migrate-basics.html 2011-10-06 09:00:08 UTC (rev 96793)
@@ -1,208 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" href=""
-<script src=""
-<script src=""
-<script src=""
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-
-description("Test migration from SQLite to LevelDB.");
-
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
-
-function test()
-{
- if (window.layoutTestController)
- layoutTestController.setOverrideIndexedDBBackingStore("sqlite");
-
- request = evalAndLog("webkitIndexedDB.open('MigrationDatabase')");
- request._onsuccess_ = sqliteOpenSuccess;
- request._onerror_ = unexpectedErrorCallback;
-}
-
-function sqliteOpenSuccess()
-{
- debug("sqliteCreateSuccess():");
- window.db = evalAndLog("db = event.target.result");
-
- request = evalAndLog("db.setVersion('new version')");
- request._onsuccess_ = sqliteSetVersionSuccess;
- request._onerror_ = unexpectedErrorCallback;
-}
-
-function sqliteSetVersionSuccess()
-{
- debug("sqliteSetVersionSuccess():");
- evalAndLog("window.db.createObjectStore('MigrationPlainOldStore', {autoIncrement: false})");
- window.store = evalAndLog("store = window.db.createObjectStore('MigrationStoreWithKeyPath', {keyPath: 'id', autoIncrement: true})");
- evalAndLog("window.db.createObjectStore('MigrationStoreWithAutoIncrement', {autoIncrement: true})");
-
- window.trans = evalAndLog("trans = db.transaction([], webkitIDBTransaction.READ_WRITE)");
- window.index = evalAndLog("index = store.createIndex('ExampleIndex','id', false)");
-
- sqliteTestAddRecords1();
-}
-
-function sqliteTestAddRecords1()
-{
- debug("sqliteTestAddRecords1():");
- window.store = evalAndLog("store = trans.objectStore('MigrationPlainOldStore')");
- request = evalAndLog("store = store.add({name: 'George'},1)");
- request._onsuccess_ = sqliteTestAddRecords2;
- request._onfailure_ = unexpectedErrorCallback;
-}
-
-function sqliteTestAddRecords2()
-{
- debug("sqliteTestAddRecords2():");
- window.store = evalAndLog("store = trans.objectStore('MigrationStoreWithKeyPath')");
-
- request = evalAndLog("store.add({name: 'Thomas', id: 3})");
- request._onsuccess_ = sqliteTestAddRecords3;
- request._onfailure_ = unexpectedErrorCallback;
-}
-
-function sqliteTestAddRecords3()
-{
- debug("sqliteTestAddRecords3():");
- window.store = evalAndLog("store = trans.objectStore('MigrationStoreWithAutoIncrement')");
- request = evalAndLog("store.add({name: 'Lincoln', number: '7012'}, 5)");
- request._onsuccess_ = sqliteCloseDatabase;
- request._onfailure_ = unexpectedErrorCallback;
-}
-
-
-function sqliteCloseDatabase()
-{
- window.db.close();
- window.db = null;
- window.trans = null;
- leveldbOpen();
-}
-
-function leveldbOpen()
-{
- if (window.layoutTestController)
- layoutTestController.setOverrideIndexedDBBackingStore("leveldb");
-
- // This next line will trigger the migration.
- request = webkitIndexedDB.open('MigrationDatabase');
- request._onsuccess_ = leveldbOpenSuccess;
- request._onerror_ = unexpectedErrorCallback;
-}
-
-function leveldbOpenSuccess()
-{
- debug("leveldbOpenSuccess():");
- window.db = evalAndLog("db = event.target.result");
- window.trans = evalAndLog("trans = db.transaction([], webkitIDBTransaction.READ_WRITE, 0)");
- leveldbCheckPlainOldStore();
-}
-
-function leveldbCheckPlainOldStore()
-{
- debug("leveldbCheckPlainOldStore():");
- window.store = evalAndLog("store = trans.objectStore('MigrationPlainOldStore')");
- window.keyRange = webkitIDBKeyRange.lowerBound(0);
- request = evalAndLog("request = store.openCursor(keyRange)");
- if (!request) {
- testMigrationEnd();
- return;
- }
- request._onsuccess_ = leveldbCheckPlainOldStoreCursorNext;
- request._onerror_ = unexpectedErrorCallback;
-}
-
-function leveldbCheckPlainOldStoreCursorNext()
-{
- debug("leveldbCheckPlainOldStoreCursorNext():");
- window.cursor = event.target.result;
- if (!window.cursor) {
- leveldbCheckStoreWithKeyPath();
- return;
- }
-
- shouldBeTrue("cursor.value.name == 'George'");
- cursor.continue();
-}
-
-function leveldbCheckStoreWithKeyPath()
-{
- debug("leveldbCheckStoreWithKeyPath():");
- window.store = evalAndLog("store = trans.objectStore('MigrationStoreWithKeyPath')");
- var keyRange = webkitIDBKeyRange.lowerBound(0);
- request = store.openCursor(keyRange);
- request._onsuccess_ = leveldbCheckStoreWithKeyPathCursorNext;
- request._onerror_ = unexpectedErrorCallback;
-}
-
-function leveldbCheckStoreWithKeyPathCursorNext()
-{
- debug("leveldbCheckStoreWithKeyPathCursorNext():");
- window.cursor = event.target.result;
- if (!window.cursor) {
- leveldbCheckStoreWithAutoIncrement();
- return;
- }
-
- shouldBeTrue("((window.index = window.store.index('ExampleIndex')) != undefined)");
- openKeyCursor = window.index.openKeyCursor();
- openKeyCursor._onsuccess_ = leveldbCheckStoreWithKeyPathCursorNext2;
- openKeyCursor._onerror_ = unexpectedErrorCallback;
-}
-
-function leveldbCheckStoreWithKeyPathCursorNext2()
-{
- window.keyIndexCursor = event.target.result;
- shouldBeTrue("(window.keyIndexCursor.key == 3)");
- shouldBeTrue("cursor.value.name == 'Thomas'");
- shouldBeTrue("cursor.value.id == '3'");
- cursor.continue();
-}
-
-function leveldbCheckStoreWithAutoIncrement()
-{
- debug("leveldbCheckStoreWithAutoIncrement():");
- window.store = evalAndLog("store = trans.objectStore('MigrationStoreWithAutoIncrement')");
- var keyRange = webkitIDBKeyRange.lowerBound(0);
- request = store.openCursor(keyRange);
- request._onsuccess_ = leveldbCheckStoreWithAutoIncrementCursorNext;
- request._onerror_ = unexpectedErrorCallback;
-}
-function leveldbCheckStoreWithAutoIncrementCursorNext()
-{
- debug("leveldbCheckStoreWithAutoIncrementCursorNext():");
- window.cursor = event.target.result;
- if (!window.cursor) {
- testMigrationEnd();
- return;
- }
-
- shouldBeTrue("cursor.value.name == 'Lincoln'");
- shouldBeTrue("cursor.value.number == '7012'");
- cursor.continue();
-}
-
-
-function testMigrationEnd()
-{
- window.db.close();
- window.db = null;
- if (window.layoutTestController)
- layoutTestController.setOverrideIndexedDBBackingStore("default");
- layoutTestController.clearAllDatabases();
- done();
-}
-
-test();
-
-var successfullyParsed = true;
-
-</script>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (96792 => 96793)
--- trunk/Source/WebCore/ChangeLog 2011-10-06 08:09:54 UTC (rev 96792)
+++ trunk/Source/WebCore/ChangeLog 2011-10-06 09:00:08 UTC (rev 96793)
@@ -1,3 +1,18 @@
+2011-10-03 Hans Wennborg <h...@chromium.org>
+
+ IndexedDB: Remove SQLite-LevelDB migration code
+ https://bugs.webkit.org/show_bug.cgi?id=69264
+
+ Reviewed by Tony Chang.
+
+ Remove migration functionality.
+
+ Just removing code, so no new tests.
+
+ * storage/IDBFactoryBackendImpl.cpp:
+ (WebCore::IDBFactoryBackendImpl::open):
+ * storage/IDBFactoryBackendImpl.h:
+
2011-10-06 James Robinson <jam...@chromium.org>
[chromium] Remove USE(THREADED_COMPOSITING) from the tree
Modified: trunk/Source/WebCore/storage/IDBFactoryBackendImpl.cpp (96792 => 96793)
--- trunk/Source/WebCore/storage/IDBFactoryBackendImpl.cpp 2011-10-06 08:09:54 UTC (rev 96792)
+++ trunk/Source/WebCore/storage/IDBFactoryBackendImpl.cpp 2011-10-06 09:00:08 UTC (rev 96793)
@@ -33,7 +33,6 @@
#include "IDBDatabaseBackendImpl.h"
#include "IDBDatabaseException.h"
#include "IDBLevelDBBackingStore.h"
-#include "IDBObjectStoreBackendImpl.h"
#include "IDBSQLiteBackingStore.h"
#include "IDBTransactionCoordinator.h"
#include "SecurityOrigin.h"
@@ -115,23 +114,6 @@
}
// FIXME: Everything from now on should be done on another thread.
-
-#if USE(LEVELDB)
- if (backingStoreType == LevelDBBackingStore) {
- bool hasSQLBackingStore = IDBSQLiteBackingStore::backingStoreExists(securityOrigin.get(), name, dataDir);
-
- // LayoutTests: SQLite backing store may not exist on disk but may exist in cache.
- String cachedSqliteBackingStoreIdentifier = computeFileIdentifier(securityOrigin.get(), SQLiteBackingStore);
- if (!hasSQLBackingStore && (m_backingStoreMap.end() != m_backingStoreMap.find(cachedSqliteBackingStoreIdentifier)))
- hasSQLBackingStore = true;
-
- if (hasSQLBackingStore) {
- bool migrationSucceeded = migrateFromSQLiteToLevelDB(name, securityOrigin.get(), dataDir, maximumSize);
- UNUSED_PARAM(migrationSucceeded); // FIXME: When migration is actually implemented, we need error handling here.
- }
- }
-#endif
-
RefPtr<IDBBackingStore> backingStore = openBackingStore(securityOrigin, dataDir, maximumSize, backingStoreType);
if (!backingStore) {
callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UNKNOWN_ERR, "Internal error."));
@@ -168,129 +150,6 @@
return 0;
}
-#if USE(LEVELDB)
-
-static bool migrateObjectStores(PassRefPtr<IDBBackingStore> fromBackingStore, int64_t fromDatabaseId, PassRefPtr<IDBBackingStore> toBackingStore, int64_t toDatabaseId)
-{
- Vector<int64_t> fromObjStoreIds, toObjStoreIds;
- Vector<String> fromObjStoreNames, toObjStoreNames;
- Vector<String> fromKeyPaths, toKeyPaths;
- Vector<bool> fromAutoIncrement, toAutoIncrement;
-
- // Migrate objectStores. Check to see if the object store already exists in the target.
- fromBackingStore->getObjectStores(fromDatabaseId, fromObjStoreIds, fromObjStoreNames, fromKeyPaths, fromAutoIncrement);
-
- toBackingStore->getObjectStores(toDatabaseId, toObjStoreIds, toObjStoreNames, toKeyPaths, toAutoIncrement);
-
- for (unsigned i = 0; i < fromObjStoreIds.size(); i++) {
- if (toObjStoreNames.contains(fromObjStoreNames[i]))
- continue;
-
- int64_t assignedObjectStoreId = -1;
-
- RefPtr<IDBBackingStore::Transaction> trans = toBackingStore->createTransaction();
- trans->begin();
-
- if (!toBackingStore->createObjectStore(toDatabaseId, fromObjStoreNames[i], fromKeyPaths[i], fromAutoIncrement[i], assignedObjectStoreId))
- return false;
-
- RefPtr<IDBBackingStore::Cursor> cursor = fromBackingStore->openObjectStoreCursor(fromDatabaseId, fromObjStoreIds[i], 0, IDBCursor::NEXT);
- if (cursor) {
- do {
- RefPtr<IDBKey> key = cursor->key();
- RefPtr<IDBBackingStore::ObjectStoreRecordIdentifier> recordIdentifier = toBackingStore->createInvalidRecordIdentifier();
-
- if (!toBackingStore->putObjectStoreRecord(toDatabaseId, assignedObjectStoreId, *(key.get()), cursor->value(), recordIdentifier.get()))
- return false;
-
- } while (cursor->continueFunction());
- }
-
- // Populate any/all indexes for this objectstore.
- Vector<int64_t> idxIds;
- Vector<String> idxNames;
- Vector<String> idxKeyPaths;
- Vector<bool> idxUnique;
- fromBackingStore->getIndexes(fromDatabaseId, fromObjStoreIds[i], idxIds, idxNames, idxKeyPaths, idxUnique);
- for (unsigned j = 0; j < idxIds.size(); j++) {
- int64_t indexId = -1;
-
- if (!toBackingStore->createIndex(toDatabaseId, assignedObjectStoreId, idxNames[j], idxKeyPaths[j], idxUnique[j], indexId))
- return false;
-
- if (!IDBObjectStoreBackendImpl::populateIndex(*toBackingStore, toDatabaseId, assignedObjectStoreId, indexId, fromKeyPaths[i]))
- return false;
- }
-
- trans->commit();
- }
-
- return true;
-}
-#endif // #if USE(LEVELDB)
-
-bool IDBFactoryBackendImpl::migrateFromSQLiteToLevelDB(const String& name, SecurityOrigin* securityOrigin, const String& dataDir, int64_t maximumSize)
-{
-#if USE(LEVELDB)
- String fromUniqueIdentifier = computeUniqueIdentifier(name, securityOrigin, SQLiteBackingStore);
- String fromFileIdentifier = computeFileIdentifier(securityOrigin, SQLiteBackingStore);
- String toUniqueIdentifier = computeUniqueIdentifier(name, securityOrigin, LevelDBBackingStore);
- String toFileIdentifier = computeFileIdentifier(securityOrigin, LevelDBBackingStore);
- RefPtr<IDBTransactionCoordinator> transactionCoordinator = IDBTransactionCoordinator::create();
- RefPtr<IDBBackingStore> fromBackingStore;
- RefPtr<IDBDatabaseBackendImpl> fromDatabaseBackend;
- RefPtr<IDBBackingStore> toBackingStore;
-
-
- // Open "From" backing store and backend. When running LayoutTests, the
- // "from" database may be cached in this class instance, so look for it there first.
- IDBBackingStoreMap::iterator it = m_backingStoreMap.find(fromFileIdentifier);
- if (it != m_backingStoreMap.end())
- fromBackingStore = it->second;
- else
- fromBackingStore = IDBSQLiteBackingStore::open(securityOrigin, dataDir, maximumSize, fromFileIdentifier, this);
-
- if (!fromBackingStore)
- return false;
-
- IDBDatabaseBackendMap::iterator it2 = m_databaseBackendMap.find(fromUniqueIdentifier);
- if (it2 != m_databaseBackendMap.end())
- fromDatabaseBackend = it2->second;
- else {
- fromDatabaseBackend = IDBDatabaseBackendImpl::create(name, fromBackingStore.get(), transactionCoordinator.get(), this, fromUniqueIdentifier);
- m_databaseBackendMap.set(fromUniqueIdentifier, fromDatabaseBackend.get());
- }
-
- if (!fromDatabaseBackend)
- return false;
-
- // Open "To" database. First find out if it already exists -- this will determine if
- // it is safe to call IDBLevelDBBackingStore::extractIDBDatabaseMetaData.
- it = m_backingStoreMap.find(toFileIdentifier);
- if (it != m_backingStoreMap.end())
- toBackingStore = it->second;
- else
- toBackingStore = IDBLevelDBBackingStore::open(securityOrigin, dataDir, maximumSize, toFileIdentifier, this);
-
- if (!toBackingStore)
- return false;
-
-
- String toDatabaseName = fromDatabaseBackend->name();
- String toDatabaseVersion = fromDatabaseBackend->version();
- int64_t toDatabaseId = -1;
-
- if (!toBackingStore->extractIDBDatabaseMetaData(toDatabaseName, toDatabaseVersion, toDatabaseId)) {
- if (!toBackingStore->setIDBDatabaseMetaData(toDatabaseName, toDatabaseVersion, toDatabaseId, true))
- return false;
- }
-
- return migrateObjectStores(fromBackingStore, fromDatabaseBackend->id(), toBackingStore, toDatabaseId);
-
-#endif // USE(LEVELDB)
- return false;
-}
-
} // namespace WebCore
#endif // ENABLE(INDEXED_DATABASE)
Modified: trunk/Source/WebCore/storage/IDBFactoryBackendImpl.h (96792 => 96793)
--- trunk/Source/WebCore/storage/IDBFactoryBackendImpl.h 2011-10-06 08:09:54 UTC (rev 96792)
+++ trunk/Source/WebCore/storage/IDBFactoryBackendImpl.h 2011-10-06 09:00:08 UTC (rev 96793)
@@ -61,7 +61,6 @@
private:
IDBFactoryBackendImpl();
PassRefPtr<IDBBackingStore> openBackingStore(PassRefPtr<SecurityOrigin>, const String& dataDir, int64_t maximumSize, BackingStoreType);
- bool migrateFromSQLiteToLevelDB(const String& name, SecurityOrigin*, const String& dataDir, int64_t maximumSize);
typedef HashMap<String, IDBDatabaseBackendImpl*> IDBDatabaseBackendMap;
IDBDatabaseBackendMap m_databaseBackendMap;
Modified: trunk/Source/WebKit/chromium/ChangeLog (96792 => 96793)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-06 08:09:54 UTC (rev 96792)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-06 09:00:08 UTC (rev 96793)
@@ -1,3 +1,18 @@
+2011-10-03 Hans Wennborg <h...@chromium.org>
+
+ IndexedDB: Remove SQLite-LevelDB migration code
+ https://bugs.webkit.org/show_bug.cgi?id=69264
+
+ Reviewed by Tony Chang.
+
+ Remove setOverrideBackingStoreType. It was used in the layout test
+ for migration.
+
+ * public/WebIDBFactory.h:
+ * src/WebIDBFactoryImpl.cpp:
+ (WebKit::WebIDBFactoryImpl::getDatabaseNames):
+ (WebKit::WebIDBFactoryImpl::open):
+
2011-10-06 James Robinson <jam...@chromium.org>
[chromium] Remove USE(THREADED_COMPOSITING) from the tree
Modified: trunk/Source/WebKit/chromium/public/WebIDBFactory.h (96792 => 96793)
--- trunk/Source/WebKit/chromium/public/WebIDBFactory.h 2011-10-06 08:09:54 UTC (rev 96792)
+++ trunk/Source/WebKit/chromium/public/WebIDBFactory.h 2011-10-06 09:00:08 UTC (rev 96793)
@@ -63,9 +63,6 @@
virtual void open(const WebString& name, WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir, unsigned long long maximumSize, BackingStoreType) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void deleteDatabase(const WebString& name, WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
-
- // Used for DumpRenderTree tests.
- WEBKIT_EXPORT static void setOverrideBackingStoreType(BackingStoreType);
};
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.cpp (96792 => 96793)
--- trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.cpp 2011-10-06 08:09:54 UTC (rev 96792)
+++ trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.cpp 2011-10-06 09:00:08 UTC (rev 96793)
@@ -44,18 +44,11 @@
namespace WebKit {
-static WebIDBFactory::BackingStoreType overriddenBackingStoreType = WebIDBFactory::DefaultBackingStore;
-
WebIDBFactory* WebIDBFactory::create()
{
return new WebIDBFactoryImpl();
}
-void WebIDBFactory::setOverrideBackingStoreType(BackingStoreType type)
-{
- overriddenBackingStoreType = type;
-}
-
WebIDBFactoryImpl::WebIDBFactoryImpl()
: m_idbFactoryBackend(IDBFactoryBackendImpl::create())
{
@@ -69,11 +62,6 @@
{
WebString path = dataDir;
- if (overriddenBackingStoreType != DefaultBackingStore) {
- // Backing store type overridden by LayoutTestController.
- backingStoreType = overriddenBackingStoreType;
- }
-
if (backingStoreType == DefaultBackingStore)
backingStoreType = LevelDBBackingStore;
@@ -85,11 +73,6 @@
{
WebString path = dataDir;
- if (overriddenBackingStoreType != DefaultBackingStore) {
- // Backing store type overridden by LayoutTestController.
- backingStoreType = overriddenBackingStoreType;
- }
-
if (backingStoreType == DefaultBackingStore)
backingStoreType = LevelDBBackingStore;
Modified: trunk/Tools/ChangeLog (96792 => 96793)
--- trunk/Tools/ChangeLog 2011-10-06 08:09:54 UTC (rev 96792)
+++ trunk/Tools/ChangeLog 2011-10-06 09:00:08 UTC (rev 96793)
@@ -1,3 +1,17 @@
+2011-10-03 Hans Wennborg <h...@chromium.org>
+
+ IndexedDB: Remove SQLite-LevelDB migration code
+ https://bugs.webkit.org/show_bug.cgi?id=69264
+
+ Reviewed by Tony Chang.
+
+ Remove setOverrideIndexedDBBackingStore. It was used in the layout
+ test for migration.
+
+ * DumpRenderTree/chromium/LayoutTestController.cpp:
+ (LayoutTestController::LayoutTestController):
+ * DumpRenderTree/chromium/LayoutTestController.h:
+
2011-10-05 James Robinson <jam...@chromium.org>
[chromium] Add a command line option to DumpRenderTree and run_webkit_tests.py to enable threaded compositing mode
Modified: trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp (96792 => 96793)
--- trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2011-10-06 08:09:54 UTC (rev 96792)
+++ trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2011-10-06 09:00:08 UTC (rev 96793)
@@ -170,7 +170,6 @@
bindMethod("setMockDeviceOrientation", &LayoutTestController::setMockDeviceOrientation);
bindMethod("setMockGeolocationError", &LayoutTestController::setMockGeolocationError);
bindMethod("setMockGeolocationPosition", &LayoutTestController::setMockGeolocationPosition);
- bindMethod("setOverrideIndexedDBBackingStore", &LayoutTestController::setOverrideIndexedDBBackingStore);
bindMethod("setPageVisibility", &LayoutTestController::setPageVisibility);
bindMethod("setPluginsEnabled", &LayoutTestController::setPluginsEnabled);
bindMethod("setPopupBlockingEnabled", &LayoutTestController::setPopupBlockingEnabled);
@@ -1113,22 +1112,6 @@
result->setNull();
}
-void LayoutTestController::setOverrideIndexedDBBackingStore(const CppArgumentList& arguments, CppVariant* result)
-{
- result->setNull();
-#if ENABLE(INDEXED_DATABASE)
- if (arguments.size() < 1 || !arguments[0].isString())
- return;
- string name = arguments[0].toString();
- if (name == "default")
- WebIDBFactory::setOverrideBackingStoreType(WebIDBFactory::DefaultBackingStore);
- else if (name == "sqlite")
- WebIDBFactory::setOverrideBackingStoreType(WebIDBFactory::SQLiteBackingStore);
- else if (name == "leveldb")
- WebIDBFactory::setOverrideBackingStoreType(WebIDBFactory::LevelDBBackingStore);
-#endif
-}
-
void LayoutTestController::callShouldCloseOnWebView(const CppArgumentList&, CppVariant* result)
{
result->set(m_shell->webView()->dispatchBeforeUnloadEvent());
Modified: trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h (96792 => 96793)
--- trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h 2011-10-06 08:09:54 UTC (rev 96792)
+++ trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h 2011-10-06 09:00:08 UTC (rev 96793)
@@ -315,8 +315,6 @@
void clearAllDatabases(const CppArgumentList&, CppVariant*);
// Sets the default quota for all origins
void setDatabaseQuota(const CppArgumentList&, CppVariant*);
- // Overrides the backend for IndexedDB
- void setOverrideIndexedDBBackingStore(const CppArgumentList&, CppVariant*);
// Calls setlocale(LC_ALL, ...) for a specified locale.
// Resets between tests.
