<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185604] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185604">185604</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-06-16 13:24:55 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[IndexedDB] array index keys are concatenated across cursor lifetime
<rdar://problem/19684902> and https://bugs.webkit.org/show_bug.cgi?id=138504
Reviewed by Brady Eidson, patch by Mark Dixon <mark@lowla.io>
Source/WebCore:
Tested by:
storage/indexeddb/keypath-arrays.html
IDBKeyData and IDBKeyPath need to clear any existing array values before calling
decodeObjects to update the value of an existing object.
* Modules/indexeddb/IDBKeyData.cpp:
(WebCore::IDBKeyData::decode):
* Modules/indexeddb/IDBKeyPath.cpp:
(WebCore::IDBKeyPath::decode):
LayoutTests:
* storage/indexeddb/keypath-arrays-expected.txt:
* storage/indexeddb/resources/keypath-arrays.js:
Verify that iterating cursors with array keypaths returns correct keys for all
records, not just the first.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbkeypatharraysexpectedtxt">trunk/LayoutTests/storage/indexeddb/keypath-arrays-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbresourceskeypatharraysjs">trunk/LayoutTests/storage/indexeddb/resources/keypath-arrays.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185603 => 185604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-16 19:50:59 UTC (rev 185603)
+++ trunk/LayoutTests/ChangeLog 2015-06-16 20:24:55 UTC (rev 185604)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-16 Brady Eidson <beidson@apple.com>
+
+ [IndexedDB] array index keys are concatenated across cursor lifetime
+ <rdar://problem/19684902> and https://bugs.webkit.org/show_bug.cgi?id=138504
+
+ Reviewed by Brady Eidson, patch by Mark Dixon <mark@lowla.io>
+
+ * storage/indexeddb/keypath-arrays-expected.txt:
+ * storage/indexeddb/resources/keypath-arrays.js:
+ Verify that iterating cursors with array keypaths returns correct keys for all
+ records, not just the first.
+
</ins><span class="cx"> 2015-06-16 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Canvas dimensions should be limited to 4096x4096 pixels on iOS devices.
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbkeypatharraysexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/keypath-arrays-expected.txt (185603 => 185604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/keypath-arrays-expected.txt 2015-06-16 19:50:59 UTC (rev 185603)
+++ trunk/LayoutTests/storage/indexeddb/keypath-arrays-expected.txt 2015-06-16 20:24:55 UTC (rev 185604)
</span><span class="lines">@@ -35,15 +35,23 @@
</span><span class="cx"> index = store.index('index')
</span><span class="cx">
</span><span class="cx"> request = store.put({a: 1, b: 2, c: 3, d: 4})
</span><ins>+request = store.put({a: 5, b: 6, c: 7, d: 8})
</ins><span class="cx"> request = store.openCursor()
</span><span class="cx"> cursor = request.result
</span><span class="cx"> PASS cursor is non-null.
</span><span class="cx"> PASS JSON.stringify(cursor.key) is "[1,2]"
</span><ins>+cursor = request.result
+PASS cursor is non-null.
+PASS JSON.stringify(cursor.key) is "[5,6]"
</ins><span class="cx"> request = index.openCursor()
</span><span class="cx"> cursor = request.result
</span><span class="cx"> PASS cursor is non-null.
</span><span class="cx"> PASS JSON.stringify(cursor.primaryKey) is "[1,2]"
</span><span class="cx"> PASS JSON.stringify(cursor.key) is "[3,4]"
</span><ins>+cursor = request.result
+PASS cursor is non-null.
+PASS JSON.stringify(cursor.primaryKey) is "[5,6]"
+PASS JSON.stringify(cursor.key) is "[7,8]"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbresourceskeypatharraysjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/resources/keypath-arrays.js (185603 => 185604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/resources/keypath-arrays.js 2015-06-16 19:50:59 UTC (rev 185603)
+++ trunk/LayoutTests/storage/indexeddb/resources/keypath-arrays.js 2015-06-16 20:24:55 UTC (rev 185604)
</span><span class="lines">@@ -35,6 +35,9 @@
</span><span class="cx"> debug("");
</span><span class="cx"> evalAndLog("request = store.put({a: 1, b: 2, c: 3, d: 4})");
</span><span class="cx"> request.onerror = unexpectedErrorCallback;
</span><ins>+ evalAndLog("request = store.put({a: 5, b: 6, c: 7, d: 8})");
+ request.onerror = unexpectedErrorCallback;
+ iteration = 0;
</ins><span class="cx"> checkStore();
</span><span class="cx">
</span><span class="cx"> function checkStore() {
</span><span class="lines">@@ -43,8 +46,15 @@
</span><span class="cx"> request.onsuccess = function () {
</span><span class="cx"> evalAndLog("cursor = request.result");
</span><span class="cx"> shouldBeNonNull("cursor");
</span><del>- shouldBeEqualToString("JSON.stringify(cursor.key)", "[1,2]");
- checkIndex();
</del><ins>+ shouldBeEqualToString("JSON.stringify(cursor.key)", ["[1,2]", "[5,6]"][iteration]);
+ if (0 === iteration) {
+ ++iteration;
+ cursor.continue();
+ }
+ else {
+ iteration = 0;
+ checkIndex();
+ }
</ins><span class="cx"> };
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -54,8 +64,12 @@
</span><span class="cx"> request.onsuccess = function () {
</span><span class="cx"> evalAndLog("cursor = request.result");
</span><span class="cx"> shouldBeNonNull("cursor");
</span><del>- shouldBeEqualToString("JSON.stringify(cursor.primaryKey)", "[1,2]");
- shouldBeEqualToString("JSON.stringify(cursor.key)", "[3,4]");
</del><ins>+ shouldBeEqualToString("JSON.stringify(cursor.primaryKey)", ["[1,2]", "[5,6]"][iteration]);
+ shouldBeEqualToString("JSON.stringify(cursor.key)", ["[3,4]", "[7,8]"][iteration]);
+ if (0 === iteration) {
+ ++iteration;
+ cursor.continue();
+ }
</ins><span class="cx"> };
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185603 => 185604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-16 19:50:59 UTC (rev 185603)
+++ trunk/Source/WebCore/ChangeLog 2015-06-16 20:24:55 UTC (rev 185604)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-06-16 Brady Eidson <beidson@apple.com>
+
+ [IndexedDB] array index keys are concatenated across cursor lifetime
+ <rdar://problem/19684902> and https://bugs.webkit.org/show_bug.cgi?id=138504
+
+ Reviewed by Brady Eidson, patch by Mark Dixon <mark@lowla.io>
+
+ Tested by:
+ storage/indexeddb/keypath-arrays.html
+
+ IDBKeyData and IDBKeyPath need to clear any existing array values before calling
+ decodeObjects to update the value of an existing object.
+
+ * Modules/indexeddb/IDBKeyData.cpp:
+ (WebCore::IDBKeyData::decode):
+ * Modules/indexeddb/IDBKeyPath.cpp:
+ (WebCore::IDBKeyPath::decode):
+
</ins><span class="cx"> 2015-06-16 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Canvas dimensions should be limited to 4096x4096 pixels on iOS devices.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp (185603 => 185604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2015-06-16 19:50:59 UTC (rev 185603)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2015-06-16 20:24:55 UTC (rev 185604)
</span><span class="lines">@@ -201,6 +201,8 @@
</span><span class="cx"> auto arrayFunction = [](KeyedDecoder& decoder, IDBKeyData& result) {
</span><span class="cx"> return decode(decoder, result);
</span><span class="cx"> };
</span><ins>+
+ result.arrayValue.clear();
</ins><span class="cx"> return decoder.decodeObjects("array", result.arrayValue, arrayFunction);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp (185603 => 185604)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp 2015-06-16 19:50:59 UTC (rev 185603)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp 2015-06-16 20:24:55 UTC (rev 185604)
</span><span class="lines">@@ -300,6 +300,7 @@
</span><span class="cx"> return decoder.decodeString("string", result);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ result.m_array.clear();
</ins><span class="cx"> return decoder.decodeObjects("array", result.m_array, arrayFunction);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>