IndexedDB assertion at IDBTransactionBackend::~IDBTransactionBackend()
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Feb 2014 06:37:36 +0000 (06:37 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Feb 2014 06:37:36 +0000 (06:37 +0000)
https://bugs.webkit.org/show_bug.cgi?id=128341

Reviewed by Maciej Stachowiak.

Source/WebCore:

* Modules/indexeddb/IDBTransactionBackend.cpp:
(WebCore::IDBTransactionBackend::~IDBTransactionBackend): "Finished" is not the only
  valid value here - In WK2, "Unused" is also valid. Update the ASSERT.

LayoutTests:

* platform/mac-wk2/TestExpectations: Reenable the indexeddb tests that are known to pass.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@163864 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/mac-wk2/TestExpectations
Source/WebCore/ChangeLog
Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp

index aff3ca7..163ba56 100644 (file)
@@ -1,3 +1,12 @@
+2014-02-10  Brady Eidson  <beidson@apple.com>
+
+        IndexedDB assertion at IDBTransactionBackend::~IDBTransactionBackend()
+        https://bugs.webkit.org/show_bug.cgi?id=128341
+
+        Reviewed by Maciej Stachowiak.
+
+        * platform/mac-wk2/TestExpectations: Reenable the indexeddb tests that are known to pass.
+
 2014-02-10  Alexey Proskuryakov  <ap@apple.com>
 
         svg/text/text-overflow-ellipsis-svgfont-kerning-ligatures.html and svg/css/font-face-crash.html
index 4419b37..67c3fa0 100644 (file)
@@ -472,19 +472,19 @@ fullscreen/anonymous-block-merge-crash.html [ Pass ]
 # All IndexedDB tests are skipped in WK1.
 # Reenable individual tests here that are known to pass, with the eventual goal of re-enabling the entire directory.
 # (Except, skip them for now since https://bugs.webkit.org/show_bug.cgi?id=128341 is getting in the way of testing in general)
-storage/indexeddb/mozilla/add-twice-failure.html [ Pass ]
-storage/indexeddb/mozilla/autoincrement-indexes.html [ Pass ]
-storage/indexeddb/mozilla/clear.html [ Pass ]
-storage/indexeddb/mozilla/create-index-with-integer-keys.html [ Pass ]
-storage/indexeddb/mozilla/cursor-mutation-objectstore-only.html [ Pass ]
-storage/indexeddb/mozilla/cursor-mutation.html [ Pass ]
-storage/indexeddb/mozilla/cursors.html [ Pass ]
-storage/indexeddb/mozilla/index-prev-no-duplicate.html [ Pass ]
-storage/indexeddb/mozilla/indexes.html [ Pass ]
-storage/indexeddb/mozilla/object-cursors.html [ Pass ]
-storage/indexeddb/mozilla/object-store-inline-autoincrement-key-added-on-put.html [ Pass ]
-storage/indexeddb/mozilla/object-store-remove-values.html [ Pass ]
-storage/indexeddb/mozilla/versionchange-abort.html [ Pass ]
+storage/indexeddb/mozilla/add-twice-failure.html [ Pass ]
+storage/indexeddb/mozilla/autoincrement-indexes.html [ Pass ]
+storage/indexeddb/mozilla/clear.html [ Pass ]
+storage/indexeddb/mozilla/create-index-with-integer-keys.html [ Pass ]
+storage/indexeddb/mozilla/cursor-mutation-objectstore-only.html [ Pass ]
+storage/indexeddb/mozilla/cursor-mutation.html [ Pass ]
+storage/indexeddb/mozilla/cursors.html [ Pass ]
+storage/indexeddb/mozilla/index-prev-no-duplicate.html [ Pass ]
+storage/indexeddb/mozilla/indexes.html [ Pass ]
+storage/indexeddb/mozilla/object-cursors.html [ Pass ]
+storage/indexeddb/mozilla/object-store-inline-autoincrement-key-added-on-put.html [ Pass ]
+storage/indexeddb/mozilla/object-store-remove-values.html [ Pass ]
+storage/indexeddb/mozilla/versionchange-abort.html [ Pass ]
 
 ### END OF (5) Features that are not supported in WebKit1, so skipped in mac/TestExpectations then re-enabled here
 ########################################
index 05ec98e..1c8e5e8 100644 (file)
@@ -1,3 +1,14 @@
+2014-02-10  Brady Eidson  <beidson@apple.com>
+
+        IndexedDB assertion at IDBTransactionBackend::~IDBTransactionBackend()
+        https://bugs.webkit.org/show_bug.cgi?id=128341
+
+        Reviewed by Maciej Stachowiak.
+
+        * Modules/indexeddb/IDBTransactionBackend.cpp:
+        (WebCore::IDBTransactionBackend::~IDBTransactionBackend): "Finished" is not the only
+          valid value here - In WK2, "Unused" is also valid. Update the ASSERT.
+
 2014-02-10  Alexey Proskuryakov  <ap@apple.com>
 
         Add hooks for wrapping CryptoKeys in SerializedScriptValue
index 14201b7..d50d629 100644 (file)
@@ -83,8 +83,8 @@ IDBTransactionBackend::IDBTransactionBackend(IDBDatabaseBackend* databaseBackend
 
 IDBTransactionBackend::~IDBTransactionBackend()
 {
-    // It shouldn't be possible for this object to get deleted until it's either complete or aborted.
-    ASSERT(m_state == Finished);
+    // It shouldn't be possible for this object to get deleted unless it's unused, complete, or aborted.
+    ASSERT(m_state == Finished || m_state == Unused);
 }
 
 void IDBTransactionBackend::scheduleTask(IDBDatabaseBackend::TaskType type, PassRefPtr<IDBOperation> task, PassRefPtr<IDBSynchronousOperation> abortTask)