<!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>[196137] 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/196137">196137</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-02-04 11:46:47 -0800 (Thu, 04 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: LayoutTest imported/w3c/indexeddb/keyorder-private.html is flaky.
https://bugs.webkit.org/show_bug.cgi?id=153438.
Reviewed by Alex Christensen.
Source/WebCore:
Tests: storage/indexeddb/modern/idbkey-array-equality-private.html
storage/indexeddb/modern/idbkey-array-equality.html
* Modules/indexeddb/IDBKeyData.cpp:
(WebCore::IDBKeyData::loggingString):
(WebCore::IDBKeyData::operator==): Fix obvious bug.
LayoutTests:
* platform/mac-wk1/TestExpectations: Re-enable the flaky test.
* resources/js-test.js:
* storage/indexeddb/modern/idbkey-array-equality-expected.txt: Added.
* storage/indexeddb/modern/idbkey-array-equality-private-expected.txt: Added.
* storage/indexeddb/modern/idbkey-array-equality-private.html: Added.
* storage/indexeddb/modern/idbkey-array-equality.html: Added.
* storage/indexeddb/modern/resources/idbkey-array-equality.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsresourcesjstestjs">trunk/LayoutTests/resources/js-test.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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbkeyarrayequalityexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbkeyarrayequalityprivateexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality-private-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbkeyarrayequalityprivatehtml">trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality-private.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbkeyarrayequalityhtml">trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesidbkeyarrayequalityjs">trunk/LayoutTests/storage/indexeddb/modern/resources/idbkey-array-equality.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196136 => 196137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-04 19:38:12 UTC (rev 196136)
+++ trunk/LayoutTests/ChangeLog 2016-02-04 19:46:47 UTC (rev 196137)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-04 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: LayoutTest imported/w3c/indexeddb/keyorder-private.html is flaky.
+ https://bugs.webkit.org/show_bug.cgi?id=153438.
+
+ Reviewed by Alex Christensen.
+
+ * platform/mac-wk1/TestExpectations: Re-enable the flaky test.
+ * resources/js-test.js:
+ * storage/indexeddb/modern/idbkey-array-equality-expected.txt: Added.
+ * storage/indexeddb/modern/idbkey-array-equality-private-expected.txt: Added.
+ * storage/indexeddb/modern/idbkey-array-equality-private.html: Added.
+ * storage/indexeddb/modern/idbkey-array-equality.html: Added.
+ * storage/indexeddb/modern/resources/idbkey-array-equality.js: Added.
+
</ins><span class="cx"> 2016-02-04 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Skip two flaky indexeddb tests on Yosemite Release WK2
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (196136 => 196137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-02-04 19:38:12 UTC (rev 196136)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-02-04 19:46:47 UTC (rev 196137)
</span><span class="lines">@@ -64,8 +64,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/153460 [ Debug ] inspector/codemirror/prettyprinting-css-rules.html [ Pass Timeout ]
</span><span class="cx">
</span><del>-webkit.org/b/153438 imported/w3c/indexeddb/keyorder-private.html [ Pass Failure ]
-
</del><span class="cx"> ### END OF (1) Failures with bug reports
</span><span class="cx"> ########################################
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsresourcesjstestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/resources/js-test.js (196136 => 196137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/resources/js-test.js 2016-02-04 19:38:12 UTC (rev 196136)
+++ trunk/LayoutTests/resources/js-test.js 2016-02-04 19:46:47 UTC (rev 196137)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx">
</span><span class="cx"> // If the test file URL ends in "-private.html", enable private browsing.
</span><del>- if (window.location.href.endsWith("-private.html"))
</del><ins>+ if (window.location.href.endsWith("-private.html") || self.enablePrivateBrowsing)
</ins><span class="cx"> testRunner.setPrivateBrowsingEnabled(true);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbkeyarrayequalityexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality-expected.txt (0 => 196137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality-expected.txt 2016-02-04 19:46:47 UTC (rev 196137)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+This test makes sure that array IDBKeys are correctly compared for equality during object store additions.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
+Successfully added all 500 array keys, without any conflicts.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbkeyarrayequalityprivateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality-private-expected.txt (0 => 196137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality-private-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality-private-expected.txt 2016-02-04 19:46:47 UTC (rev 196137)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+This test makes sure that array IDBKeys are correctly compared for equality during object store additions.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
+Successfully added all 500 array keys, without any conflicts.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbkeyarrayequalityprivatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality-private.html (0 => 196137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality-private.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality-private.html 2016-02-04 19:46:47 UTC (rev 196137)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<html>
+<head>
+<script>
+enablePrivateBrowsing = true;
+</script>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/idbkey-array-equality.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbkeyarrayequalityhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality.html (0 => 196137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbkey-array-equality.html 2016-02-04 19:46:47 UTC (rev 196137)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/idbkey-array-equality.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesidbkeyarrayequalityjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/resources/idbkey-array-equality.js (0 => 196137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/idbkey-array-equality.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/idbkey-array-equality.js 2016-02-04 19:46:47 UTC (rev 196137)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+description("This test makes sure that array IDBKeys are correctly compared for equality during object store additions.");
+
+indexedDBTest(prepareDatabase);
+
+var iterationCount = 500;
+var successCount = 0;
+function doAdd(objectStore, value)
+{
+ var key = [ 0, value ];
+ var request = objectStore.add("value", key);
+ request.onsuccess = function() {
+ if (++successCount == iterationCount) {
+ debug("Successfully added all 500 array keys, without any conflicts.");
+ finishJSTest();
+ }
+ };
+
+ request.onerror = function(event) {
+ debug("Error putting value into database (" + value + "): " + event.type);
+ finishJSTest();
+ }
+}
+
+function prepareDatabase(event)
+{
+ var transaction = event.target.transaction;
+ var database = event.target.result;
+
+ var objectStore = database.createObjectStore("TestObjectStore");
+
+ for (var i = 0; i < iterationCount; ++i)
+ doAdd(objectStore, i);
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196136 => 196137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-04 19:38:12 UTC (rev 196136)
+++ trunk/Source/WebCore/ChangeLog 2016-02-04 19:46:47 UTC (rev 196137)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-02-04 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: LayoutTest imported/w3c/indexeddb/keyorder-private.html is flaky.
+ https://bugs.webkit.org/show_bug.cgi?id=153438.
+
+ Reviewed by Alex Christensen.
+
+ Tests: storage/indexeddb/modern/idbkey-array-equality-private.html
+ storage/indexeddb/modern/idbkey-array-equality.html
+
+ * Modules/indexeddb/IDBKeyData.cpp:
+ (WebCore::IDBKeyData::loggingString):
+ (WebCore::IDBKeyData::operator==): Fix obvious bug.
+
</ins><span class="cx"> 2016-02-04 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix the EFL clean build after r196123
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp (196136 => 196137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2016-02-04 19:38:12 UTC (rev 196136)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2016-02-04 19:46:47 UTC (rev 196137)
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> result = "<string> - " + m_stringValue;
</span><span class="cx"> break;
</span><span class="cx"> case KeyType::Date:
</span><del>- return String::format("Date m_type - %f", m_numberValue);
</del><ins>+ return String::format("<date> - %f", m_numberValue);
</ins><span class="cx"> case KeyType::Number:
</span><span class="cx"> return String::format("<number> - %f", m_numberValue);
</span><span class="cx"> case KeyType::Max:
</span><span class="lines">@@ -356,13 +356,7 @@
</span><span class="cx"> case KeyType::String:
</span><span class="cx"> return m_stringValue == other.m_stringValue;
</span><span class="cx"> case KeyType::Array:
</span><del>- if (m_arrayValue.size() != other.m_arrayValue.size())
- return false;
- for (size_t i = 0; i < m_arrayValue.size(); ++i) {
- if (m_arrayValue[0] != other.m_arrayValue[0])
- return false;
- }
- return true;
</del><ins>+ return m_arrayValue == other.m_arrayValue;
</ins><span class="cx"> }
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>