Changeset 126366 in webkit

Timestamp:

Aug 22, 2012 4:23:43 PM (12 years ago)

Author:

dgrogan@chromium.org

Message:

IndexedDB: revert int version when version change transaction aborts
​https://bugs.webkit.org/show_bug.cgi?id=94662

Reviewed by Tony Chang.

Source/WebCore:

Test: storage/indexeddb/intversion-revert-on-abort.html

• Modules/indexeddb/IDBDatabaseBackendImpl.cpp:

(WebCore::IDBDatabaseBackendImpl::runIntVersionChangeTransaction):
(WebCore::IDBDatabaseBackendImpl::resetIntVersion):
One-liner modeled after resetVersion.

(WebCore):

• Modules/indexeddb/IDBDatabaseBackendImpl.h:

(IDBDatabaseBackendImpl):

LayoutTests:

This is tested in some other layout tests but it should have its own,
so add intversion-revert-on-abort.html.

• storage/indexeddb/intversion-abort-in-initial-upgradeneeded-expected.txt:

FAIL event.target.result.version should be 0 will be resolved at least
when we figure out if we can make the default version an integer
during the transition period.

• storage/indexeddb/intversion-revert-on-abort-expected.txt: Added.
• storage/indexeddb/intversion-revert-on-abort.html: Added.
• storage/indexeddb/resources/intversion-revert-on-abort.js: Added.

(test):
(deleteSuccess):
(firstUpgradeNeededCallback):
(openSuccess):
(secondUpgradeNeededCallback):
(errorAfterAbortCallback):
(finalSuccessCallback):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/intversion-abort-in-initial-upgradeneeded-expected.txt (modified) (2 diffs)
• LayoutTests/storage/indexeddb/intversion-revert-on-abort-expected.txt (added)
• LayoutTests/storage/indexeddb/intversion-revert-on-abort.html (added)
• LayoutTests/storage/indexeddb/resources/intversion-revert-on-abort.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp (modified) (2 diffs)
• Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-22  David Grogan  <dgrogan@chromium.org>
+
+        IndexedDB: revert int version when version change transaction aborts
+        https://bugs.webkit.org/show_bug.cgi?id=94662
+
+        Reviewed by Tony Chang.
+
+        This is tested in some other layout tests but it should have its own,
+        so add intversion-revert-on-abort.html.
+
+        * storage/indexeddb/intversion-abort-in-initial-upgradeneeded-expected.txt:
+        FAIL event.target.result.version should be 0 will be resolved at least
+        when we figure out if we can make the default version an integer
+        during the transition period.
+
+        * storage/indexeddb/intversion-revert-on-abort-expected.txt: Added.
+        * storage/indexeddb/intversion-revert-on-abort.html: Added.
+        * storage/indexeddb/resources/intversion-revert-on-abort.js: Added.
+        (test):
+        (deleteSuccess):
+        (firstUpgradeNeededCallback):
+        (openSuccess):
+        (secondUpgradeNeededCallback):
+        (errorAfterAbortCallback):
+        (finalSuccessCallback):
+
 2012-08-17  Jeffrey Pfau  <jpfau@apple.com>
 

trunk/LayoutTests/storage/indexeddb/intversion-abort-in-initial-upgradeneeded-expected.txt

@@ -17 +17 @@
 
 onAbort():
-FAIL event.target.db.version should be 0. Was 2.
+FAIL event.target.db.version should be 0 (of type number). Was  (of type string).
 PASS request.transaction is non-null.
 
@@ -24 +24 @@
 PASS request is event.target
 PASS event.target.error.name is "AbortError"
-FAIL event.target.result.version should be 0. Was 2.
+FAIL event.target.result.version should be 0 (of type number). Was  (of type string).
 PASS request.transaction is null
 PASS successfullyParsed is true

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-22  David Grogan  <dgrogan@chromium.org>
+
+        IndexedDB: revert int version when version change transaction aborts
+        https://bugs.webkit.org/show_bug.cgi?id=94662
+
+        Reviewed by Tony Chang.
+
+        Test: storage/indexeddb/intversion-revert-on-abort.html
+
+        * Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
+        (WebCore::IDBDatabaseBackendImpl::runIntVersionChangeTransaction):
+        (WebCore::IDBDatabaseBackendImpl::resetIntVersion):
+        One-liner modeled after resetVersion.
+
+        (WebCore):
+        * Modules/indexeddb/IDBDatabaseBackendImpl.h:
+        (IDBDatabaseBackendImpl):
+
 2012-08-17  Jeffrey Pfau  <jpfau@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp

@@ -491 +491 @@
     RefPtr<IDBDatabaseBackendImpl> database = this;
     OwnPtr<ScriptExecutionContext::Task> intVersionTask = createCallbackTask(&IDBDatabaseBackendImpl::setIntVersionInternal, database, requestedVersion, callbacks, transaction);
-    // FIXME: Make this reset the integer version as well.
-    OwnPtr<ScriptExecutionContext::Task> resetVersionOnAbortTask = createCallbackTask(&IDBDatabaseBackendImpl::resetVersion, database, m_version);
+    OwnPtr<ScriptExecutionContext::Task> resetVersionOnAbortTask = createCallbackTask(&IDBDatabaseBackendImpl::resetIntVersion, database, m_intVersion);
     if (!transaction->scheduleTask(intVersionTask.release(), resetVersionOnAbortTask.release())) {
         // FIXME: Remove one of the following lines.
@@ -625 +624 @@
 }
 
+void IDBDatabaseBackendImpl::resetIntVersion(ScriptExecutionContext*, PassRefPtr<IDBDatabaseBackendImpl> database, int64_t oldVersion)
+{
+    database->m_intVersion = oldVersion;
+}
+
 
 } // namespace WebCore

trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h

@@ -94 +94 @@
     static void addObjectStoreToMap(ScriptExecutionContext*, PassRefPtr<IDBDatabaseBackendImpl>, PassRefPtr<IDBObjectStoreBackendImpl>);
     static void resetVersion(ScriptExecutionContext*, PassRefPtr<IDBDatabaseBackendImpl>, const String& version);
+    static void resetIntVersion(ScriptExecutionContext*, PassRefPtr<IDBDatabaseBackendImpl>, int64_t intVersion);
 
     RefPtr<IDBBackingStore> m_backingStore;