<!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>[208359] 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/208359">208359</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-11-03 18:08:55 -0700 (Thu, 03 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>IndexedDB 2.0: Rename IDBKeyRange.contains to IDBKeyRange.includes.
https://bugs.webkit.org/show_bug.cgi?id=164383
Reviewed by Beth Dakin.
LayoutTests/imported/w3c:
* web-platform-tests/IndexedDB/idbkeyrange-includes-expected.txt:
Source/WebCore:
No new tests (Updated existing tests).
* Modules/indexeddb/IDBKeyRange.cpp:
(WebCore::IDBKeyRange::includes):
(WebCore::IDBKeyRange::contains): Deleted.
* Modules/indexeddb/IDBKeyRange.h:
* Modules/indexeddb/IDBKeyRange.idl:
LayoutTests:
* storage/indexeddb/resources/keyrange.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBidbkeyrangeincludesexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbkeyrange-includes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbkeyrangeexpectedtxt">trunk/LayoutTests/storage/indexeddb/keyrange-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbkeyrangeprivateexpectedtxt">trunk/LayoutTests/storage/indexeddb/keyrange-private-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbresourceskeyrangejs">trunk/LayoutTests/storage/indexeddb/resources/keyrange.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyRangecpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyRangeh">trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyRangeidl">trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208358 => 208359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-03 23:57:27 UTC (rev 208358)
+++ trunk/LayoutTests/ChangeLog 2016-11-04 01:08:55 UTC (rev 208359)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-11-03 Brady Eidson <beidson@apple.com>
+
+ IndexedDB 2.0: Rename IDBKeyRange.contains to IDBKeyRange.includes.
+ https://bugs.webkit.org/show_bug.cgi?id=164383
+
+ Reviewed by Beth Dakin.
+
+ * storage/indexeddb/resources/keyrange.js:
+
</ins><span class="cx"> 2016-11-03 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking two inspector/sampling-profiler tests as flaky.
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (208358 => 208359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-11-03 23:57:27 UTC (rev 208358)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-11-04 01:08:55 UTC (rev 208359)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2016-11-03 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ IndexedDB 2.0: Rename IDBKeyRange.contains to IDBKeyRange.includes.
+ https://bugs.webkit.org/show_bug.cgi?id=164383
+
+ Reviewed by Beth Dakin.
+
+ * web-platform-tests/IndexedDB/idbkeyrange-includes-expected.txt:
+
+2016-11-03 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> IndexedDB 2.0: Support binary keys.
</span><span class="cx"> <rdar://problem/28806927> and https://bugs.webkit.org/show_bug.cgi?id=164359
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBidbkeyrangeincludesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbkeyrange-includes-expected.txt (208358 => 208359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbkeyrange-includes-expected.txt 2016-11-03 23:57:27 UTC (rev 208358)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbkeyrange-includes-expected.txt 2016-11-04 01:08:55 UTC (rev 208359)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx">
</span><del>-FAIL IDBKeyRange.includes() with a closed range assert_true: IDBKeyRange has a .includes expected true got false
-FAIL IDBKeyRange.includes() with an open range openRange.includes is not a function. (In 'openRange.includes(5)', 'openRange.includes' is undefined)
-FAIL IDBKeyRange.includes() with an only range range.includes is not a function. (In 'range.includes(42)', 'range.includes' is undefined)
-FAIL IDBKeyRange.includes() with an closed lower-bounded range range.includes is not a function. (In 'range.includes(4)', 'range.includes' is undefined)
-FAIL IDBKeyRange.includes() with an open lower-bounded range range.includes is not a function. (In 'range.includes(4)', 'range.includes' is undefined)
-FAIL IDBKeyRange.includes() with an closed upper-bounded range range.includes is not a function. (In 'range.includes(4)', 'range.includes' is undefined)
-FAIL IDBKeyRange.includes() with an open upper-bounded range range.includes is not a function. (In 'range.includes(4)', 'range.includes' is undefined)
</del><ins>+PASS IDBKeyRange.includes() with a closed range
+PASS IDBKeyRange.includes() with an open range
+PASS IDBKeyRange.includes() with an only range
+PASS IDBKeyRange.includes() with an closed lower-bounded range
+PASS IDBKeyRange.includes() with an open lower-bounded range
+PASS IDBKeyRange.includes() with an closed upper-bounded range
+PASS IDBKeyRange.includes() with an open upper-bounded range
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbkeyrangeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/keyrange-expected.txt (208358 => 208359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/keyrange-expected.txt 2016-11-03 23:57:27 UTC (rev 208358)
+++ trunk/LayoutTests/storage/indexeddb/keyrange-expected.txt 2016-11-04 01:08:55 UTC (rev 208359)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> PASS 'upper' in IDBKeyRange is false
</span><span class="cx"> PASS 'lowerOpen' in IDBKeyRange is false
</span><span class="cx"> PASS 'upperOpen' in IDBKeyRange is false
</span><del>-PASS 'contains' in IDBKeyRange is false
</del><ins>+PASS 'includes' in IDBKeyRange is false
</ins><span class="cx"> PASS 'only' in IDBKeyRange is true
</span><span class="cx"> PASS 'lowerBound' in IDBKeyRange is true
</span><span class="cx"> PASS 'upperBound' in IDBKeyRange is true
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> PASS 'upper' in instance is true
</span><span class="cx"> PASS 'lowerOpen' in instance is true
</span><span class="cx"> PASS 'upperOpen' in instance is true
</span><del>-PASS 'contains' in instance is true
</del><ins>+PASS 'includes' in instance is true
</ins><span class="cx"> PASS 'only' in instance is false
</span><span class="cx"> PASS 'lowerBound' in instance is false
</span><span class="cx"> PASS 'upperBound' in instance is false
</span><span class="lines">@@ -31,281 +31,281 @@
</span><span class="cx"> PASS keyRange.upper is 1
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(1.1) is false
-PASS keyRange.contains(0.9) is false
-PASS keyRange.contains(1) is true
</del><ins>+PASS keyRange.includes(1.1) is false
+PASS keyRange.includes(0.9) is false
+PASS keyRange.includes(1) is true
</ins><span class="cx"> IDBKeyRange.only(3.14)
</span><span class="cx"> PASS keyRange.lower is 3.14
</span><span class="cx"> PASS keyRange.upper is 3.14
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(3.24) is false
-PASS keyRange.contains(3.04) is false
-PASS keyRange.contains(3.14) is true
</del><ins>+PASS keyRange.includes(3.24) is false
+PASS keyRange.includes(3.04) is false
+PASS keyRange.includes(3.14) is true
</ins><span class="cx"> IDBKeyRange.only('a')
</span><span class="cx"> PASS keyRange.lower is 'a'
</span><span class="cx"> PASS keyRange.upper is 'a'
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains('aa') is false
-PASS keyRange.contains('') is false
-PASS keyRange.contains('a') is true
</del><ins>+PASS keyRange.includes('aa') is false
+PASS keyRange.includes('') is false
+PASS keyRange.includes('a') is true
</ins><span class="cx"> IDBKeyRange.lowerBound(10,true)
</span><span class="cx"> PASS keyRange.lower is 10
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(10) is false
-PASS keyRange.contains(10.1) is true
-PASS keyRange.contains(9.9) is false
</del><ins>+PASS keyRange.includes(10) is false
+PASS keyRange.includes(10.1) is true
+PASS keyRange.includes(9.9) is false
</ins><span class="cx"> IDBKeyRange.lowerBound(11,false)
</span><span class="cx"> PASS keyRange.lower is 11
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(11) is true
-PASS keyRange.contains(11.1) is true
-PASS keyRange.contains(10.9) is false
</del><ins>+PASS keyRange.includes(11) is true
+PASS keyRange.includes(11.1) is true
+PASS keyRange.includes(10.9) is false
</ins><span class="cx"> IDBKeyRange.lowerBound(12,undefined)
</span><span class="cx"> PASS keyRange.lower is 12
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(12) is true
-PASS keyRange.contains(12.1) is true
-PASS keyRange.contains(11.9) is false
</del><ins>+PASS keyRange.includes(12) is true
+PASS keyRange.includes(12.1) is true
+PASS keyRange.includes(11.9) is false
</ins><span class="cx"> IDBKeyRange.lowerBound(10.1,true)
</span><span class="cx"> PASS keyRange.lower is 10.1
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(10.1) is false
-PASS keyRange.contains(10.2) is true
-PASS keyRange.contains(10) is false
</del><ins>+PASS keyRange.includes(10.1) is false
+PASS keyRange.includes(10.2) is true
+PASS keyRange.includes(10) is false
</ins><span class="cx"> IDBKeyRange.lowerBound(11.2,false)
</span><span class="cx"> PASS keyRange.lower is 11.2
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(11.2) is true
-PASS keyRange.contains(11.299999999999999) is true
-PASS keyRange.contains(11.1) is false
</del><ins>+PASS keyRange.includes(11.2) is true
+PASS keyRange.includes(11.299999999999999) is true
+PASS keyRange.includes(11.1) is false
</ins><span class="cx"> IDBKeyRange.lowerBound(12.3,undefined)
</span><span class="cx"> PASS keyRange.lower is 12.3
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(12.3) is true
-PASS keyRange.contains(12.4) is true
-PASS keyRange.contains(12.200000000000001) is false
</del><ins>+PASS keyRange.includes(12.3) is true
+PASS keyRange.includes(12.4) is true
+PASS keyRange.includes(12.200000000000001) is false
</ins><span class="cx"> IDBKeyRange.lowerBound('aa',true)
</span><span class="cx"> PASS keyRange.lower is 'aa'
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains('aa') is false
-PASS keyRange.contains('aaa') is true
-PASS keyRange.contains('a') is false
</del><ins>+PASS keyRange.includes('aa') is false
+PASS keyRange.includes('aaa') is true
+PASS keyRange.includes('a') is false
</ins><span class="cx"> IDBKeyRange.lowerBound('ab',false)
</span><span class="cx"> PASS keyRange.lower is 'ab'
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains('ab') is true
-PASS keyRange.contains('abb') is true
-PASS keyRange.contains('a') is false
</del><ins>+PASS keyRange.includes('ab') is true
+PASS keyRange.includes('abb') is true
+PASS keyRange.includes('a') is false
</ins><span class="cx"> IDBKeyRange.lowerBound('ac',undefined)
</span><span class="cx"> PASS keyRange.lower is 'ac'
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains('ac') is true
-PASS keyRange.contains('acc') is true
-PASS keyRange.contains('a') is false
</del><ins>+PASS keyRange.includes('ac') is true
+PASS keyRange.includes('acc') is true
+PASS keyRange.includes('a') is false
</ins><span class="cx"> IDBKeyRange.upperBound(20,true)
</span><span class="cx"> PASS keyRange.upper is 20
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains(20) is false
-PASS keyRange.contains(20.1) is false
-PASS keyRange.contains(19.9) is true
</del><ins>+PASS keyRange.includes(20) is false
+PASS keyRange.includes(20.1) is false
+PASS keyRange.includes(19.9) is true
</ins><span class="cx"> IDBKeyRange.upperBound(21,false)
</span><span class="cx"> PASS keyRange.upper is 21
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains(21) is true
-PASS keyRange.contains(21.1) is false
-PASS keyRange.contains(20.9) is true
</del><ins>+PASS keyRange.includes(21) is true
+PASS keyRange.includes(21.1) is false
+PASS keyRange.includes(20.9) is true
</ins><span class="cx"> IDBKeyRange.upperBound(22,undefined)
</span><span class="cx"> PASS keyRange.upper is 22
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains(22) is true
-PASS keyRange.contains(22.1) is false
-PASS keyRange.contains(21.9) is true
</del><ins>+PASS keyRange.includes(22) is true
+PASS keyRange.includes(22.1) is false
+PASS keyRange.includes(21.9) is true
</ins><span class="cx"> IDBKeyRange.upperBound(20.2,true)
</span><span class="cx"> PASS keyRange.upper is 20.2
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains(20.2) is false
-PASS keyRange.contains(20.3) is false
-PASS keyRange.contains(20.099999999999998) is true
</del><ins>+PASS keyRange.includes(20.2) is false
+PASS keyRange.includes(20.3) is false
+PASS keyRange.includes(20.099999999999998) is true
</ins><span class="cx"> IDBKeyRange.upperBound(21.3,false)
</span><span class="cx"> PASS keyRange.upper is 21.3
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains(21.3) is true
-PASS keyRange.contains(21.400000000000002) is false
-PASS keyRange.contains(21.2) is true
</del><ins>+PASS keyRange.includes(21.3) is true
+PASS keyRange.includes(21.400000000000002) is false
+PASS keyRange.includes(21.2) is true
</ins><span class="cx"> IDBKeyRange.upperBound(22.4,undefined)
</span><span class="cx"> PASS keyRange.upper is 22.4
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains(22.4) is true
-PASS keyRange.contains(22.5) is false
-PASS keyRange.contains(22.299999999999997) is true
</del><ins>+PASS keyRange.includes(22.4) is true
+PASS keyRange.includes(22.5) is false
+PASS keyRange.includes(22.299999999999997) is true
</ins><span class="cx"> IDBKeyRange.upperBound('ba',true)
</span><span class="cx"> PASS keyRange.upper is 'ba'
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains('ba') is false
-PASS keyRange.contains('baa') is false
-PASS keyRange.contains('b') is true
</del><ins>+PASS keyRange.includes('ba') is false
+PASS keyRange.includes('baa') is false
+PASS keyRange.includes('b') is true
</ins><span class="cx"> IDBKeyRange.upperBound('bb',false)
</span><span class="cx"> PASS keyRange.upper is 'bb'
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains('bb') is true
-PASS keyRange.contains('bbb') is false
-PASS keyRange.contains('b') is true
</del><ins>+PASS keyRange.includes('bb') is true
+PASS keyRange.includes('bbb') is false
+PASS keyRange.includes('b') is true
</ins><span class="cx"> IDBKeyRange.upperBound('bc',undefined)
</span><span class="cx"> PASS keyRange.upper is 'bc'
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains('bc') is true
-PASS keyRange.contains('bcc') is false
-PASS keyRange.contains('b') is true
</del><ins>+PASS keyRange.includes('bc') is true
+PASS keyRange.includes('bcc') is false
+PASS keyRange.includes('b') is true
</ins><span class="cx"> IDBKeyRange.bound(30,40, undefined, undefined)
</span><span class="cx"> PASS keyRange.lower is 30
</span><span class="cx"> PASS keyRange.upper is 40
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(30) is true
-PASS keyRange.contains(40) is true
</del><ins>+PASS keyRange.includes(30) is true
+PASS keyRange.includes(40) is true
</ins><span class="cx"> IDBKeyRange.bound(31,41, false, false)
</span><span class="cx"> PASS keyRange.lower is 31
</span><span class="cx"> PASS keyRange.upper is 41
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(31) is true
-PASS keyRange.contains(41) is true
</del><ins>+PASS keyRange.includes(31) is true
+PASS keyRange.includes(41) is true
</ins><span class="cx"> IDBKeyRange.bound(32,42, false, true)
</span><span class="cx"> PASS keyRange.lower is 32
</span><span class="cx"> PASS keyRange.upper is 42
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(32) is true
-PASS keyRange.contains(42) is false
</del><ins>+PASS keyRange.includes(32) is true
+PASS keyRange.includes(42) is false
</ins><span class="cx"> IDBKeyRange.bound(33,43, true, false)
</span><span class="cx"> PASS keyRange.lower is 33
</span><span class="cx"> PASS keyRange.upper is 43
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(33) is false
-PASS keyRange.contains(43) is true
</del><ins>+PASS keyRange.includes(33) is false
+PASS keyRange.includes(43) is true
</ins><span class="cx"> IDBKeyRange.bound(34,44, true, true)
</span><span class="cx"> PASS keyRange.lower is 34
</span><span class="cx"> PASS keyRange.upper is 44
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(34) is false
-PASS keyRange.contains(44) is false
</del><ins>+PASS keyRange.includes(34) is false
+PASS keyRange.includes(44) is false
</ins><span class="cx"> IDBKeyRange.bound(30.1,40.2, undefined, undefined)
</span><span class="cx"> PASS keyRange.lower is 30.1
</span><span class="cx"> PASS keyRange.upper is 40.2
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(30.1) is true
-PASS keyRange.contains(40.2) is true
</del><ins>+PASS keyRange.includes(30.1) is true
+PASS keyRange.includes(40.2) is true
</ins><span class="cx"> IDBKeyRange.bound(31.3,41.4, false, false)
</span><span class="cx"> PASS keyRange.lower is 31.3
</span><span class="cx"> PASS keyRange.upper is 41.4
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(31.3) is true
-PASS keyRange.contains(41.4) is true
</del><ins>+PASS keyRange.includes(31.3) is true
+PASS keyRange.includes(41.4) is true
</ins><span class="cx"> IDBKeyRange.bound(32.5,42.6, false, true)
</span><span class="cx"> PASS keyRange.lower is 32.5
</span><span class="cx"> PASS keyRange.upper is 42.6
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(32.5) is true
-PASS keyRange.contains(42.6) is false
</del><ins>+PASS keyRange.includes(32.5) is true
+PASS keyRange.includes(42.6) is false
</ins><span class="cx"> IDBKeyRange.bound(33.7,43.8, true, false)
</span><span class="cx"> PASS keyRange.lower is 33.7
</span><span class="cx"> PASS keyRange.upper is 43.8
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(33.7) is false
-PASS keyRange.contains(43.8) is true
</del><ins>+PASS keyRange.includes(33.7) is false
+PASS keyRange.includes(43.8) is true
</ins><span class="cx"> IDBKeyRange.bound(34.9,44, true, true)
</span><span class="cx"> PASS keyRange.lower is 34.9
</span><span class="cx"> PASS keyRange.upper is 44
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(34.9) is false
-PASS keyRange.contains(44) is false
</del><ins>+PASS keyRange.includes(34.9) is false
+PASS keyRange.includes(44) is false
</ins><span class="cx"> IDBKeyRange.bound('aaa','aba', false, false)
</span><span class="cx"> PASS keyRange.lower is 'aaa'
</span><span class="cx"> PASS keyRange.upper is 'aba'
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains('aaa') is true
-PASS keyRange.contains('aba') is true
</del><ins>+PASS keyRange.includes('aaa') is true
+PASS keyRange.includes('aba') is true
</ins><span class="cx"> IDBKeyRange.bound('aab','abb', undefined, undefined)
</span><span class="cx"> PASS keyRange.lower is 'aab'
</span><span class="cx"> PASS keyRange.upper is 'abb'
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains('aab') is true
-PASS keyRange.contains('abb') is true
</del><ins>+PASS keyRange.includes('aab') is true
+PASS keyRange.includes('abb') is true
</ins><span class="cx"> IDBKeyRange.bound('aac','abc', false, false)
</span><span class="cx"> PASS keyRange.lower is 'aac'
</span><span class="cx"> PASS keyRange.upper is 'abc'
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains('aac') is true
-PASS keyRange.contains('abc') is true
</del><ins>+PASS keyRange.includes('aac') is true
+PASS keyRange.includes('abc') is true
</ins><span class="cx"> IDBKeyRange.bound('aad','abd', false, true)
</span><span class="cx"> PASS keyRange.lower is 'aad'
</span><span class="cx"> PASS keyRange.upper is 'abd'
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains('aad') is true
-PASS keyRange.contains('abd') is false
</del><ins>+PASS keyRange.includes('aad') is true
+PASS keyRange.includes('abd') is false
</ins><span class="cx"> IDBKeyRange.bound('aae','abe', true, false)
</span><span class="cx"> PASS keyRange.lower is 'aae'
</span><span class="cx"> PASS keyRange.upper is 'abe'
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains('aae') is false
-PASS keyRange.contains('abe') is true
</del><ins>+PASS keyRange.includes('aae') is false
+PASS keyRange.includes('abe') is true
</ins><span class="cx"> IDBKeyRange.bound('aaf','abf', true, true)
</span><span class="cx"> PASS keyRange.lower is 'aaf'
</span><span class="cx"> PASS keyRange.upper is 'abf'
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains('aaf') is false
-PASS keyRange.contains('abf') is false
</del><ins>+PASS keyRange.includes('aaf') is false
+PASS keyRange.includes('abf') is false
</ins><span class="cx"> Passing an invalid key into only({})
</span><span class="cx"> Expecting exception from IDBKeyRange.only({})
</span><span class="cx"> PASS Exception was thrown.
</span><span class="lines">@@ -367,12 +367,12 @@
</span><span class="cx"> PASS ename is 'DataError'
</span><span class="cx"> Exception message: The data provided does not meet requirements.
</span><span class="cx"> Equal keys, none of the bounds is open, bound(4, 4, false, false)
</span><del>-Passing an invalid key in to IDBKeyRange.contains({})
-Expecting exception from invalidKeyKeyRange.contains({})
</del><ins>+Passing an invalid key in to IDBKeyRange.includes({})
+Expecting exception from invalidKeyKeyRange.includes({})
</ins><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'DataError'
</span><del>-Exception message: Failed to execute 'contains' on 'IDBKeyRange': The passed-in value is not a valid IndexedDB key.
</del><ins>+Exception message: Failed to execute 'includes' on 'IDBKeyRange': The passed-in value is not a valid IndexedDB key.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbkeyrangeprivateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/keyrange-private-expected.txt (208358 => 208359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/keyrange-private-expected.txt 2016-11-03 23:57:27 UTC (rev 208358)
+++ trunk/LayoutTests/storage/indexeddb/keyrange-private-expected.txt 2016-11-04 01:08:55 UTC (rev 208359)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> PASS 'upper' in IDBKeyRange is false
</span><span class="cx"> PASS 'lowerOpen' in IDBKeyRange is false
</span><span class="cx"> PASS 'upperOpen' in IDBKeyRange is false
</span><del>-PASS 'contains' in IDBKeyRange is false
</del><ins>+PASS 'includes' in IDBKeyRange is false
</ins><span class="cx"> PASS 'only' in IDBKeyRange is true
</span><span class="cx"> PASS 'lowerBound' in IDBKeyRange is true
</span><span class="cx"> PASS 'upperBound' in IDBKeyRange is true
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> PASS 'upper' in instance is true
</span><span class="cx"> PASS 'lowerOpen' in instance is true
</span><span class="cx"> PASS 'upperOpen' in instance is true
</span><del>-PASS 'contains' in instance is true
</del><ins>+PASS 'includes' in instance is true
</ins><span class="cx"> PASS 'only' in instance is false
</span><span class="cx"> PASS 'lowerBound' in instance is false
</span><span class="cx"> PASS 'upperBound' in instance is false
</span><span class="lines">@@ -31,281 +31,281 @@
</span><span class="cx"> PASS keyRange.upper is 1
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(1.1) is false
-PASS keyRange.contains(0.9) is false
-PASS keyRange.contains(1) is true
</del><ins>+PASS keyRange.includes(1.1) is false
+PASS keyRange.includes(0.9) is false
+PASS keyRange.includes(1) is true
</ins><span class="cx"> IDBKeyRange.only(3.14)
</span><span class="cx"> PASS keyRange.lower is 3.14
</span><span class="cx"> PASS keyRange.upper is 3.14
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(3.24) is false
-PASS keyRange.contains(3.04) is false
-PASS keyRange.contains(3.14) is true
</del><ins>+PASS keyRange.includes(3.24) is false
+PASS keyRange.includes(3.04) is false
+PASS keyRange.includes(3.14) is true
</ins><span class="cx"> IDBKeyRange.only('a')
</span><span class="cx"> PASS keyRange.lower is 'a'
</span><span class="cx"> PASS keyRange.upper is 'a'
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains('aa') is false
-PASS keyRange.contains('') is false
-PASS keyRange.contains('a') is true
</del><ins>+PASS keyRange.includes('aa') is false
+PASS keyRange.includes('') is false
+PASS keyRange.includes('a') is true
</ins><span class="cx"> IDBKeyRange.lowerBound(10,true)
</span><span class="cx"> PASS keyRange.lower is 10
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(10) is false
-PASS keyRange.contains(10.1) is true
-PASS keyRange.contains(9.9) is false
</del><ins>+PASS keyRange.includes(10) is false
+PASS keyRange.includes(10.1) is true
+PASS keyRange.includes(9.9) is false
</ins><span class="cx"> IDBKeyRange.lowerBound(11,false)
</span><span class="cx"> PASS keyRange.lower is 11
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(11) is true
-PASS keyRange.contains(11.1) is true
-PASS keyRange.contains(10.9) is false
</del><ins>+PASS keyRange.includes(11) is true
+PASS keyRange.includes(11.1) is true
+PASS keyRange.includes(10.9) is false
</ins><span class="cx"> IDBKeyRange.lowerBound(12,undefined)
</span><span class="cx"> PASS keyRange.lower is 12
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(12) is true
-PASS keyRange.contains(12.1) is true
-PASS keyRange.contains(11.9) is false
</del><ins>+PASS keyRange.includes(12) is true
+PASS keyRange.includes(12.1) is true
+PASS keyRange.includes(11.9) is false
</ins><span class="cx"> IDBKeyRange.lowerBound(10.1,true)
</span><span class="cx"> PASS keyRange.lower is 10.1
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(10.1) is false
-PASS keyRange.contains(10.2) is true
-PASS keyRange.contains(10) is false
</del><ins>+PASS keyRange.includes(10.1) is false
+PASS keyRange.includes(10.2) is true
+PASS keyRange.includes(10) is false
</ins><span class="cx"> IDBKeyRange.lowerBound(11.2,false)
</span><span class="cx"> PASS keyRange.lower is 11.2
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(11.2) is true
-PASS keyRange.contains(11.299999999999999) is true
-PASS keyRange.contains(11.1) is false
</del><ins>+PASS keyRange.includes(11.2) is true
+PASS keyRange.includes(11.299999999999999) is true
+PASS keyRange.includes(11.1) is false
</ins><span class="cx"> IDBKeyRange.lowerBound(12.3,undefined)
</span><span class="cx"> PASS keyRange.lower is 12.3
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(12.3) is true
-PASS keyRange.contains(12.4) is true
-PASS keyRange.contains(12.200000000000001) is false
</del><ins>+PASS keyRange.includes(12.3) is true
+PASS keyRange.includes(12.4) is true
+PASS keyRange.includes(12.200000000000001) is false
</ins><span class="cx"> IDBKeyRange.lowerBound('aa',true)
</span><span class="cx"> PASS keyRange.lower is 'aa'
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains('aa') is false
-PASS keyRange.contains('aaa') is true
-PASS keyRange.contains('a') is false
</del><ins>+PASS keyRange.includes('aa') is false
+PASS keyRange.includes('aaa') is true
+PASS keyRange.includes('a') is false
</ins><span class="cx"> IDBKeyRange.lowerBound('ab',false)
</span><span class="cx"> PASS keyRange.lower is 'ab'
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains('ab') is true
-PASS keyRange.contains('abb') is true
-PASS keyRange.contains('a') is false
</del><ins>+PASS keyRange.includes('ab') is true
+PASS keyRange.includes('abb') is true
+PASS keyRange.includes('a') is false
</ins><span class="cx"> IDBKeyRange.lowerBound('ac',undefined)
</span><span class="cx"> PASS keyRange.lower is 'ac'
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upper is undefined.
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains('ac') is true
-PASS keyRange.contains('acc') is true
-PASS keyRange.contains('a') is false
</del><ins>+PASS keyRange.includes('ac') is true
+PASS keyRange.includes('acc') is true
+PASS keyRange.includes('a') is false
</ins><span class="cx"> IDBKeyRange.upperBound(20,true)
</span><span class="cx"> PASS keyRange.upper is 20
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains(20) is false
-PASS keyRange.contains(20.1) is false
-PASS keyRange.contains(19.9) is true
</del><ins>+PASS keyRange.includes(20) is false
+PASS keyRange.includes(20.1) is false
+PASS keyRange.includes(19.9) is true
</ins><span class="cx"> IDBKeyRange.upperBound(21,false)
</span><span class="cx"> PASS keyRange.upper is 21
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains(21) is true
-PASS keyRange.contains(21.1) is false
-PASS keyRange.contains(20.9) is true
</del><ins>+PASS keyRange.includes(21) is true
+PASS keyRange.includes(21.1) is false
+PASS keyRange.includes(20.9) is true
</ins><span class="cx"> IDBKeyRange.upperBound(22,undefined)
</span><span class="cx"> PASS keyRange.upper is 22
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains(22) is true
-PASS keyRange.contains(22.1) is false
-PASS keyRange.contains(21.9) is true
</del><ins>+PASS keyRange.includes(22) is true
+PASS keyRange.includes(22.1) is false
+PASS keyRange.includes(21.9) is true
</ins><span class="cx"> IDBKeyRange.upperBound(20.2,true)
</span><span class="cx"> PASS keyRange.upper is 20.2
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains(20.2) is false
-PASS keyRange.contains(20.3) is false
-PASS keyRange.contains(20.099999999999998) is true
</del><ins>+PASS keyRange.includes(20.2) is false
+PASS keyRange.includes(20.3) is false
+PASS keyRange.includes(20.099999999999998) is true
</ins><span class="cx"> IDBKeyRange.upperBound(21.3,false)
</span><span class="cx"> PASS keyRange.upper is 21.3
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains(21.3) is true
-PASS keyRange.contains(21.400000000000002) is false
-PASS keyRange.contains(21.2) is true
</del><ins>+PASS keyRange.includes(21.3) is true
+PASS keyRange.includes(21.400000000000002) is false
+PASS keyRange.includes(21.2) is true
</ins><span class="cx"> IDBKeyRange.upperBound(22.4,undefined)
</span><span class="cx"> PASS keyRange.upper is 22.4
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains(22.4) is true
-PASS keyRange.contains(22.5) is false
-PASS keyRange.contains(22.299999999999997) is true
</del><ins>+PASS keyRange.includes(22.4) is true
+PASS keyRange.includes(22.5) is false
+PASS keyRange.includes(22.299999999999997) is true
</ins><span class="cx"> IDBKeyRange.upperBound('ba',true)
</span><span class="cx"> PASS keyRange.upper is 'ba'
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains('ba') is false
-PASS keyRange.contains('baa') is false
-PASS keyRange.contains('b') is true
</del><ins>+PASS keyRange.includes('ba') is false
+PASS keyRange.includes('baa') is false
+PASS keyRange.includes('b') is true
</ins><span class="cx"> IDBKeyRange.upperBound('bb',false)
</span><span class="cx"> PASS keyRange.upper is 'bb'
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains('bb') is true
-PASS keyRange.contains('bbb') is false
-PASS keyRange.contains('b') is true
</del><ins>+PASS keyRange.includes('bb') is true
+PASS keyRange.includes('bbb') is false
+PASS keyRange.includes('b') is true
</ins><span class="cx"> IDBKeyRange.upperBound('bc',undefined)
</span><span class="cx"> PASS keyRange.upper is 'bc'
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><span class="cx"> PASS keyRange.lower is undefined.
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><del>-PASS keyRange.contains('bc') is true
-PASS keyRange.contains('bcc') is false
-PASS keyRange.contains('b') is true
</del><ins>+PASS keyRange.includes('bc') is true
+PASS keyRange.includes('bcc') is false
+PASS keyRange.includes('b') is true
</ins><span class="cx"> IDBKeyRange.bound(30,40, undefined, undefined)
</span><span class="cx"> PASS keyRange.lower is 30
</span><span class="cx"> PASS keyRange.upper is 40
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(30) is true
-PASS keyRange.contains(40) is true
</del><ins>+PASS keyRange.includes(30) is true
+PASS keyRange.includes(40) is true
</ins><span class="cx"> IDBKeyRange.bound(31,41, false, false)
</span><span class="cx"> PASS keyRange.lower is 31
</span><span class="cx"> PASS keyRange.upper is 41
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(31) is true
-PASS keyRange.contains(41) is true
</del><ins>+PASS keyRange.includes(31) is true
+PASS keyRange.includes(41) is true
</ins><span class="cx"> IDBKeyRange.bound(32,42, false, true)
</span><span class="cx"> PASS keyRange.lower is 32
</span><span class="cx"> PASS keyRange.upper is 42
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(32) is true
-PASS keyRange.contains(42) is false
</del><ins>+PASS keyRange.includes(32) is true
+PASS keyRange.includes(42) is false
</ins><span class="cx"> IDBKeyRange.bound(33,43, true, false)
</span><span class="cx"> PASS keyRange.lower is 33
</span><span class="cx"> PASS keyRange.upper is 43
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(33) is false
-PASS keyRange.contains(43) is true
</del><ins>+PASS keyRange.includes(33) is false
+PASS keyRange.includes(43) is true
</ins><span class="cx"> IDBKeyRange.bound(34,44, true, true)
</span><span class="cx"> PASS keyRange.lower is 34
</span><span class="cx"> PASS keyRange.upper is 44
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(34) is false
-PASS keyRange.contains(44) is false
</del><ins>+PASS keyRange.includes(34) is false
+PASS keyRange.includes(44) is false
</ins><span class="cx"> IDBKeyRange.bound(30.1,40.2, undefined, undefined)
</span><span class="cx"> PASS keyRange.lower is 30.1
</span><span class="cx"> PASS keyRange.upper is 40.2
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(30.1) is true
-PASS keyRange.contains(40.2) is true
</del><ins>+PASS keyRange.includes(30.1) is true
+PASS keyRange.includes(40.2) is true
</ins><span class="cx"> IDBKeyRange.bound(31.3,41.4, false, false)
</span><span class="cx"> PASS keyRange.lower is 31.3
</span><span class="cx"> PASS keyRange.upper is 41.4
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(31.3) is true
-PASS keyRange.contains(41.4) is true
</del><ins>+PASS keyRange.includes(31.3) is true
+PASS keyRange.includes(41.4) is true
</ins><span class="cx"> IDBKeyRange.bound(32.5,42.6, false, true)
</span><span class="cx"> PASS keyRange.lower is 32.5
</span><span class="cx"> PASS keyRange.upper is 42.6
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(32.5) is true
-PASS keyRange.contains(42.6) is false
</del><ins>+PASS keyRange.includes(32.5) is true
+PASS keyRange.includes(42.6) is false
</ins><span class="cx"> IDBKeyRange.bound(33.7,43.8, true, false)
</span><span class="cx"> PASS keyRange.lower is 33.7
</span><span class="cx"> PASS keyRange.upper is 43.8
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains(33.7) is false
-PASS keyRange.contains(43.8) is true
</del><ins>+PASS keyRange.includes(33.7) is false
+PASS keyRange.includes(43.8) is true
</ins><span class="cx"> IDBKeyRange.bound(34.9,44, true, true)
</span><span class="cx"> PASS keyRange.lower is 34.9
</span><span class="cx"> PASS keyRange.upper is 44
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains(34.9) is false
-PASS keyRange.contains(44) is false
</del><ins>+PASS keyRange.includes(34.9) is false
+PASS keyRange.includes(44) is false
</ins><span class="cx"> IDBKeyRange.bound('aaa','aba', false, false)
</span><span class="cx"> PASS keyRange.lower is 'aaa'
</span><span class="cx"> PASS keyRange.upper is 'aba'
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains('aaa') is true
-PASS keyRange.contains('aba') is true
</del><ins>+PASS keyRange.includes('aaa') is true
+PASS keyRange.includes('aba') is true
</ins><span class="cx"> IDBKeyRange.bound('aab','abb', undefined, undefined)
</span><span class="cx"> PASS keyRange.lower is 'aab'
</span><span class="cx"> PASS keyRange.upper is 'abb'
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains('aab') is true
-PASS keyRange.contains('abb') is true
</del><ins>+PASS keyRange.includes('aab') is true
+PASS keyRange.includes('abb') is true
</ins><span class="cx"> IDBKeyRange.bound('aac','abc', false, false)
</span><span class="cx"> PASS keyRange.lower is 'aac'
</span><span class="cx"> PASS keyRange.upper is 'abc'
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains('aac') is true
-PASS keyRange.contains('abc') is true
</del><ins>+PASS keyRange.includes('aac') is true
+PASS keyRange.includes('abc') is true
</ins><span class="cx"> IDBKeyRange.bound('aad','abd', false, true)
</span><span class="cx"> PASS keyRange.lower is 'aad'
</span><span class="cx"> PASS keyRange.upper is 'abd'
</span><span class="cx"> PASS keyRange.lowerOpen is false
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains('aad') is true
-PASS keyRange.contains('abd') is false
</del><ins>+PASS keyRange.includes('aad') is true
+PASS keyRange.includes('abd') is false
</ins><span class="cx"> IDBKeyRange.bound('aae','abe', true, false)
</span><span class="cx"> PASS keyRange.lower is 'aae'
</span><span class="cx"> PASS keyRange.upper is 'abe'
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upperOpen is false
</span><del>-PASS keyRange.contains('aae') is false
-PASS keyRange.contains('abe') is true
</del><ins>+PASS keyRange.includes('aae') is false
+PASS keyRange.includes('abe') is true
</ins><span class="cx"> IDBKeyRange.bound('aaf','abf', true, true)
</span><span class="cx"> PASS keyRange.lower is 'aaf'
</span><span class="cx"> PASS keyRange.upper is 'abf'
</span><span class="cx"> PASS keyRange.lowerOpen is true
</span><span class="cx"> PASS keyRange.upperOpen is true
</span><del>-PASS keyRange.contains('aaf') is false
-PASS keyRange.contains('abf') is false
</del><ins>+PASS keyRange.includes('aaf') is false
+PASS keyRange.includes('abf') is false
</ins><span class="cx"> Passing an invalid key into only({})
</span><span class="cx"> Expecting exception from IDBKeyRange.only({})
</span><span class="cx"> PASS Exception was thrown.
</span><span class="lines">@@ -367,12 +367,12 @@
</span><span class="cx"> PASS ename is 'DataError'
</span><span class="cx"> Exception message: The data provided does not meet requirements.
</span><span class="cx"> Equal keys, none of the bounds is open, bound(4, 4, false, false)
</span><del>-Passing an invalid key in to IDBKeyRange.contains({})
-Expecting exception from invalidKeyKeyRange.contains({})
</del><ins>+Passing an invalid key in to IDBKeyRange.includes({})
+Expecting exception from invalidKeyKeyRange.includes({})
</ins><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'DataError'
</span><del>-Exception message: Failed to execute 'contains' on 'IDBKeyRange': The passed-in value is not a valid IndexedDB key.
</del><ins>+Exception message: Failed to execute 'includes' on 'IDBKeyRange': The passed-in value is not a valid IndexedDB key.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbresourceskeyrangejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/resources/keyrange.js (208358 => 208359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/resources/keyrange.js 2016-11-03 23:57:27 UTC (rev 208358)
+++ trunk/LayoutTests/storage/indexeddb/resources/keyrange.js 2016-11-04 01:08:55 UTC (rev 208359)
</span><span class="lines">@@ -44,9 +44,9 @@
</span><span class="cx"> shouldBe("keyRange.upper", "" + value);
</span><span class="cx"> shouldBeFalse("keyRange.lowerOpen");
</span><span class="cx"> shouldBeFalse("keyRange.upperOpen");
</span><del>- shouldBeFalse("keyRange.contains(" + incrementedKey(value) + ")");
- shouldBeFalse("keyRange.contains(" + decrementedKey(value) + ")");
- shouldBeTrue("keyRange.contains(" + value + ")");
</del><ins>+ shouldBeFalse("keyRange.includes(" + incrementedKey(value) + ")");
+ shouldBeFalse("keyRange.includes(" + decrementedKey(value) + ")");
+ shouldBeTrue("keyRange.includes(" + value + ")");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function checkLowerBoundKeyRange(value, open)
</span><span class="lines">@@ -60,12 +60,12 @@
</span><span class="cx"> shouldBeTrue("keyRange.upperOpen");
</span><span class="cx">
</span><span class="cx"> if (open)
</span><del>- shouldBeFalse("keyRange.contains(" + value + ")");
</del><ins>+ shouldBeFalse("keyRange.includes(" + value + ")");
</ins><span class="cx"> else
</span><del>- shouldBeTrue("keyRange.contains(" + value + ")");
</del><ins>+ shouldBeTrue("keyRange.includes(" + value + ")");
</ins><span class="cx">
</span><del>- shouldBeTrue("keyRange.contains(" + incrementedKey(value) + ")");
- shouldBeFalse("keyRange.contains(" + decrementedKey(value) + ")");
</del><ins>+ shouldBeTrue("keyRange.includes(" + incrementedKey(value) + ")");
+ shouldBeFalse("keyRange.includes(" + decrementedKey(value) + ")");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function checkUpperBoundKeyRange(value, open)
</span><span class="lines">@@ -79,12 +79,12 @@
</span><span class="cx"> shouldBeTrue("keyRange.lowerOpen");
</span><span class="cx">
</span><span class="cx"> if (open)
</span><del>- shouldBeFalse("keyRange.contains(" + value + ")");
</del><ins>+ shouldBeFalse("keyRange.includes(" + value + ")");
</ins><span class="cx"> else
</span><del>- shouldBeTrue("keyRange.contains(" + value + ")");
</del><ins>+ shouldBeTrue("keyRange.includes(" + value + ")");
</ins><span class="cx">
</span><del>- shouldBeFalse("keyRange.contains(" + incrementedKey(value) + ")");
- shouldBeTrue("keyRange.contains(" + decrementedKey(value) + ")");
</del><ins>+ shouldBeFalse("keyRange.includes(" + incrementedKey(value) + ")");
+ shouldBeTrue("keyRange.includes(" + decrementedKey(value) + ")");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function checkBoundKeyRange(lower, upper, lowerOpen, upperOpen)
</span><span class="lines">@@ -100,14 +100,14 @@
</span><span class="cx"> shouldBe("keyRange.upperOpen", "" + upperOpen);
</span><span class="cx">
</span><span class="cx"> if (lowerOpen)
</span><del>- shouldBeFalse("keyRange.contains(" + lower + ")");
</del><ins>+ shouldBeFalse("keyRange.includes(" + lower + ")");
</ins><span class="cx"> else
</span><del>- shouldBeTrue("keyRange.contains(" + lower + ")");
</del><ins>+ shouldBeTrue("keyRange.includes(" + lower + ")");
</ins><span class="cx">
</span><span class="cx"> if (upperOpen)
</span><del>- shouldBeFalse("keyRange.contains(" + upper + ")");
</del><ins>+ shouldBeFalse("keyRange.includes(" + upper + ")");
</ins><span class="cx"> else
</span><del>- shouldBeTrue("keyRange.contains(" + upper + ")");
</del><ins>+ shouldBeTrue("keyRange.includes(" + upper + ")");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test()
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> shouldBeFalse("'upper' in IDBKeyRange");
</span><span class="cx"> shouldBeFalse("'lowerOpen' in IDBKeyRange");
</span><span class="cx"> shouldBeFalse("'upperOpen' in IDBKeyRange");
</span><del>- shouldBeFalse("'contains' in IDBKeyRange");
</del><ins>+ shouldBeFalse("'includes' in IDBKeyRange");
</ins><span class="cx"> shouldBeTrue("'only' in IDBKeyRange");
</span><span class="cx"> shouldBeTrue("'lowerBound' in IDBKeyRange");
</span><span class="cx"> shouldBeTrue("'upperBound' in IDBKeyRange");
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> shouldBeTrue("'upper' in instance");
</span><span class="cx"> shouldBeTrue("'lowerOpen' in instance");
</span><span class="cx"> shouldBeTrue("'upperOpen' in instance");
</span><del>- shouldBeTrue("'contains' in instance");
</del><ins>+ shouldBeTrue("'includes' in instance");
</ins><span class="cx"> shouldBeFalse("'only' in instance");
</span><span class="cx"> shouldBeFalse("'lowerBound' in instance");
</span><span class="cx"> shouldBeFalse("'upperBound' in instance");
</span><span class="lines">@@ -214,9 +214,9 @@
</span><span class="cx"> debug("Equal keys, none of the bounds is open, bound(4, 4, false, false)");
</span><span class="cx"> IDBKeyRange.bound(4, 4, false, false);
</span><span class="cx">
</span><del>- debug("Passing an invalid key in to IDBKeyRange.contains({})");
</del><ins>+ debug("Passing an invalid key in to IDBKeyRange.includes({})");
</ins><span class="cx"> eval("invalidKeyKeyRange = IDBKeyRange.only('a')");
</span><del>- evalAndExpectException("invalidKeyKeyRange.contains({})", "0", "'DataError'");
</del><ins>+ evalAndExpectException("invalidKeyKeyRange.includes({})", "0", "'DataError'");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> test();
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208358 => 208359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-03 23:57:27 UTC (rev 208358)
+++ trunk/Source/WebCore/ChangeLog 2016-11-04 01:08:55 UTC (rev 208359)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-11-03 Brady Eidson <beidson@apple.com>
+
+ IndexedDB 2.0: Rename IDBKeyRange.contains to IDBKeyRange.includes.
+ https://bugs.webkit.org/show_bug.cgi?id=164383
+
+ Reviewed by Beth Dakin.
+
+ No new tests (Updated existing tests).
+
+ * Modules/indexeddb/IDBKeyRange.cpp:
+ (WebCore::IDBKeyRange::includes):
+ (WebCore::IDBKeyRange::contains): Deleted.
+ * Modules/indexeddb/IDBKeyRange.h:
+ * Modules/indexeddb/IDBKeyRange.idl:
+
</ins><span class="cx"> 2016-11-03 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r208302.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.cpp (208358 => 208359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.cpp 2016-11-03 23:57:27 UTC (rev 208358)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.cpp 2016-11-04 01:08:55 UTC (rev 208359)
</span><span class="lines">@@ -113,11 +113,11 @@
</span><span class="cx"> return m_lower && m_upper && !m_isLowerOpen && !m_isUpperOpen && m_lower->isEqual(*m_upper);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<bool> IDBKeyRange::contains(JSC::ExecState& state, JSC::JSValue keyValue)
</del><ins>+ExceptionOr<bool> IDBKeyRange::includes(JSC::ExecState& state, JSC::JSValue keyValue)
</ins><span class="cx"> {
</span><span class="cx"> auto key = scriptValueToIDBKey(state, keyValue);
</span><span class="cx"> if (!key->isValid())
</span><del>- return Exception { IDBDatabaseException::DataError, "Failed to execute 'contains' on 'IDBKeyRange': The passed-in value is not a valid IndexedDB key." };
</del><ins>+ return Exception { IDBDatabaseException::DataError, "Failed to execute 'includes' on 'IDBKeyRange': The passed-in value is not a valid IndexedDB key." };
</ins><span class="cx">
</span><span class="cx"> if (m_lower) {
</span><span class="cx"> int compare = m_lower->compare(key.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.h (208358 => 208359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.h 2016-11-03 23:57:27 UTC (rev 208358)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.h 2016-11-04 01:08:55 UTC (rev 208359)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> static ExceptionOr<Ref<IDBKeyRange>> bound(JSC::ExecState&, JSC::JSValue lower, JSC::JSValue upper, bool lowerOpen, bool upperOpen);
</span><span class="cx">
</span><del>- ExceptionOr<bool> contains(JSC::ExecState&, JSC::JSValue key);
</del><ins>+ ExceptionOr<bool> includes(JSC::ExecState&, JSC::JSValue key);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool isOnlyKey() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyRangeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.idl (208358 => 208359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.idl 2016-11-03 23:57:27 UTC (rev 208358)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.idl 2016-11-04 01:08:55 UTC (rev 208359)
</span><span class="lines">@@ -38,5 +38,5 @@
</span><span class="cx"> [CallWith=ScriptState, MayThrowException] static IDBKeyRange upperBound(any upper, optional boolean open = false);
</span><span class="cx"> [CallWith=ScriptState, MayThrowException] static IDBKeyRange bound(any lower, any upper, optional boolean lowerOpen = false, optional boolean upperOpen = false);
</span><span class="cx">
</span><del>- [CallWith=ScriptState, MayThrowException] boolean contains(any key);
</del><ins>+ [CallWith=ScriptState, MayThrowException] boolean includes(any key);
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>