<!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>[194595] 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/194595">194595</a></dd>

<dt>Author</dt> <dd>beidson@apple.com</dd>

<dt>Date</dt> <dd>2016-01-05 11:57:07 -0800 (Tue, 05 Jan 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Modern IDB: Error message updates for two failing tests.

https://bugs.webkit.org/show_bug.cgi?id=152735

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (Covered by existing tests).

Add error messages for various operations on deleted objects.

* Modules/indexeddb/client/IDBCursorImpl.cpp:

(WebCore::IDBClient::IDBCursor::update):

(WebCore::IDBClient::IDBCursor::advance):

(WebCore::IDBClient::IDBCursor::continueFunction):

(WebCore::IDBClient::IDBCursor::deleteFunction):

* Modules/indexeddb/client/IDBIndexImpl.cpp:

(WebCore::IDBClient::IDBIndex::openCursor):

(WebCore::IDBClient::IDBIndex::doCount):

(WebCore::IDBClient::IDBIndex::openKeyCursor):

(WebCore::IDBClient::IDBIndex::doGet):

(WebCore::IDBClient::IDBIndex::doGetKey):

* Modules/indexeddb/client/IDBObjectStoreImpl.cpp:

(WebCore::IDBClient::IDBObjectStore::openCursor):

(WebCore::IDBClient::IDBObjectStore::get):

(WebCore::IDBClient::IDBObjectStore::putOrAdd):

(WebCore::IDBClient::IDBObjectStore::deleteFunction):

(WebCore::IDBClient::IDBObjectStore::clear):

(WebCore::IDBClient::IDBObjectStore::createIndex):

(WebCore::IDBClient::IDBObjectStore::index):

(WebCore::IDBClient::IDBObjectStore::deleteIndex):

(WebCore::IDBClient::IDBObjectStore::doCount):

* bindings/js/JSIDBObjectStoreCustom.cpp:

(WebCore::JSIDBObjectStore::createIndex):

LayoutTests:

- Update results to accommodate new error messages.

- openKeyCursor on IDBObjectStore has been removed, so remove that from the results.

- &quot;undefined&quot; and &quot;null&quot; are invalid keys, so update the keypath-basics test to reflect this.

* platform/mac-wk1/TestExpectations:

* storage/indexeddb/deleted-objects-expected.txt:

* storage/indexeddb/keypath-basics-expected.txt:

* storage/indexeddb/resources/keypath-basics.js:

* storage/indexeddb/transaction-basics-expected.txt:</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="#trunkLayoutTestsstorageindexeddbdeletedobjectsexpectedtxt">trunk/LayoutTests/storage/indexeddb/deleted-objects-expected.txt</a></li>

<li><a href="#trunkLayoutTestsstorageindexeddbkeypathbasicsexpectedtxt">trunk/LayoutTests/storage/indexeddb/keypath-basics-expected.txt</a></li>

<li><a href="#trunkLayoutTestsstorageindexeddbresourceskeypathbasicsjs">trunk/LayoutTests/storage/indexeddb/resources/keypath-basics.js</a></li>

<li><a href="#trunkLayoutTestsstorageindexeddbtransactionbasicsexpectedtxt">trunk/LayoutTests/storage/indexeddb/transaction-basics-expected.txt</a></li>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBCursorImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBCursorImpl.cpp</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBIndexImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBIndexImpl.cpp</a></li>

<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBObjectStoreImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp</a></li>

<li><a href="#trunkSourceWebCorebindingsjsJSIDBObjectStoreCustomcpp">trunk/Source/WebCore/bindings/js/JSIDBObjectStoreCustom.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194594 => 194595)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2016-01-05 19:42:16 UTC (rev 194594)

+++ trunk/LayoutTests/ChangeLog        2016-01-05 19:57:07 UTC (rev 194595)

</span><span class="lines">@@ -1,5 +1,22 @@

</span><span class="cx"> 2016-01-05  Brady Eidson  &lt;beidson@apple.com&gt;

</span><span class="cx"> 

<ins>+        Modern IDB: Error message updates for two failing tests.

+        https://bugs.webkit.org/show_bug.cgi?id=152735

+

+        Reviewed by Alex Christensen.

+

+        - Update results to accommodate new error messages.

+        - openKeyCursor on IDBObjectStore has been removed, so remove that from the results.

+        - &quot;undefined&quot; and &quot;null&quot; are invalid keys, so update the keypath-basics test to reflect this.

+        

+        * platform/mac-wk1/TestExpectations:

+        * storage/indexeddb/deleted-objects-expected.txt:

+        * storage/indexeddb/keypath-basics-expected.txt:

+        * storage/indexeddb/resources/keypath-basics.js:

+        * storage/indexeddb/transaction-basics-expected.txt:

+

+2016-01-05  Brady Eidson  &lt;beidson@apple.com&gt;

+

</ins><span class="cx">         IndexedDB TestExpectations gardening.

</span><span class="cx"> 

<span class="cx">         Reviewed by Alex Christensen.

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (194594 => 194595)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations        2016-01-05 19:42:16 UTC (rev 194594)

+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations        2016-01-05 19:57:07 UTC (rev 194595)

</span><span class="lines">@@ -85,10 +85,6 @@

</span><span class="cx"> storage/indexeddb/intversion-long-queue.html [ Skip ]

</span><span class="cx"> storage/indexeddb/transaction-starvation.html [ Skip ]

</span><span class="cx"> 

</span><del>-# IDB tests with text failures related to error message differences

-storage/indexeddb/deleted-objects.html [ Failure ]

-storage/indexeddb/keypath-basics.html [ Failure ]

-

</del><span class="cx"> # IDB tests with other text failures

</span><span class="cx"> fast/history/page-cache-indexed-closed-db.html [ Failure ]

</span><span class="cx"> storage/indexeddb/intversion-gated-on-delete.html [ Failure ]

</span></span></pre></div>

<a id="trunkLayoutTestsstorageindexeddbdeletedobjectsexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/deleted-objects-expected.txt (194594 => 194595)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/storage/indexeddb/deleted-objects-expected.txt        2016-01-05 19:42:16 UTC (rev 194594)

+++ trunk/LayoutTests/storage/indexeddb/deleted-objects-expected.txt        2016-01-05 19:57:07 UTC (rev 194595)

</span><span class="lines">@@ -17,12 +17,12 @@