Title: [87086] branches/chromium/742
- Revision
- 87086
- Author
- [email protected]
- Date
- 2011-05-23 11:47:42 -0700 (Mon, 23 May 2011)
Log Message
Merge 86665
BUG=82416
Review URL: http://codereview.chromium.org/7065004
Modified Paths
Diff
Modified: branches/chromium/742/LayoutTests/storage/indexeddb/index-basics-expected.txt (87085 => 87086)
--- branches/chromium/742/LayoutTests/storage/indexeddb/index-basics-expected.txt 2011-05-23 18:44:48 UTC (rev 87085)
+++ branches/chromium/742/LayoutTests/storage/indexeddb/index-basics-expected.txt 2011-05-23 18:47:42 UTC (rev 87086)
@@ -27,8 +27,9 @@
PASS 'getKey' in indexObject is true
PASS 'get' in indexObject is true
store.add({x: 'value', y: 'zzz', z: 2.72}, 'key')
-event.target.source.add({x: 'value2', y: 'zzz2', z: 2.71}, 'key2')
+event.target.source.add({x: 'value2', y: 'zzz2', z: 2.71, foobar: 12}, 'key2')
store.createIndex('indexWhileAddIsInFlight', 'x')
+store.createIndex('indexWithWeirdKeyPath', 'foobar')
indexObject.getKey('value')
PASS event.target.result is "key"
indexObject2.getKey('zzz')
Modified: branches/chromium/742/LayoutTests/storage/indexeddb/index-basics.html (87085 => 87086)
--- branches/chromium/742/LayoutTests/storage/indexeddb/index-basics.html 2011-05-23 18:44:48 UTC (rev 87085)
+++ branches/chromium/742/LayoutTests/storage/indexeddb/index-basics.html 2011-05-23 18:47:42 UTC (rev 87086)
@@ -68,10 +68,11 @@
function addMore()
{
- request = evalAndLog("event.target.source.add({x: 'value2', y: 'zzz2', z: 2.71}, 'key2')");
+ request = evalAndLog("event.target.source.add({x: 'value2', y: 'zzz2', z: 2.71, foobar: 12}, 'key2')");
request._onsuccess_ = getData;
request._onerror_ = unexpectedErrorCallback;
window.indexObject4 = evalAndLog("store.createIndex('indexWhileAddIsInFlight', 'x')");
+ window.indexObject5 = evalAndLog("store.createIndex('indexWithWeirdKeyPath', 'foobar')");
}
function getData()
Modified: branches/chromium/742/Source/WebCore/storage/IDBObjectStoreBackendImpl.cpp (87085 => 87086)
--- branches/chromium/742/Source/WebCore/storage/IDBObjectStoreBackendImpl.cpp 2011-05-23 18:44:48 UTC (rev 87085)
+++ branches/chromium/742/Source/WebCore/storage/IDBObjectStoreBackendImpl.cpp 2011-05-23 18:47:42 UTC (rev 87086)
@@ -341,6 +341,8 @@
RefPtr<SerializedScriptValue> objectValue = SerializedScriptValue::createFromWire(value);
RefPtr<IDBKey> indexKey = fetchKeyFromKeyPath(objectValue.get(), m_indexKeyPath);
+ if (!indexKey)
+ return true;
if (!m_backingStore.putIndexDataForRecord(m_databaseId, m_objectStoreId, m_indexId, *indexKey, recordIdentifier))
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
