Diff
Modified: trunk/LayoutTests/ChangeLog (191757 => 191758)
--- trunk/LayoutTests/ChangeLog 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/LayoutTests/ChangeLog 2015-10-29 22:08:51 UTC (rev 191758)
@@ -1,3 +1,17 @@
+2015-10-29 Brady Eidson <beid...@apple.com>
+
+ Modern IDB: deleteObjectStore support.
+ https://bugs.webkit.org/show_bug.cgi?id=150673
+
+ Reviewed by Alex Christensen.
+
+ * storage/indexeddb/modern/deleteobjectstore-1-expected.txt: Added.
+ * storage/indexeddb/modern/deleteobjectstore-1.html: Added.
+ * storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures-expected.txt: Added.
+ * storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html: Added.
+ * storage/indexeddb/modern/idbobjectstore-get-failures-expected.txt: Added.
+ * storage/indexeddb/modern/idbobjectstore-get-failures.html: Added.
+
2015-10-29 Wenson Hsieh <wenson_hs...@apple.com>
Date input values should not overlap with menu list dropdown button on iOS
Added: trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1-expected.txt (0 => 191758)
--- trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1-expected.txt 2015-10-29 22:08:51 UTC (rev 191758)
@@ -0,0 +1,22 @@
+ALERT: Initial upgrade needed: Old version - 0 New version - 1
+ALERT: Initial upgrade versionchange transaction complete
+ALERT: Second upgrade needed: Old version - 1 New version - 2
+ALERT: Deleting object store
+ALERT: Second version change transaction abort
+ALERT: Success opening database connection - Starting final transaction
+ALERT: Value gotten was AH AH AH AH AH
+ALERT: Value gotten was AH AH AH AH AH
+ALERT: Value gotten was AH AH AH AH AH
+ALERT: Value gotten was AH AH AH AH AH
+ALERT: Value gotten was AH AH AH AH AH
+ALERT: Value gotten was AH AH AH AH AH
+ALERT: Value gotten was AH AH AH AH AH
+ALERT: Value gotten was AH AH AH AH AH
+ALERT: Value gotten was AH AH AH AH AH
+ALERT: Value gotten was AH AH AH AH AH
+ALERT: Final transaction complete
+ALERT: Done
+This test creates an object store then populates it, then commits that transaction.
+It then deletes it, but aborts that transaction.
+Finally it checks to make sure everything from step 1 is there as expected.
+
Added: trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1.html (0 => 191758)
--- trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1.html 2015-10-29 22:08:51 UTC (rev 191758)
@@ -0,0 +1,141 @@
+This test creates an object store then populates it, then commits that transaction.<br>
+It then deletes it, but aborts that transaction.<br>
+Finally it checks to make sure everything from step 1 is there as expected.<br>
+<script>
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ alert("Done");
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+var createRequest = window.indexedDB.open("DeleteObjectStore1Database", 1);
+
+createRequest._onupgradeneeded_ = function(event) {
+ alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ for (var i = 0; i < 10; ++i)
+ objectStore.put("AH AH AH AH AH", i + " puts");
+
+ versionTransaction._onabort_ = function(event) {
+ alert("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction._oncomplete_ = function(event) {
+ alert("Initial upgrade versionchange transaction complete");
+ continueTest1();
+ database.close();
+ }
+
+ versionTransaction._onerror_ = function(event) {
+ alert("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function getChecker(event) {
+ alert("Value gotten was " + event.target.result);
+}
+
+function continueTest1()
+{
+ var openRequest = window.indexedDB.open("DeleteObjectStore1Database", 2);
+
+ openRequest._onerror_ = function(event) {
+ alert("Request unexpected error - " + event);
+ done();
+ }
+ openRequest._onblocked_ = function(event) {
+ alert("Request unexpected blocked - " + event);
+ done();
+ }
+ openRequest._onsuccess_ = function(event) {
+ alert("Request unexpected success - " + event);
+ done();
+ }
+
+ openRequest._onupgradeneeded_ = function(event) {
+ alert("Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+ var versionTransaction = openRequest.transaction;
+ var database = event.target.result;
+ var objectStore = versionTransaction.objectStore("TestObjectStore");
+
+ alert("Deleting object store");
+ database.deleteObjectStore("TestObjectStore");
+
+ versionTransaction.abort();
+
+ versionTransaction._onabort_ = function(event) {
+ alert("Second version change transaction abort");
+ continueTest2();
+ database.close();
+ }
+
+ versionTransaction._oncomplete_ = function(event) {
+ alert("Second version change transaction unexpected complete");
+ done();
+ }
+
+ versionTransaction._onerror_ = function(event) {
+ alert("Second version change transaction unexpected error - " + event);
+ done();
+ }
+ }
+}
+
+function continueTest2()
+{
+ var openRequest = window.indexedDB.open("DeleteObjectStore1Database", 1);
+
+ openRequest._onerror_ = function(event) {
+ alert("Request unexpected error - " + event);
+ done();
+ }
+ openRequest._onblocked_ = function(event) {
+ alert("Request unexpected blocked - " + event);
+ done();
+ }
+ openRequest._onupgradeneeded_ = function(event) {
+ alert("Request unexpected upgradeneeded - " + event);
+ done();
+ }
+
+ openRequest._onsuccess_ = function(event) {
+ alert("Success opening database connection - Starting final transaction");
+ var database = event.target.result;
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ var request;
+ for (var i = 0; i < 10; ++i) {
+ request = objectStore.get(i + " puts");
+ request._onsuccess_ = getChecker;
+ }
+
+ transaction._onabort_ = function(event) {
+ alert("Final transaction unexpected abort");
+ done();
+ }
+
+ transaction._oncomplete_ = function(event) {
+ alert("Final transaction complete");
+ done();
+ }
+
+ transaction._onerror_ = function(event) {
+ alert("Final transaction unexpected error - " + event);
+ done();
+ }
+ }
+}
+</script>
Added: trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures-expected.txt (0 => 191758)
--- trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures-expected.txt 2015-10-29 22:08:51 UTC (rev 191758)
@@ -0,0 +1,11 @@
+ALERT: Initial upgrade needed: Old version - 0 New version - 1
+ALERT: Initial upgrade versionchange transaction complete
+ALERT: readwrite put success - about to try to delete an objectstore
+ALERT: Failed to deleteObjectStore without a versionchange transaction - Error: InvalidStateError: DOM Exception 11
+ALERT: readwrite transaction complete
+ALERT: Second upgrade needed: Old version - 1 New version - 2
+ALERT: Failed to deleteObjectStore with a non-existent objectstore - Error: NotFoundError: DOM IDBDatabase Exception 8
+ALERT: Failed to deleteObjectStore with an in-progress versionchange transaction that is inactive - Error: TransactionInactiveError: DOM IDBDatabase Exception 0
+ALERT: Second version change transaction complete
+ALERT: Done
+This tests some obvious failures that can happen while calling IDBDatabase.deleteObjectStore()
Added: trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html (0 => 191758)
--- trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html 2015-10-29 22:08:51 UTC (rev 191758)
@@ -0,0 +1,137 @@
+This tests some obvious failures that can happen while calling IDBDatabase.deleteObjectStore()
+<script>
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ alert("Done");
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+var createRequest = window.indexedDB.open("IDBDatabaseDeleteObjectStoreFailuresDatabase", 1);
+var database;
+
+createRequest._onupgradeneeded_ = function(event) {
+ alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ var request = objectStore.put("bar", "foo");
+
+ versionTransaction._onabort_ = function(event) {
+ alert("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction._oncomplete_ = function(event) {
+ alert("Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction._onerror_ = function(event) {
+ alert("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ var objectStore = transaction.objectStore("TestObjectStore");
+ var request = objectStore.put("baz", "foo");
+
+ request._onsuccess_ = function() {
+ alert("readwrite put success - about to try to delete an objectstore");
+ try {
+ database.deleteObjectStore("TestObjectStore");
+ } catch(e) {
+ alert("Failed to deleteObjectStore without a versionchange transaction - " + e);
+ }
+ }
+
+ transaction._onabort_ = function(event) {
+ alert("readwrite transaction unexpected aborted");
+ done();
+ }
+
+ transaction._oncomplete_ = function(event) {
+ alert("readwrite transaction complete");
+ continueTest2();
+ database.close();
+ }
+
+ transaction._onerror_ = function(event) {
+ alert("readwrite transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest2()
+{
+ var openRequest = window.indexedDB.open("IDBDatabaseDeleteObjectStoreFailuresDatabase", 2);
+
+ openRequest._onerror_ = function(event) {
+ alert("Request unexpected error - " + event);
+ done();
+ }
+ openRequest._onblocked_ = function(event) {
+ alert("Request unexpected blocked - " + event);
+ done();
+ }
+ openRequest._onsuccess_ = function(event) {
+ alert("Request unexpected success - " + event);
+ done();
+ }
+
+ openRequest._onupgradeneeded_ = function(event) {
+ alert("Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = openRequest.transaction;
+ database = event.target.result;
+
+ try {
+ database.deleteObjectStore("NonexistentObjectStore");
+ } catch(e) {
+ alert("Failed to deleteObjectStore with a non-existent objectstore - " + e);
+ }
+
+ // Queue up a whole bunch of puts to keep the transaction alive for awhile
+ var objectStore = versionTransaction.objectStore("TestObjectStore");
+ for (var i = 0; i < 10; ++i)
+ objectStore.put("AH AH AH AH AH", i + " puts");
+
+ // After the versionChange transaction becomes inactive, but while it's still in-progress, try to delete the objectstore
+ var tryInactiveDelete = function()
+ {
+ try {
+ database.deleteObjectStore("TestObjectStore");
+ } catch(e) {
+ alert("Failed to deleteObjectStore with an in-progress versionchange transaction that is inactive - " + e);
+ }
+ }
+
+ setTimeout(tryInactiveDelete, 0);
+
+ versionTransaction._onabort_ = function(event) {
+ alert("Second version change transaction unexpected abort");
+ done();
+ }
+
+ versionTransaction._oncomplete_ = function(event) {
+ alert("Second version change transaction complete");
+ done();
+ }
+
+ versionTransaction._onerror_ = function(event) {
+ alert("Second version change transaction unexpected error - " + event);
+ done();
+ }
+ }
+}
+</script>
Added: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures-expected.txt (0 => 191758)
--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures-expected.txt 2015-10-29 22:08:51 UTC (rev 191758)
@@ -0,0 +1,8 @@
+ALERT: Initial upgrade needed: Old version - 0 New version - 1
+ALERT: Failed to get record from object store with an invalid key
+ALERT: Failed to get record from object store that has been deleted
+ALERT: Initial upgrade versionchange transaction complete
+ALERT: Failed to get record from object store while the transaction is inactive
+ALERT: readonly transaction complete
+ALERT: Done
+This tests some obvious failures that can happen while calling IDBObjectStore.get().
Added: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures.html (0 => 191758)
--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures.html 2015-10-29 22:08:51 UTC (rev 191758)
@@ -0,0 +1,98 @@
+This tests some obvious failures that can happen while calling IDBObjectStore.get().
+<script>
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ alert("Done");
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+var createRequest = window.indexedDB.open("IDBObjectStoreGetFailuresDatabase", 1);
+var database;
+
+createRequest._onupgradeneeded_ = function(event) {
+ alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ var request = objectStore.put("bar", "foo");
+
+ request._onsuccess_ = function() {
+ try {
+ objectStore.get(NaN);
+ } catch(e) {
+ alert("Failed to get record from object store with an invalid key");
+ }
+
+ database.deleteObjectStore("TestObjectStore");
+
+ try {
+ objectStore.get("foo");
+ } catch(e) {
+ alert("Failed to get record from object store that has been deleted");
+ }
+
+ // Recreate the objectstore because we'll need it in phase 2.
+ var objectStore = database.createObjectStore("TestObjectStore");
+ objectStore.put("bar", "foo");
+ }
+
+ versionTransaction._onabort_ = function(event) {
+ alert("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction._oncomplete_ = function(event) {
+ alert("Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction._onerror_ = function(event) {
+ alert("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readonly");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ // Queue up a whole bunch of gets to keep the transaction alive for awhile
+ for (var i = 0; i < 10; ++i)
+ objectStore.get("foo");
+
+ var getWhileInactive = function() {
+ try {
+ objectStore.get("foo");
+ } catch(e) {
+ alert("Failed to get record from object store while the transaction is inactive");
+ }
+ }
+
+ setTimeout(getWhileInactive, 0);
+
+ transaction._onabort_ = function(event) {
+ alert("readonly transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction._oncomplete_ = function(event) {
+ alert("readonly transaction complete");
+ done();
+ }
+
+ transaction._onerror_ = function(event) {
+ alert("readonly transaction unexpected error" + event);
+ done();
+ }
+}
+
+</script>
Modified: trunk/Source/_javascript_Core/ChangeLog (191757 => 191758)
--- trunk/Source/_javascript_Core/ChangeLog 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-10-29 22:08:51 UTC (rev 191758)
@@ -1,3 +1,12 @@
+2015-10-29 Brady Eidson <beid...@apple.com>
+
+ Modern IDB: deleteObjectStore support.
+ https://bugs.webkit.org/show_bug.cgi?id=150673
+
+ Reviewed by Alex Christensen.
+
+ * runtime/VM.h:
+
2015-10-29 Mark Lam <mark....@apple.com>
cdjs-tests.yaml/main.js.ftl fails due to FTL ArithSub code for supporting UntypedUse operands.
Modified: trunk/Source/_javascript_Core/runtime/VM.h (191757 => 191758)
--- trunk/Source/_javascript_Core/runtime/VM.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/_javascript_Core/runtime/VM.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -556,7 +556,7 @@
JSLock& apiLock() { return *m_apiLock; }
CodeCache* codeCache() { return m_codeCache.get(); }
- void whenIdle(std::function<void()>);
+ JS_EXPORT_PRIVATE void whenIdle(std::function<void()>);
JS_EXPORT_PRIVATE void deleteAllCode();
Modified: trunk/Source/WebCore/ChangeLog (191757 => 191758)
--- trunk/Source/WebCore/ChangeLog 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/ChangeLog 2015-10-29 22:08:51 UTC (rev 191758)
@@ -1,3 +1,106 @@
+2015-10-29 Brady Eidson <beid...@apple.com>
+
+ Modern IDB: deleteObjectStore support.
+ https://bugs.webkit.org/show_bug.cgi?id=150673
+
+ Reviewed by Alex Christensen.
+
+ Tests: storage/indexeddb/modern/deleteobjectstore-1.html
+ storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html
+ storage/indexeddb/modern/idbobjectstore-get-failures.html
+
+ * Modules/indexeddb/client/IDBConnectionToServer.cpp:
+ (WebCore::IDBClient::IDBConnectionToServer::deleteObjectStore):
+ (WebCore::IDBClient::IDBConnectionToServer::didDeleteObjectStore):
+ * Modules/indexeddb/client/IDBConnectionToServer.h:
+ * Modules/indexeddb/client/IDBConnectionToServerDelegate.h:
+
+ * Modules/indexeddb/client/IDBDatabaseImpl.cpp:
+ (WebCore::IDBClient::IDBDatabase::deleteObjectStore):
+ (WebCore::IDBClient::IDBDatabase::willCommitTransaction):
+ (WebCore::IDBClient::IDBDatabase::willAbortTransaction):
+ (WebCore::IDBClient::IDBDatabase::commitTransaction): Deleted.
+ (WebCore::IDBClient::IDBDatabase::abortTransaction): Deleted.
+ * Modules/indexeddb/client/IDBDatabaseImpl.h:
+
+ * Modules/indexeddb/client/IDBObjectStoreImpl.cpp:
+ (WebCore::IDBClient::IDBObjectStore::markAsDeleted):
+ * Modules/indexeddb/client/IDBObjectStoreImpl.h:
+
+ * Modules/indexeddb/client/IDBTransactionImpl.cpp:
+ (WebCore::IDBClient::IDBTransaction::IDBTransaction):
+ (WebCore::IDBClient::IDBTransaction::abort):
+ (WebCore::IDBClient::IDBTransaction::abortOnServer):
+ (WebCore::IDBClient::IDBTransaction::commit):
+ (WebCore::IDBClient::IDBTransaction::commitOnServer):
+ (WebCore::IDBClient::IDBTransaction::deleteObjectStore):
+ (WebCore::IDBClient::IDBTransaction::deleteObjectStoreOnServer):
+ (WebCore::IDBClient::IDBTransaction::didDeleteObjectStoreOnServer):
+ (WebCore::IDBClient::IDBTransaction::activate):
+ (WebCore::IDBClient::IDBTransaction::activationTimerFired): Deleted.
+ (WebCore::IDBClient::IDBTransaction::createObjectStoreOnServer): Deleted.
+ (WebCore::IDBClient::IDBTransaction::didCreateObjectStoreOnServer): Deleted.
+ (WebCore::IDBClient::IDBTransaction::getRecordOnServer): Deleted.
+ (WebCore::IDBClient::IDBTransaction::putOrAddOnServer): Deleted.
+ * Modules/indexeddb/client/IDBTransactionImpl.h:
+
+ * Modules/indexeddb/client/TransactionOperation.h:
+ (WebCore::IDBClient::TransactionOperation::completed):
+ (WebCore::IDBClient::createTransactionOperation):
+
+ * Modules/indexeddb/server/IDBBackingStore.h:
+
+ * Modules/indexeddb/server/IDBConnectionToClient.cpp:
+ (WebCore::IDBServer::IDBConnectionToClient::didDeleteObjectStore):
+ * Modules/indexeddb/server/IDBConnectionToClient.h:
+ * Modules/indexeddb/server/IDBConnectionToClientDelegate.h:
+
+ * Modules/indexeddb/server/IDBServer.cpp:
+ (WebCore::IDBServer::IDBServer::deleteObjectStore):
+ * Modules/indexeddb/server/IDBServer.h:
+
+ * Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp:
+ (WebCore::IDBServer::MemoryBackingStoreTransaction::objectStoreDeleted):
+ (WebCore::IDBServer::MemoryBackingStoreTransaction::abort):
+ (WebCore::IDBServer::MemoryBackingStoreTransaction::finish):
+ * Modules/indexeddb/server/MemoryBackingStoreTransaction.h:
+
+ * Modules/indexeddb/server/MemoryIDBBackingStore.cpp:
+ (WebCore::IDBServer::MemoryIDBBackingStore::createObjectStore):
+ (WebCore::IDBServer::MemoryIDBBackingStore::deleteObjectStore):
+ (WebCore::IDBServer::MemoryIDBBackingStore::restoreObjectStoreForVersionChangeAbort):
+ (WebCore::IDBServer::MemoryIDBBackingStore::takeObjectStoreByName):
+ * Modules/indexeddb/server/MemoryIDBBackingStore.h:
+
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::performCreateObjectStore):
+ (WebCore::IDBServer::UniqueIDBDatabase::deleteObjectStore):
+ (WebCore::IDBServer::UniqueIDBDatabase::performDeleteObjectStore):
+ (WebCore::IDBServer::UniqueIDBDatabase::didPerformDeleteObjectStore):
+ (WebCore::IDBServer::UniqueIDBDatabase::createObjectStore): Deleted.
+ * Modules/indexeddb/server/UniqueIDBDatabase.h:
+
+ * Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabaseConnection::didDeleteObjectStore):
+ * Modules/indexeddb/server/UniqueIDBDatabaseConnection.h:
+
+ * Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabaseTransaction::deleteObjectStore):
+ * Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h:
+
+ * Modules/indexeddb/shared/IDBDatabaseInfo.cpp:
+ (WebCore::IDBDatabaseInfo::deleteObjectStore):
+ * Modules/indexeddb/shared/IDBDatabaseInfo.h:
+
+ * Modules/indexeddb/shared/IDBResultData.cpp:
+ (WebCore::IDBResultData::deleteObjectStoreSuccess):
+ * Modules/indexeddb/shared/IDBResultData.h:
+
+ * Modules/indexeddb/shared/InProcessIDBServer.cpp:
+ (WebCore::InProcessIDBServer::didDeleteObjectStore):
+ (WebCore::InProcessIDBServer::deleteObjectStore):
+ * Modules/indexeddb/shared/InProcessIDBServer.h:
+
2015-10-29 Simon Fraser <simon.fra...@apple.com>
Very slow typing on pages with wheel event handlers on the body, and deep content
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2015-10-29 22:08:51 UTC (rev 191758)
@@ -109,6 +109,21 @@
completeOperation(resultData);
}
+void IDBConnectionToServer::deleteObjectStore(TransactionOperation& operation, const String& objectStoreName)
+{
+ LOG(IndexedDB, "IDBConnectionToServer::deleteObjectStore");
+
+ saveOperation(operation);
+
+ m_delegate->deleteObjectStore(IDBRequestData(operation), objectStoreName);
+}
+
+void IDBConnectionToServer::didDeleteObjectStore(const IDBResultData& resultData)
+{
+ LOG(IndexedDB, "IDBConnectionToServer::didDeleteObjectStore");
+ completeOperation(resultData);
+}
+
void IDBConnectionToServer::putOrAdd(TransactionOperation& operation, RefPtr<IDBKey>& key, RefPtr<SerializedScriptValue>& value, const IndexedDB::ObjectStoreOverwriteMode overwriteMode)
{
LOG(IndexedDB, "IDBConnectionToServer::putOrAdd");
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -64,6 +64,9 @@
void createObjectStore(TransactionOperation&, const IDBObjectStoreInfo&);
void didCreateObjectStore(const IDBResultData&);
+ void deleteObjectStore(TransactionOperation&, const String& objectStoreName);
+ void didDeleteObjectStore(const IDBResultData&);
+
void putOrAdd(TransactionOperation&, RefPtr<IDBKey>&, RefPtr<SerializedScriptValue>&, const IndexedDB::ObjectStoreOverwriteMode);
void didPutOrAdd(const IDBResultData&);
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -28,6 +28,8 @@
#if ENABLE(INDEXED_DATABASE)
+#include <wtf/text/WTFString.h>
+
namespace WebCore {
class IDBKey;
@@ -53,6 +55,7 @@
virtual void abortTransaction(IDBResourceIdentifier&) = 0;
virtual void commitTransaction(IDBResourceIdentifier&) = 0;
virtual void createObjectStore(const IDBRequestData&, const IDBObjectStoreInfo&) = 0;
+ virtual void deleteObjectStore(const IDBRequestData&, const String& objectStoreName) = 0;
virtual void putOrAdd(const IDBRequestData&, IDBKey*, SerializedScriptValue&, const IndexedDB::ObjectStoreOverwriteMode) = 0;
virtual void getRecord(const IDBRequestData&, IDBKey*) = 0;
virtual void establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo&) = 0;
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp 2015-10-29 22:08:51 UTC (rev 191758)
@@ -178,9 +178,27 @@
return transaction(context, objectStores, mode, ec);
}
-void IDBDatabase::deleteObjectStore(const String&, ExceptionCode&)
+void IDBDatabase::deleteObjectStore(const String& objectStoreName, ExceptionCode& ec)
{
- ASSERT_NOT_REACHED();
+ LOG(IndexedDB, "IDBDatabase::deleteObjectStore");
+
+ if (!m_versionChangeTransaction) {
+ ec = INVALID_STATE_ERR;
+ return;
+ }
+
+ if (!m_versionChangeTransaction->isActive()) {
+ ec = IDBDatabaseException::TransactionInactiveError;
+ return;
+ }
+
+ if (!m_info.hasObjectStore(objectStoreName)) {
+ ec = IDBDatabaseException::NotFoundError;
+ return;
+ }
+
+ m_info.deleteObjectStore(objectStoreName);
+ m_versionChangeTransaction->deleteObjectStore(objectStoreName);
}
void IDBDatabase::close()
@@ -239,15 +257,13 @@
m_activeTransactions.set(transaction.info().identifier(), &transaction);
}
-void IDBDatabase::commitTransaction(IDBTransaction& transaction)
+void IDBDatabase::willCommitTransaction(IDBTransaction& transaction)
{
- LOG(IndexedDB, "IDBDatabase::commitTransaction");
+ LOG(IndexedDB, "IDBDatabase::willCommitTransaction");
auto refTransaction = m_activeTransactions.take(transaction.info().identifier());
ASSERT(refTransaction);
m_committingTransactions.set(transaction.info().identifier(), WTF::move(refTransaction));
-
- m_serverConnection->commitTransaction(transaction);
}
void IDBDatabase::didCommitTransaction(IDBTransaction& transaction)
@@ -260,15 +276,13 @@
didCommitOrAbortTransaction(transaction);
}
-void IDBDatabase::abortTransaction(IDBTransaction& transaction)
+void IDBDatabase::willAbortTransaction(IDBTransaction& transaction)
{
- LOG(IndexedDB, "IDBDatabase::abortTransaction");
+ LOG(IndexedDB, "IDBDatabase::willAbortTransaction");
auto refTransaction = m_activeTransactions.take(transaction.info().identifier());
ASSERT(refTransaction);
m_abortingTransactions.set(transaction.info().identifier(), WTF::move(refTransaction));
-
- m_serverConnection->abortTransaction(transaction);
}
void IDBDatabase::didAbortTransaction(IDBTransaction& transaction)
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -75,9 +75,9 @@
Ref<IDBTransaction> startVersionChangeTransaction(const IDBTransactionInfo&);
void didStartTransaction(IDBTransaction&);
- void commitTransaction(IDBTransaction&);
+ void willCommitTransaction(IDBTransaction&);
void didCommitTransaction(IDBTransaction&);
- void abortTransaction(IDBTransaction&);
+ void willAbortTransaction(IDBTransaction&);
void didAbortTransaction(IDBTransaction&);
void fireVersionChangeEvent(uint64_t requestedVersion);
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp 2015-10-29 22:08:51 UTC (rev 191758)
@@ -294,6 +294,11 @@
RELEASE_ASSERT_NOT_REACHED();
}
+void IDBObjectStore::markAsDeleted()
+{
+ m_deleted = true;
+}
+
} // namespace IDBClient
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -75,6 +75,8 @@
virtual RefPtr<WebCore::IDBRequest> count(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&) override final;
virtual RefPtr<WebCore::IDBRequest> count(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) override final;
+ void markAsDeleted();
+
const IDBObjectStoreInfo& info() const { return m_info; }
private:
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp 2015-10-29 22:08:51 UTC (rev 191758)
@@ -36,6 +36,7 @@
#include "IDBObjectStore.h"
#include "IDBRequestImpl.h"
#include "IDBResultData.h"
+#include "JSDOMWindowBase.h"
#include "Logging.h"
#include "ScriptExecutionContext.h"
#include "TransactionOperation.h"
@@ -58,13 +59,19 @@
relaxAdoptionRequirement();
if (m_info.mode() == IndexedDB::TransactionMode::VersionChange) {
- m_activationTimer = std::make_unique<Timer>(*this, &IDBTransaction::activationTimerFired);
- m_activationTimer->startOneShot(0);
m_originalDatabaseInfo = std::make_unique<IDBDatabaseInfo>(m_database->info());
- m_state = IndexedDB::TransactionState::Inactive;
m_startedOnServer = true;
- } else
+ } else {
+ activate();
+
+ RefPtr<IDBTransaction> self;
+ JSC::VM& vm = JSDOMWindowBase::commonVM();
+ vm.whenIdle([self, this]() {
+ deactivate();
+ });
+
establishOnServer();
+ }
suspendIfNeeded();
}
@@ -157,10 +164,18 @@
}
m_state = IndexedDB::TransactionState::Aborting;
+ m_database->willAbortTransaction(*this);
- m_database->abortTransaction(*this);
+ auto operation = createTransactionOperation(*this, nullptr, &IDBTransaction::abortOnServer);
+ scheduleOperation(WTF::move(operation));
}
+void IDBTransaction::abortOnServer(TransactionOperation&)
+{
+ LOG(IndexedDB, "IDBTransaction::abortOnServer");
+ serverConnection().abortTransaction(*this);
+}
+
const char* IDBTransaction::activeDOMObjectName() const
{
return "IDBTransaction";
@@ -191,12 +206,6 @@
|| m_state == IndexedDB::TransactionState::Finished;
}
-void IDBTransaction::activationTimerFired()
-{
- scheduleOperationTimer();
- m_activationTimer = nullptr;
-}
-
void IDBTransaction::scheduleOperation(RefPtr<TransactionOperation>&& operation)
{
ASSERT(!m_transactionOperationMap.contains(operation->identifier()));
@@ -235,14 +244,21 @@
{
LOG(IndexedDB, "IDBTransaction::commit");
- if (isFinishedOrFinishing())
- return;
+ ASSERT(!isFinishedOrFinishing());
m_state = IndexedDB::TransactionState::Committing;
+ m_database->willCommitTransaction(*this);
- m_database->commitTransaction(*this);
+ auto operation = createTransactionOperation(*this, nullptr, &IDBTransaction::commitOnServer);
+ scheduleOperation(WTF::move(operation));
}
+void IDBTransaction::commitOnServer(TransactionOperation&)
+{
+ LOG(IndexedDB, "IDBTransaction::commitOnServer");
+ serverConnection().commitTransaction(*this);
+}
+
void IDBTransaction::finishAbortOrCommit()
{
ASSERT(m_state != IndexedDB::TransactionState::Finished);
@@ -359,9 +375,6 @@
ASSERT(isVersionChange());
- if (isFinishedOrFinishing())
- return;
-
m_database->serverConnection().createObjectStore(operation, info);
}
@@ -370,8 +383,6 @@
LOG(IndexedDB, "IDBTransaction::didCreateObjectStoreOnServer");
ASSERT_UNUSED(resultData, resultData.type() == IDBResultType::CreateObjectStoreSuccess);
-
- scheduleOperationTimer();
}
Ref<IDBRequest> IDBTransaction::requestGetRecord(ScriptExecutionContext& context, IDBObjectStore& objectStore, IDBKey& key)
@@ -392,8 +403,6 @@
{
LOG(IndexedDB, "IDBTransaction::getRecordOnServer");
- ASSERT(!isFinishedOrFinishing());
-
serverConnection().getRecord(operation, key);
}
@@ -424,7 +433,6 @@
{
LOG(IndexedDB, "IDBTransaction::putOrAddOnServer");
- ASSERT(!isFinishedOrFinishing());
ASSERT(!isReadOnly());
serverConnection().putOrAdd(operation, key, value, overwriteMode);
@@ -438,6 +446,33 @@
request.requestCompleted(resultData);
}
+void IDBTransaction::deleteObjectStore(const String& objectStoreName)
+{
+ LOG(IndexedDB, "IDBTransaction::deleteObjectStore");
+
+ ASSERT(isVersionChange());
+
+ if (auto objectStore = m_referencedObjectStores.take(objectStoreName))
+ objectStore->markAsDeleted();
+
+ auto operation = createTransactionOperation(*this, &IDBTransaction::didDeleteObjectStoreOnServer, &IDBTransaction::deleteObjectStoreOnServer, objectStoreName);
+ scheduleOperation(WTF::move(operation));
+}
+
+void IDBTransaction::deleteObjectStoreOnServer(TransactionOperation& operation, const String& objectStoreName)
+{
+ LOG(IndexedDB, "IDBTransaction::deleteObjectStoreOnServer");
+ ASSERT(isVersionChange());
+
+ serverConnection().deleteObjectStore(operation, objectStoreName);
+}
+
+void IDBTransaction::didDeleteObjectStoreOnServer(const IDBResultData& resultData)
+{
+ LOG(IndexedDB, "IDBTransaction::didDeleteObjectStoreOnServer");
+ ASSERT_UNUSED(resultData, resultData.type() == IDBResultType::DeleteObjectStoreSuccess);
+}
+
void IDBTransaction::establishOnServer()
{
LOG(IndexedDB, "IDBTransaction::establishOnServer");
@@ -447,7 +482,9 @@
void IDBTransaction::activate()
{
- ASSERT(!isFinishedOrFinishing());
+ if (isFinishedOrFinishing())
+ return;
+
m_state = IndexedDB::TransactionState::Active;
}
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -90,11 +90,15 @@
Ref<IDBRequest> requestPutOrAdd(ScriptExecutionContext&, IDBObjectStore&, IDBKey*, SerializedScriptValue&, IndexedDB::ObjectStoreOverwriteMode);
Ref<IDBRequest> requestGetRecord(ScriptExecutionContext&, IDBObjectStore&, IDBKey&);
+ void deleteObjectStore(const String& objectStoreName);
+
IDBConnectionToServer& serverConnection();
void activate();
void deactivate();
+ void scheduleOperationTimer();
+
private:
IDBTransaction(IDBDatabase&, const IDBTransactionInfo&);
@@ -105,14 +109,15 @@
void finishAbortOrCommit();
void scheduleOperation(RefPtr<TransactionOperation>&&);
- void scheduleOperationTimer();
void operationTimerFired();
- void activationTimerFired();
void fireOnComplete();
void fireOnAbort();
void enqueueEvent(Ref<Event>);
+ void commitOnServer(TransactionOperation&);
+ void abortOnServer(TransactionOperation&);
+
void createObjectStoreOnServer(TransactionOperation&, const IDBObjectStoreInfo&);
void didCreateObjectStoreOnServer(const IDBResultData&);
@@ -122,13 +127,16 @@
void getRecordOnServer(TransactionOperation&, RefPtr<IDBKey>);
void didGetRecordOnServer(IDBRequest&, const IDBResultData&);
+ void deleteObjectStoreOnServer(TransactionOperation&, const String& objectStoreName);
+ void didDeleteObjectStoreOnServer(const IDBResultData&);
+
void establishOnServer();
Ref<IDBDatabase> m_database;
IDBTransactionInfo m_info;
std::unique_ptr<IDBDatabaseInfo> m_originalDatabaseInfo;
- IndexedDB::TransactionState m_state { IndexedDB::TransactionState::Active };
+ IndexedDB::TransactionState m_state { IndexedDB::TransactionState::Inactive };
bool m_startedOnServer { false };
IDBError m_idbError;
Modified: trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -48,6 +48,7 @@
void completed(const IDBResultData& data)
{
m_completeFunction(data);
+ m_transaction->scheduleOperationTimer();
}
const IDBResourceIdentifier& identifier() const { return m_identifier; }
@@ -84,7 +85,8 @@
};
m_completeFunction = [self, this, completeMethod](const IDBResultData& resultData) {
- (&m_transaction.get()->*completeMethod)(resultData);
+ if (completeMethod)
+ (&m_transaction.get()->*completeMethod)(resultData);
};
}
@@ -100,11 +102,21 @@
RefPtr<IDBRequest> refRequest(&request);
m_completeFunction = [self, this, refRequest, completeMethod](const IDBResultData& resultData) {
- (&m_transaction.get()->*completeMethod)(*refRequest, resultData);
+ if (completeMethod)
+ (&m_transaction.get()->*completeMethod)(*refRequest, resultData);
};
}
};
+inline RefPtr<TransactionOperation> createTransactionOperation(
+ IDBTransaction& transaction,
+ void (IDBTransaction::*complete)(const IDBResultData&),
+ void (IDBTransaction::*perform)(TransactionOperation&))
+{
+ auto operation = new TransactionOperationImpl<>(transaction, complete, perform);
+ return adoptRef(operation);
+}
+
template<typename MP1, typename P1>
RefPtr<TransactionOperation> createTransactionOperation(
IDBTransaction& transaction,
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBBackingStore.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/IDBBackingStore.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBBackingStore.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -52,6 +52,7 @@
virtual IDBError commitTransaction(const IDBResourceIdentifier& transactionIdentifier) = 0;
virtual IDBError createObjectStore(const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo&) = 0;
+ virtual IDBError deleteObjectStore(const IDBResourceIdentifier& transactionIdentifier, const String& objectStoreName) = 0;
virtual IDBError keyExistsInObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyData&, bool& keyExists) = 0;
virtual IDBError deleteRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyData&) = 0;
virtual IDBError putRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyData&, const ThreadSafeDataBuffer& value) = 0;
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBConnectionToClient.cpp (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/IDBConnectionToClient.cpp 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBConnectionToClient.cpp 2015-10-29 22:08:51 UTC (rev 191758)
@@ -68,6 +68,11 @@
m_delegate->didCreateObjectStore(result);
}
+void IDBConnectionToClient::didDeleteObjectStore(const IDBResultData& result)
+{
+ m_delegate->didDeleteObjectStore(result);
+}
+
void IDBConnectionToClient::didPutOrAdd(const IDBResultData& result)
{
m_delegate->didPutOrAdd(result);
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBConnectionToClient.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/IDBConnectionToClient.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBConnectionToClient.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -53,6 +53,7 @@
void didAbortTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&);
void didCommitTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&);
void didCreateObjectStore(const IDBResultData&);
+ void didDeleteObjectStore(const IDBResultData&);
void didPutOrAdd(const IDBResultData&);
void didGetRecord(const IDBResultData&);
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBConnectionToClientDelegate.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/IDBConnectionToClientDelegate.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBConnectionToClientDelegate.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -49,6 +49,7 @@
virtual void didAbortTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&) = 0;
virtual void didCommitTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&) = 0;
virtual void didCreateObjectStore(const IDBResultData&) = 0;
+ virtual void didDeleteObjectStore(const IDBResultData&) = 0;
virtual void didPutOrAdd(const IDBResultData&) = 0;
virtual void didGetRecord(const IDBResultData&) = 0;
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2015-10-29 22:08:51 UTC (rev 191758)
@@ -168,6 +168,18 @@
transaction->createObjectStore(requestData, info);
}
+void IDBServer::deleteObjectStore(const IDBRequestData& requestData, const String& objectStoreName)
+{
+ LOG(IndexedDB, "IDBServer::deleteObjectStore");
+
+ auto transaction = m_transactions.get(requestData.transactionIdentifier());
+ if (!transaction)
+ return;
+
+ ASSERT(transaction->isVersionChange());
+ transaction->deleteObjectStore(requestData, objectStoreName);
+}
+
void IDBServer::putOrAdd(const IDBRequestData& requestData, const IDBKeyData& keyData, const ThreadSafeDataBuffer& valueData, IndexedDB::ObjectStoreOverwriteMode overwriteMode)
{
LOG(IndexedDB, "IDBServer::putOrAdd");
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -60,6 +60,7 @@
void abortTransaction(const IDBResourceIdentifier&);
void commitTransaction(const IDBResourceIdentifier&);
void createObjectStore(const IDBRequestData&, const IDBObjectStoreInfo&);
+ void deleteObjectStore(const IDBRequestData&, const String& objectStoreName);
void putOrAdd(const IDBRequestData&, const IDBKeyData&, const ThreadSafeDataBuffer& valueData, IndexedDB::ObjectStoreOverwriteMode);
void getRecord(const IDBRequestData&, const IDBKeyData&);
void establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo&);
Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp 2015-10-29 22:08:51 UTC (rev 191758)
@@ -80,6 +80,17 @@
objectStore.writeTransactionStarted(*this);
}
+void MemoryBackingStoreTransaction::objectStoreDeleted(std::unique_ptr<MemoryObjectStore> objectStore)
+{
+ ASSERT(objectStore);
+ ASSERT(m_objectStores.contains(objectStore.get()));
+ m_objectStores.remove(objectStore.get());
+
+ auto addResult = m_deletedObjectStores.add(objectStore->info().name(), nullptr);
+ if (addResult.isNewEntry)
+ addResult.iterator->value = WTF::move(objectStore);
+}
+
void MemoryBackingStoreTransaction::recordValueChanged(MemoryObjectStore& objectStore, const IDBKeyData& key)
{
ASSERT(m_objectStores.contains(&objectStore));
@@ -106,6 +117,19 @@
TemporaryChange<bool> change(m_isAborting, true);
+ // This loop moves the underlying unique_ptrs from out of the m_deleteObjectStores map,
+ // but the entries in the map still remain.
+ for (auto& objectStore : m_deletedObjectStores.values()) {
+ MemoryObjectStore* rawObjectStore = objectStore.get();
+ m_backingStore.restoreObjectStoreForVersionChangeAbort(WTF::move(objectStore));
+
+ ASSERT(!m_objectStores.contains(rawObjectStore));
+ m_objectStores.add(rawObjectStore);
+ }
+
+ // This clears the entries from the map.
+ m_deletedObjectStores.clear();
+
if (m_originalDatabaseInfo) {
ASSERT(m_info.mode() == IndexedDB::TransactionMode::VersionChange);
m_backingStore.setDatabaseInfo(*m_originalDatabaseInfo);
@@ -145,8 +169,10 @@
if (!isWriting())
return;
- for (auto objectStore : m_objectStores)
+ for (auto& objectStore : m_objectStores)
objectStore->writeTransactionFinished(*this);
+ for (auto& objectStore : m_deletedObjectStores.values())
+ objectStore->writeTransactionFinished(*this);
}
} // namespace IDBServer
Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -58,6 +58,7 @@
void addNewObjectStore(MemoryObjectStore&);
void addExistingObjectStore(MemoryObjectStore&);
void recordValueChanged(MemoryObjectStore&, const IDBKeyData&);
+ void objectStoreDeleted(std::unique_ptr<MemoryObjectStore>);
void abort();
void commit();
@@ -78,6 +79,7 @@
HashSet<MemoryObjectStore*> m_objectStores;
HashSet<MemoryObjectStore*> m_versionChangeAddedObjectStores;
+ HashMap<String, std::unique_ptr<MemoryObjectStore>> m_deletedObjectStores;
HashMap<MemoryObjectStore*, std::unique_ptr<KeyValueMap>> m_originalValues;
};
Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp 2015-10-29 22:08:51 UTC (rev 191758)
@@ -117,7 +117,7 @@
IDBError MemoryIDBBackingStore::createObjectStore(const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo& info)
{
- LOG(IndexedDB, "MemoryIDBBackingStore::createObjectStore");
+ LOG(IndexedDB, "MemoryIDBBackingStore::createObjectStore - adding OS %s with ID %llu", info.name().utf8().data(), info.identifier());
ASSERT(m_databaseInfo);
if (m_databaseInfo->hasObjectStore(info.name()))
@@ -138,6 +138,29 @@
return IDBError();
}
+IDBError MemoryIDBBackingStore::deleteObjectStore(const IDBResourceIdentifier& transactionIdentifier, const String& objectStoreName)
+{
+ LOG(IndexedDB, "MemoryIDBBackingStore::deleteObjectStore");
+
+ ASSERT(m_databaseInfo);
+ if (!m_databaseInfo->hasObjectStore(objectStoreName))
+ return IDBError(IDBExceptionCode::ConstraintError);
+
+ auto transaction = m_transactions.get(transactionIdentifier);
+ ASSERT(transaction);
+ ASSERT(transaction->isVersionChange());
+
+ auto objectStore = takeObjectStoreByName(objectStoreName);
+ ASSERT(objectStore);
+ if (!objectStore)
+ return IDBError(IDBExceptionCode::ConstraintError);
+
+ m_databaseInfo->deleteObjectStore(objectStoreName);
+ transaction->objectStoreDeleted(WTF::move(objectStore));
+
+ return IDBError();
+}
+
void MemoryIDBBackingStore::removeObjectStoreForVersionChangeAbort(MemoryObjectStore& objectStore)
{
LOG(IndexedDB, "MemoryIDBBackingStore::removeObjectStoreForVersionChangeAbort");
@@ -148,6 +171,11 @@
unregisterObjectStore(objectStore);
}
+void MemoryIDBBackingStore::restoreObjectStoreForVersionChangeAbort(std::unique_ptr<MemoryObjectStore>&& objectStore)
+{
+ registerObjectStore(WTF::move(objectStore));
+}
+
IDBError MemoryIDBBackingStore::keyExistsInObjectStore(const IDBResourceIdentifier&, uint64_t objectStoreIdentifier, const IDBKeyData& keyData, bool& keyExists)
{
LOG(IndexedDB, "MemoryIDBBackingStore::keyExistsInObjectStore");
@@ -229,6 +257,18 @@
m_objectStoresByIdentifier.remove(objectStore.info().identifier());
}
+std::unique_ptr<MemoryObjectStore> MemoryIDBBackingStore::takeObjectStoreByName(const String& name)
+{
+ auto rawObjectStore = m_objectStoresByName.take(name);
+ if (!rawObjectStore)
+ return nullptr;
+
+ auto objectStore = m_objectStoresByIdentifier.take(rawObjectStore->info().identifier());
+ ASSERT(objectStore);
+
+ return objectStore;
+}
+
} // namespace IDBServer
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -53,16 +53,20 @@
virtual IDBError abortTransaction(const IDBResourceIdentifier& transactionIdentifier) override final;
virtual IDBError commitTransaction(const IDBResourceIdentifier& transactionIdentifier) override final;
virtual IDBError createObjectStore(const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo&) override final;
+ virtual IDBError deleteObjectStore(const IDBResourceIdentifier& transactionIdentifier, const String& objectStoreName) override final;
virtual IDBError keyExistsInObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyData&, bool& keyExists) override final;
virtual IDBError deleteRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyData&) override final;
virtual IDBError putRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyData&, const ThreadSafeDataBuffer& value) override final;
virtual IDBError getRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyData&, ThreadSafeDataBuffer& outValue) override final;
void removeObjectStoreForVersionChangeAbort(MemoryObjectStore&);
+ void restoreObjectStoreForVersionChangeAbort(std::unique_ptr<MemoryObjectStore>&&);
private:
MemoryIDBBackingStore(const IDBDatabaseIdentifier&);
+ std::unique_ptr<MemoryObjectStore> takeObjectStoreByName(const String& name);
+
IDBDatabaseIdentifier m_identifier;
std::unique_ptr<IDBDatabaseInfo> m_databaseInfo;
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2015-10-29 22:08:51 UTC (rev 191758)
@@ -237,19 +237,17 @@
ASSERT(isMainThread());
LOG(IndexedDB, "(main) UniqueIDBDatabase::createObjectStore");
- ASSERT(m_backingStore);
- m_backingStore->createObjectStore(transaction.info().identifier(), info);
-
uint64_t callbackID = storeCallback(callback);
m_server.postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::performCreateObjectStore, callbackID, transaction.info().identifier(), info));
}
-void UniqueIDBDatabase::performCreateObjectStore(uint64_t callbackIdentifier, const IDBResourceIdentifier&, const IDBObjectStoreInfo& info)
+void UniqueIDBDatabase::performCreateObjectStore(uint64_t callbackIdentifier, const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo& info)
{
ASSERT(!isMainThread());
LOG(IndexedDB, "(db) UniqueIDBDatabase::performCreateObjectStore");
- // FIXME: Create object store in backing store, once that exists.
+ ASSERT(m_backingStore);
+ m_backingStore->createObjectStore(transactionIdentifier, info);
IDBError error;
m_server.postDatabaseTaskReply(createCrossThreadTask(*this, &UniqueIDBDatabase::didPerformCreateObjectStore, callbackIdentifier, error, info));
@@ -266,6 +264,38 @@
performErrorCallback(callbackIdentifier, error);
}
+void UniqueIDBDatabase::deleteObjectStore(UniqueIDBDatabaseTransaction& transaction, const String& objectStoreName, ErrorCallback callback)
+{
+ ASSERT(isMainThread());
+ LOG(IndexedDB, "(main) UniqueIDBDatabase::deleteObjectStore");
+
+ uint64_t callbackID = storeCallback(callback);
+ m_server.postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::performDeleteObjectStore, callbackID, transaction.info().identifier(), objectStoreName));
+}
+
+void UniqueIDBDatabase::performDeleteObjectStore(uint64_t callbackIdentifier, const IDBResourceIdentifier& transactionIdentifier, const String& objectStoreName)
+{
+ ASSERT(!isMainThread());
+ LOG(IndexedDB, "(db) UniqueIDBDatabase::performDeleteObjectStore");
+
+ ASSERT(m_backingStore);
+ m_backingStore->deleteObjectStore(transactionIdentifier, objectStoreName);
+
+ IDBError error;
+ m_server.postDatabaseTaskReply(createCrossThreadTask(*this, &UniqueIDBDatabase::didPerformDeleteObjectStore, callbackIdentifier, error, objectStoreName));
+}
+
+void UniqueIDBDatabase::didPerformDeleteObjectStore(uint64_t callbackIdentifier, const IDBError& error, const String& objectStoreName)
+{
+ ASSERT(isMainThread());
+ LOG(IndexedDB, "(main) UniqueIDBDatabase::didPerformDeleteObjectStore");
+
+ if (error.isNull())
+ m_databaseInfo->deleteObjectStore(objectStoreName);
+
+ performErrorCallback(callbackIdentifier, error);
+}
+
void UniqueIDBDatabase::putOrAdd(const IDBRequestData& requestData, const IDBKeyData& keyData, const ThreadSafeDataBuffer& valueData, IndexedDB::ObjectStoreOverwriteMode overwriteMode, KeyDataCallback callback)
{
ASSERT(isMainThread());
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -70,6 +70,7 @@
IDBServer& server() { return m_server; }
void createObjectStore(UniqueIDBDatabaseTransaction&, const IDBObjectStoreInfo&, ErrorCallback);
+ void deleteObjectStore(UniqueIDBDatabaseTransaction&, const String& objectStoreName, ErrorCallback);
void putOrAdd(const IDBRequestData&, const IDBKeyData&, const ThreadSafeDataBuffer& valueData, IndexedDB::ObjectStoreOverwriteMode, KeyDataCallback);
void getRecord(const IDBRequestData&, const IDBKeyData&, ValueDataCallback);
void commitTransaction(UniqueIDBDatabaseTransaction&, ErrorCallback);
@@ -98,6 +99,7 @@
void performAbortTransaction(uint64_t callbackIdentifier, const IDBResourceIdentifier& transactionIdentifier);
void beginTransactionInBackingStore(const IDBTransactionInfo&);
void performCreateObjectStore(uint64_t callbackIdentifier, const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo&);
+ void performDeleteObjectStore(uint64_t callbackIdentifier, const IDBResourceIdentifier& transactionIdentifier, const String& objectStoreName);
void performPutOrAdd(uint64_t callbackIdentifier, const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyData&, const ThreadSafeDataBuffer& valueData, IndexedDB::ObjectStoreOverwriteMode);
void performGetRecord(uint64_t callbackIdentifier, const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyData&);
void performActivateTransactionInBackingStore(uint64_t callbackIdentifier, const IDBTransactionInfo&);
@@ -105,6 +107,7 @@
// Main thread callbacks
void didOpenBackingStore(const IDBDatabaseInfo&);
void didPerformCreateObjectStore(uint64_t callbackIdentifier, const IDBError&, const IDBObjectStoreInfo&);
+ void didPerformDeleteObjectStore(uint64_t callbackIdentifier, const IDBError&, const String& objectStoreName);
void didPerformPutOrAdd(uint64_t callbackIdentifier, const IDBError&, const IDBKeyData&);
void didPerformGetRecord(uint64_t callbackIdentifier, const IDBError&, const ThreadSafeDataBuffer&);
void didPerformCommitTransaction(uint64_t callbackIdentifier, const IDBError&, const IDBResourceIdentifier& transactionIdentifier);
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp 2015-10-29 22:08:51 UTC (rev 191758)
@@ -139,6 +139,13 @@
m_connectionToClient.didCreateObjectStore(resultData);
}
+void UniqueIDBDatabaseConnection::didDeleteObjectStore(const IDBResultData& resultData)
+{
+ LOG(IndexedDB, "UniqueIDBDatabaseConnection::didDeleteObjectStore");
+
+ m_connectionToClient.didDeleteObjectStore(resultData);
+}
+
} // namespace IDBServer
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -67,6 +67,7 @@
void didAbortTransaction(UniqueIDBDatabaseTransaction&, const IDBError&);
void didCommitTransaction(UniqueIDBDatabaseTransaction&, const IDBError&);
void didCreateObjectStore(const IDBResultData&);
+ void didDeleteObjectStore(const IDBResultData&);
private:
UniqueIDBDatabaseConnection(UniqueIDBDatabase&, IDBConnectionToClient&);
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp 2015-10-29 22:08:51 UTC (rev 191758)
@@ -113,6 +113,24 @@
});
}
+void UniqueIDBDatabaseTransaction::deleteObjectStore(const IDBRequestData& requestData, const String& objectStoreName)
+{
+ LOG(IndexedDB, "UniqueIDBDatabaseTransaction::deleteObjectStore");
+
+ ASSERT(isVersionChange());
+ ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
+
+ RefPtr<UniqueIDBDatabaseTransaction> self(this);
+ m_databaseConnection->database().deleteObjectStore(*this, objectStoreName, [this, self, requestData](const IDBError& error) {
+ LOG(IndexedDB, "UniqueIDBDatabaseTransaction::deleteObjectStore (callback)");
+ if (error.isNull())
+ m_databaseConnection->didDeleteObjectStore(IDBResultData::deleteObjectStoreSuccess(requestData.requestIdentifier()));
+ else
+ m_databaseConnection->didDeleteObjectStore(IDBResultData::error(requestData.requestIdentifier(), error));
+ });
+}
+
+
void UniqueIDBDatabaseTransaction::putOrAdd(const IDBRequestData& requestData, const IDBKeyData& keyData, const ThreadSafeDataBuffer& valueData, IndexedDB::ObjectStoreOverwriteMode overwriteMode)
{
LOG(IndexedDB, "UniqueIDBDatabaseTransaction::putOrAdd");
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -63,6 +63,7 @@
void commit();
void createObjectStore(const IDBRequestData&, const IDBObjectStoreInfo&);
+ void deleteObjectStore(const IDBRequestData&, const String& objectStoreName);
void putOrAdd(const IDBRequestData&, const IDBKeyData&, const ThreadSafeDataBuffer& valueData, IndexedDB::ObjectStoreOverwriteMode);
void getRecord(const IDBRequestData&, const IDBKeyData&);
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.cpp 2015-10-29 22:08:51 UTC (rev 191758)
@@ -106,6 +106,15 @@
return WTF::move(names);
}
+void IDBDatabaseInfo::deleteObjectStore(const String& objectStoreName)
+{
+ auto* info = infoForExistingObjectStore(objectStoreName);
+ if (!info)
+ return;
+
+ m_objectStoreMap.remove(info->identifier());
+}
+
} // namespace WebCore
#endif // ENABLE(INDEXED_DATABASE)
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -54,6 +54,8 @@
Vector<String> objectStoreNames() const;
+ void deleteObjectStore(const String& objectStoreName);
+
private:
IDBDatabaseInfo();
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp 2015-10-29 22:08:51 UTC (rev 191758)
@@ -93,6 +93,11 @@
return { IDBResultType::CreateObjectStoreSuccess, requestIdentifier };
}
+IDBResultData IDBResultData::deleteObjectStoreSuccess(const IDBResourceIdentifier& requestIdentifier)
+{
+ return { IDBResultType::DeleteObjectStoreSuccess, requestIdentifier };
+}
+
IDBResultData IDBResultData::putOrAddSuccess(const IDBResourceIdentifier& requestIdentifier, const IDBKeyData& resultKey)
{
IDBResultData result(IDBResultType::PutOrAddSuccess, requestIdentifier);
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -45,6 +45,7 @@
OpenDatabaseSuccess,
OpenDatabaseUpgradeNeeded,
CreateObjectStoreSuccess,
+ DeleteObjectStoreSuccess,
PutOrAddSuccess,
GetRecordSuccess,
};
@@ -60,6 +61,7 @@
static IDBResultData openDatabaseSuccess(const IDBResourceIdentifier&, IDBServer::UniqueIDBDatabaseConnection&);
static IDBResultData openDatabaseUpgradeNeeded(const IDBResourceIdentifier&, IDBServer::UniqueIDBDatabaseTransaction&);
static IDBResultData createObjectStoreSuccess(const IDBResourceIdentifier&);
+ static IDBResultData deleteObjectStoreSuccess(const IDBResourceIdentifier&);
static IDBResultData putOrAddSuccess(const IDBResourceIdentifier&, const IDBKeyData&);
static IDBResultData getRecordSuccess(const IDBResourceIdentifier&, const ThreadSafeDataBuffer& valueData);
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp 2015-10-29 22:08:51 UTC (rev 191758)
@@ -127,6 +127,14 @@
});
}
+void InProcessIDBServer::didDeleteObjectStore(const IDBResultData& resultData)
+{
+ RefPtr<InProcessIDBServer> self(this);
+ RunLoop::current().dispatch([this, self, resultData] {
+ m_connectionToServer->didDeleteObjectStore(resultData);
+ });
+}
+
void InProcessIDBServer::didPutOrAdd(const IDBResultData& resultData)
{
RefPtr<InProcessIDBServer> self(this);
@@ -167,6 +175,14 @@
});
}
+void InProcessIDBServer::deleteObjectStore(const IDBRequestData& requestData, const String& objectStoreName)
+{
+ RefPtr<InProcessIDBServer> self(this);
+ RunLoop::current().dispatch([this, self, requestData, objectStoreName] {
+ m_server->deleteObjectStore(requestData, objectStoreName);
+ });
+}
+
void InProcessIDBServer::putOrAdd(const IDBRequestData& requestData, IDBKey* key, SerializedScriptValue& value, const IndexedDB::ObjectStoreOverwriteMode overwriteMode)
{
RefPtr<InProcessIDBServer> self(this);
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h (191757 => 191758)
--- trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h 2015-10-29 22:07:42 UTC (rev 191757)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h 2015-10-29 22:08:51 UTC (rev 191758)
@@ -59,6 +59,7 @@
virtual void abortTransaction(IDBResourceIdentifier&) override final;
virtual void commitTransaction(IDBResourceIdentifier&) override final;
virtual void createObjectStore(const IDBRequestData&, const IDBObjectStoreInfo&) override final;
+ virtual void deleteObjectStore(const IDBRequestData&, const String& objectStoreName) override final;
virtual void putOrAdd(const IDBRequestData&, IDBKey*, SerializedScriptValue&, const IndexedDB::ObjectStoreOverwriteMode) override final;
virtual void getRecord(const IDBRequestData&, IDBKey*) override final;
virtual void establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo&) override final;
@@ -71,6 +72,7 @@
virtual void didAbortTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&) override final;
virtual void didCommitTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&) override final;
virtual void didCreateObjectStore(const IDBResultData&) override final;
+ virtual void didDeleteObjectStore(const IDBResultData&) override final;
virtual void didPutOrAdd(const IDBResultData&) override final;
virtual void didGetRecord(const IDBResultData&) override final;
virtual void fireVersionChangeEvent(IDBServer::UniqueIDBDatabaseConnection&, uint64_t requestedVersion) override final;
