IDB: storage/indexeddb/mozilla/cursor-update-updates-indexes.html ASSERTs
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Feb 2014 16:27:41 +0000 (16:27 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Feb 2014 16:27:41 +0000 (16:27 +0000)
<rdar://problem/16034112> and https://bugs.webkit.org/show_bug.cgi?id=128581

Reviewed by Alexey Proskuryakov.

Source/WebKit2:

* DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
(WebKit::UniqueIDBDatabase::getRecordFromBackingStore): Always store keyPath for Index get results.

LayoutTests:

* platform/mac-wk2/TestExpectations: Add the test to the enabled list.

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

LayoutTests/ChangeLog
LayoutTests/platform/mac-wk2/TestExpectations
Source/WebKit2/ChangeLog
Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp

index 20e93b1..ade80da 100644 (file)
@@ -1,3 +1,12 @@
+2014-02-11  Brady Eidson  <beidson@apple.com>
+
+        IDB: storage/indexeddb/mozilla/cursor-update-updates-indexes.html ASSERTs
+        <rdar://problem/16034112> and https://bugs.webkit.org/show_bug.cgi?id=128581
+
+        Reviewed by Alexey Proskuryakov.
+
+        * platform/mac-wk2/TestExpectations: Add the test to the enabled list.
+
 2014-02-11  Radu Stavila  <stavila@adobe.com>
 
         [CSS Regions] Overflow above the first region is not properly painted for regions with padding
index 4419b37..55419ae 100644 (file)
@@ -478,6 +478,7 @@ fullscreen/anonymous-block-merge-crash.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/cursor-update-updates-indexes.html [ Pass ]
 # storage/indexeddb/mozilla/cursors.html [ Pass ]
 # storage/indexeddb/mozilla/index-prev-no-duplicate.html [ Pass ]
 # storage/indexeddb/mozilla/indexes.html [ Pass ]
index 004b4b7..317dcd1 100644 (file)
@@ -1,3 +1,13 @@
+2014-02-11  Brady Eidson  <beidson@apple.com>
+
+        IDB: storage/indexeddb/mozilla/cursor-update-updates-indexes.html ASSERTs
+        <rdar://problem/16034112> and https://bugs.webkit.org/show_bug.cgi?id=128581
+
+        Reviewed by Alexey Proskuryakov.
+
+        * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
+        (WebKit::UniqueIDBDatabase::getRecordFromBackingStore): Always store keyPath for Index get results.
+
 2014-02-11  Alberto Garcia  <berto@igalia.com>
 
         O_CLOEXEC in shm_open does not work on FreeBSD
index 7fbac7b..c7578a9 100644 (file)
@@ -933,10 +933,8 @@ void UniqueIDBDatabase::getRecordFromBackingStore(uint64_t requestID, const IDBI
         return;
     }
 
-    // A get request that meets the following conditions needs to know the object store keypath
-    // to inject the result key into the result value object.
-    if (objectStoreMetadata.autoIncrement && !objectStoreMetadata.keyPath.isNull())
-        result.keyPath = objectStoreMetadata.keyPath;
+    // We must return a key path to know how to inject the result key into the result value object.
+    result.keyPath = objectStoreMetadata.keyPath;
 
     postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didGetRecordFromBackingStore, requestID, result, 0, String(StringImpl::empty())));
 }