Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.

1 files changed, 4 insertions, 2 deletions

diff --git a/Source/WebKit/chromium/src/WebIDBMetadata.cpp b/Source/WebKit/chromium/src/WebIDBMetadata.cpp
index dd1c2c8e5..2ca5bf7c7 100644
--- a/Source/WebKit/chromium/src/WebIDBMetadata.cpp
+++ b/Source/WebKit/chromium/src/WebIDBMetadata.cpp
@@ -49,6 +49,7 @@ WebIDBMetadata::WebIDBMetadata(const WebCore::IDBDatabaseMetadata& metadata)
     for (IDBDatabaseMetadata::ObjectStoreMap::const_iterator storeIterator = metadata.objectStores.begin(); storeIterator != metadata.objectStores.end(); ++storeIterator) {
         const IDBObjectStoreMetadata& objectStore = storeIterator->value;
         ObjectStore webObjectStore;
+        webObjectStore.id = objectStore.id;
         webObjectStore.name = objectStore.name;
         webObjectStore.keyPath = objectStore.keyPath;
         webObjectStore.autoIncrement = objectStore.autoIncrement;
@@ -59,6 +60,7 @@ WebIDBMetadata::WebIDBMetadata(const WebCore::IDBDatabaseMetadata& metadata)
         for (IDBObjectStoreMetadata::IndexMap::const_iterator indexIterator = objectStore.indexes.begin(); indexIterator != objectStore.indexes.end(); ++indexIterator) {
             const IDBIndexMetadata& index = indexIterator->value;
             Index webIndex;
+            webIndex.id = index.id;
             webIndex.name = index.name;
             webIndex.keyPath = index.keyPath;
             webIndex.unique = index.unique;
@@ -79,9 +81,9 @@ WebIDBMetadata::operator IDBDatabaseMetadata() const
         for (size_t j = 0; j < webObjectStore.indexes.size(); ++j) {
             const Index webIndex = webObjectStore.indexes[j];
             IDBIndexMetadata index(webIndex.name, webIndex.id, webIndex.keyPath, webIndex.unique, webIndex.multiEntry);
-            objectStore.indexes.set(index.name, index);
+            objectStore.indexes.set(index.id, index);
         }
-        db.objectStores.set(objectStore.name, objectStore);
+        db.objectStores.set(objectStore.id, objectStore);
     }
     return db;
 }