<!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>[193510] 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/193510">193510</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-04 21:25:11 -0800 (Fri, 04 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Modern IDB: Add some more custom exception messages, passing some more tests.
https://bugs.webkit.org/show_bug.cgi?id=151898

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (Some failing tests now pass).

* Modules/indexeddb/client/IDBTransactionImpl.cpp:
(WebCore::IDBClient::IDBTransaction::objectStore):

LayoutTests:

* platform/mac-wk1/TestExpectations:
* storage/indexeddb/keypath-arrays-expected.txt:
* storage/indexeddb/noblobs-expected.txt:
* storage/indexeddb/object-lookups-in-versionchange-expected.txt:
* storage/indexeddb/request-result-cache-expected.txt:
* storage/indexeddb/transaction-after-close-expected.txt:
* storage/indexeddb/transaction-and-objectstore-calls-expected.txt:
* storage/indexeddb/transaction-read-only-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="#trunkLayoutTestsstorageindexeddbkeypatharraysexpectedtxt">trunk/LayoutTests/storage/indexeddb/keypath-arrays-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbnoblobsexpectedtxt">trunk/LayoutTests/storage/indexeddb/noblobs-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbobjectlookupsinversionchangeexpectedtxt">trunk/LayoutTests/storage/indexeddb/object-lookups-in-versionchange-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbrequestresultcacheexpectedtxt">trunk/LayoutTests/storage/indexeddb/request-result-cache-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbresourcestransactionandobjectstorecallsjs">trunk/LayoutTests/storage/indexeddb/resources/transaction-and-objectstore-calls.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbtransactionaftercloseexpectedtxt">trunk/LayoutTests/storage/indexeddb/transaction-after-close-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbtransactionandobjectstorecallsexpectedtxt">trunk/LayoutTests/storage/indexeddb/transaction-and-objectstore-calls-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbtransactionreadonlyexpectedtxt">trunk/LayoutTests/storage/indexeddb/transaction-read-only-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (193509 => 193510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-12-05 04:31:49 UTC (rev 193509)
+++ trunk/LayoutTests/ChangeLog        2015-12-05 05:25:11 UTC (rev 193510)
</span><span class="lines">@@ -1,6 +1,22 @@
</span><span class="cx"> 2015-12-04  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Modern IDB: Add some more custom exception messages, passing some more tests.
</span><ins>+        https://bugs.webkit.org/show_bug.cgi?id=151898
+
+        Reviewed by Alex Christensen.
+
+        * platform/mac-wk1/TestExpectations:
+        * storage/indexeddb/keypath-arrays-expected.txt:
+        * storage/indexeddb/noblobs-expected.txt:
+        * storage/indexeddb/object-lookups-in-versionchange-expected.txt:
+        * storage/indexeddb/request-result-cache-expected.txt:
+        * storage/indexeddb/transaction-after-close-expected.txt:
+        * storage/indexeddb/transaction-and-objectstore-calls-expected.txt:
+        * storage/indexeddb/transaction-read-only-expected.txt:
+
+2015-12-04  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Modern IDB: Add some more custom exception messages, passing some more tests.
</ins><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=151895
</span><span class="cx"> 
</span><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 (193509 => 193510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations        2015-12-05 04:31:49 UTC (rev 193509)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations        2015-12-05 05:25:11 UTC (rev 193510)
</span><span class="lines">@@ -142,13 +142,10 @@
</span><span class="cx"> storage/indexeddb/invalid-keys.html [ Failure ]
</span><span class="cx"> storage/indexeddb/key-type-array.html [ Failure ]
</span><span class="cx"> storage/indexeddb/key-type-binary.html [ Failure ]
</span><del>-storage/indexeddb/keypath-arrays.html [ Failure ]
</del><span class="cx"> storage/indexeddb/keypath-edges.html [ Failure ]
</span><span class="cx"> storage/indexeddb/keyrange.html [ Failure ]
</span><span class="cx"> storage/indexeddb/lazy-index-types.html [ Failure ]
</span><span class="cx"> storage/indexeddb/metadata.html [ Failure ]
</span><del>-storage/indexeddb/noblobs.html [ Failure ]
-storage/indexeddb/object-lookups-in-versionchange.html [ Failure ] 
</del><span class="cx"> storage/indexeddb/objectstore-autoincrement.html [ Failure ]
</span><span class="cx"> storage/indexeddb/objectstore-count.html [ Failure ]
</span><span class="cx"> storage/indexeddb/objectstore-cursor.html [ Failure ]
</span><span class="lines">@@ -160,13 +157,9 @@
</span><span class="cx"> storage/indexeddb/persistence.html [ Failure ]
</span><span class="cx"> storage/indexeddb/properties-disabled-at-runtime.html [ Failure ]
</span><span class="cx"> storage/indexeddb/request-leak.html [ Failure ]
</span><del>-storage/indexeddb/request-result-cache.html [ Failure ]
</del><span class="cx"> storage/indexeddb/setversion-blocked-by-versionchange-close.html [ Failure ]
</span><span class="cx"> storage/indexeddb/setversion-not-blocked.html [ Failure ]
</span><span class="cx"> storage/indexeddb/transaction-active-flag.html [ Failure ]
</span><del>-storage/indexeddb/transaction-after-close.html [ Failure ]
-storage/indexeddb/transaction-and-objectstore-calls.html [ Failure ]
-storage/indexeddb/transaction-read-only.html [ Failure ]
</del><span class="cx"> storage/indexeddb/transaction-scope-sequencing.html [ Failure ]
</span><span class="cx"> storage/indexeddb/version-change-abort.html [ Failure ]
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbkeypatharraysexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/keypath-arrays-expected.txt (193509 => 193510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/keypath-arrays-expected.txt        2015-12-05 04:31:49 UTC (rev 193509)
+++ trunk/LayoutTests/storage/indexeddb/keypath-arrays-expected.txt        2015-12-05 05:25:11 UTC (rev 193510)
</span><span class="lines">@@ -13,21 +13,21 @@
</span><span class="cx"> Expecting exception from db.createObjectStore('store-with-generator', {keyPath: ['a', 'b'], autoIncrement: true})
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.INVALID_ACCESS_ERR
</span><del>-Exception message: InvalidAccessError: DOM IDBDatabase Exception 15
</del><ins>+Exception message: Failed to execute 'createObjectStore' on 'IDBDatabase': The autoIncrement option was set but the keyPath option was empty or an array.
</ins><span class="cx"> Expecting exception from store.createIndex('index-multientry', ['e', 'f'], {multiEntry: true})
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.INVALID_ACCESS_ERR
</span><del>-Exception message: InvalidAccessError: DOM IDBDatabase Exception 15
</del><ins>+Exception message: Failed to execute 'createIndex' on 'IDBObjectStore': The keyPath argument was an array and the multiEntry option is true.
</ins><span class="cx"> 
</span><span class="cx"> Empty arrays are not valid key paths:
</span><span class="cx"> Expecting exception from db.createObjectStore('store-keypath-empty-array', {keyPath: []})
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.SYNTAX_ERR
</span><del>-Exception message: SyntaxError: DOM IDBDatabase Exception 12
</del><ins>+Exception message: Failed to execute 'createObjectStore' on 'IDBDatabase': The keyPath option is not a valid key path.
</ins><span class="cx"> Expecting exception from store.createIndex('index-keypath-empty-array', [])
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.SYNTAX_ERR
</span><del>-Exception message: SyntaxError: DOM IDBDatabase Exception 12
</del><ins>+Exception message: Failed to execute 'createIndex' on 'IDBObjectStore': The keyPath argument contains an invalid key path.
</ins><span class="cx"> 
</span><span class="cx"> testKeyPaths():
</span><span class="cx"> transaction = db.transaction(['store'], 'readwrite')
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbnoblobsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/noblobs-expected.txt (193509 => 193510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/noblobs-expected.txt        2015-12-05 04:31:49 UTC (rev 193509)
+++ trunk/LayoutTests/storage/indexeddb/noblobs-expected.txt        2015-12-05 05:25:11 UTC (rev 193510)
</span><span class="lines">@@ -22,17 +22,17 @@
</span><span class="cx"> Expecting exception from store.put(blob, 'key')
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.DATA_CLONE_ERR
</span><del>-Exception message: Failed to execute 'put' on 'IDBObjectStore': The object store currently does not support blob values.
</del><ins>+Exception message: Failed to store record in an IDBObjectStore: BlobURLs are not yet supported.
</ins><span class="cx"> Expecting exception from store.add(blob, 'key')
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.DATA_CLONE_ERR
</span><del>-Exception message: Failed to execute 'add' on 'IDBObjectStore': The object store currently does not support blob values.
</del><ins>+Exception message: Failed to store record in an IDBObjectStore: BlobURLs are not yet supported.
</ins><span class="cx"> request = store.openCursor()
</span><span class="cx"> cursor = request.result
</span><span class="cx"> Expecting exception from cursor.update(blob)
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.DATA_CLONE_ERR
</span><del>-Exception message: Failed to execute 'update' on 'IDBCursor': The object store currently does not support blob values.
</del><ins>+Exception message: Failed to store record in an IDBObjectStore: BlobURLs are not yet supported.
</ins><span class="cx"> 
</span><span class="cx"> testFile():
</span><span class="cx"> file = fileInput.files[0]
</span><span class="lines">@@ -43,17 +43,17 @@
</span><span class="cx"> Expecting exception from store.put(file, 'key')
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.DATA_CLONE_ERR
</span><del>-Exception message: Failed to execute 'put' on 'IDBObjectStore': The object store currently does not support blob values.
</del><ins>+Exception message: Failed to store record in an IDBObjectStore: BlobURLs are not yet supported.
</ins><span class="cx"> Expecting exception from store.add(file, 'key')
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.DATA_CLONE_ERR
</span><del>-Exception message: Failed to execute 'add' on 'IDBObjectStore': The object store currently does not support blob values.
</del><ins>+Exception message: Failed to store record in an IDBObjectStore: BlobURLs are not yet supported.
</ins><span class="cx"> request = store.openCursor()
</span><span class="cx"> cursor = request.result
</span><span class="cx"> Expecting exception from cursor.update(file)
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.DATA_CLONE_ERR
</span><del>-Exception message: Failed to execute 'update' on 'IDBCursor': The object store currently does not support blob values.
</del><ins>+Exception message: Failed to store record in an IDBObjectStore: BlobURLs are not yet supported.
</ins><span class="cx"> 
</span><span class="cx"> testFileList():
</span><span class="cx"> filelist = fileInput.files
</span><span class="lines">@@ -64,17 +64,17 @@
</span><span class="cx"> Expecting exception from store.put(filelist, 'key')
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.DATA_CLONE_ERR
</span><del>-Exception message: Failed to execute 'put' on 'IDBObjectStore': The object store currently does not support blob values.
</del><ins>+Exception message: Failed to store record in an IDBObjectStore: BlobURLs are not yet supported.
</ins><span class="cx"> Expecting exception from store.add(filelist, 'key')
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.DATA_CLONE_ERR
</span><del>-Exception message: Failed to execute 'add' on 'IDBObjectStore': The object store currently does not support blob values.
</del><ins>+Exception message: Failed to store record in an IDBObjectStore: BlobURLs are not yet supported.
</ins><span class="cx"> request = store.openCursor()
</span><span class="cx"> cursor = request.result
</span><span class="cx"> Expecting exception from cursor.update(filelist)
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.DATA_CLONE_ERR
</span><del>-Exception message: Failed to execute 'update' on 'IDBCursor': The object store currently does not support blob values.
</del><ins>+Exception message: Failed to store record in an IDBObjectStore: BlobURLs are not yet supported.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbobjectlookupsinversionchangeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/object-lookups-in-versionchange-expected.txt (193509 => 193510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/object-lookups-in-versionchange-expected.txt        2015-12-05 04:31:49 UTC (rev 193509)
+++ trunk/LayoutTests/storage/indexeddb/object-lookups-in-versionchange-expected.txt        2015-12-05 05:25:11 UTC (rev 193510)
</span><span class="lines">@@ -16,13 +16,13 @@
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.NOT_FOUND_ERR
</span><span class="cx"> PASS ename is 'NotFoundError'
</span><del>-Exception message: NotFoundError: DOM IDBDatabase Exception 8
</del><ins>+Exception message: Failed to execute 'objectStore' on 'IDBTransaction': The specified object store was not found.
</ins><span class="cx"> 
</span><span class="cx"> Expecting exception from store.index('no-such-index')
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.NOT_FOUND_ERR
</span><span class="cx"> PASS ename is 'NotFoundError'
</span><del>-Exception message: NotFoundError: DOM IDBDatabase Exception 8
</del><ins>+Exception message: Failed to execute 'index' on 'IDBObjectStore': The specified index was not found.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbrequestresultcacheexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/request-result-cache-expected.txt (193509 => 193510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/request-result-cache-expected.txt        2015-12-05 04:31:49 UTC (rev 193509)
+++ trunk/LayoutTests/storage/indexeddb/request-result-cache-expected.txt        2015-12-05 05:25:11 UTC (rev 193510)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.INVALID_STATE_ERR
</span><span class="cx"> PASS ename is 'InvalidStateError'
</span><del>-Exception message: InvalidStateError: DOM IDBDatabase Exception 11
</del><ins>+Exception message: Failed to read the 'result' property from 'IDBRequest': The request has not finished.
</ins><span class="cx"> 
</span><span class="cx"> cursorRequestSuccess():
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbresourcestransactionandobjectstorecallsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/resources/transaction-and-objectstore-calls.js (193509 => 193510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/resources/transaction-and-objectstore-calls.js        2015-12-05 04:31:49 UTC (rev 193509)
+++ trunk/LayoutTests/storage/indexeddb/resources/transaction-and-objectstore-calls.js        2015-12-05 05:25:11 UTC (rev 193510)
</span><span class="lines">@@ -98,8 +98,8 @@
</span><span class="cx">     debug(&quot;transaction complete, ensuring methods fail&quot;);
</span><span class="cx">     shouldBeNonNull(&quot;trans&quot;);
</span><span class="cx">     shouldBeNonNull(&quot;store&quot;);
</span><del>-    evalAndExpectException(&quot;trans.objectStore('store')&quot;, &quot;DOMException.INVALID_STATE_ERR&quot;, &quot;'InvalidStateError'&quot;);
-    evalAndExpectException(&quot;store.index('index')&quot;, &quot;DOMException.INVALID_STATE_ERR&quot;, &quot;'InvalidStateError'&quot;);
</del><ins>+    evalAndExpectException(&quot;trans.objectStore('store')&quot;, &quot;0&quot;, &quot;'TransactionInactiveError'&quot;);
+    evalAndExpectException(&quot;store.index('index')&quot;, &quot;0&quot;, &quot;'TransactionInactiveError'&quot;);
</ins><span class="cx"> 
</span><span class="cx">     finishJSTest();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbtransactionaftercloseexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/transaction-after-close-expected.txt (193509 => 193510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/transaction-after-close-expected.txt        2015-12-05 04:31:49 UTC (rev 193509)
+++ trunk/LayoutTests/storage/indexeddb/transaction-after-close-expected.txt        2015-12-05 05:25:11 UTC (rev 193510)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.INVALID_STATE_ERR
</span><span class="cx"> PASS ename is 'InvalidStateError'
</span><del>-Exception message: InvalidStateError: DOM IDBDatabase Exception 11
</del><ins>+Exception message: Failed to execute 'transaction' on 'IDBDatabase': The database connection is closing.
</ins><span class="cx"> 
</span><span class="cx"> verify that we can reopen the db after calling close
</span><span class="cx"> indexedDB.open(dbname)
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbtransactionandobjectstorecallsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/transaction-and-objectstore-calls-expected.txt (193509 => 193510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/transaction-and-objectstore-calls-expected.txt        2015-12-05 04:31:49 UTC (rev 193509)
+++ trunk/LayoutTests/storage/indexeddb/transaction-and-objectstore-calls-expected.txt        2015-12-05 05:25:11 UTC (rev 193510)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> PASS ename is 'NotFoundError'
</span><span class="cx"> Exception message: Failed to execute 'objectStore' on 'IDBTransaction': The specified object store was not found.
</span><span class="cx"> 
</span><del>-PASS trans = db.transaction() threw exception TypeError: Failed to execute 'transaction' on 'IDBDatabase': 1 argument required, but only 0 present..
</del><ins>+PASS trans = db.transaction() threw exception TypeError: Not enough arguments.
</ins><span class="cx"> 
</span><span class="cx"> Expecting exception from db.transaction(['x'])
</span><span class="cx"> PASS Exception was thrown.
</span><span class="lines">@@ -154,14 +154,14 @@
</span><span class="cx"> PASS store is non-null.
</span><span class="cx"> Expecting exception from trans.objectStore('store')
</span><span class="cx"> PASS Exception was thrown.
</span><del>-PASS code is DOMException.INVALID_STATE_ERR
-PASS ename is 'InvalidStateError'
-Exception message: Failed to execute 'objectStore' on 'IDBTransaction': The transaction has finished.
</del><ins>+PASS code is 0
+PASS ename is 'TransactionInactiveError'
+Exception message: Failed to execute 'objectStore' on 'IDBTransaction': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from store.index('index')
</span><span class="cx"> PASS Exception was thrown.
</span><del>-PASS code is DOMException.INVALID_STATE_ERR
-PASS ename is 'InvalidStateError'
-Exception message: Failed to execute 'index' on 'IDBObjectStore': The transaction has finished.
</del><ins>+PASS code is 0
+PASS ename is 'TransactionInactiveError'
+Exception message: Failed to execute 'index' on 'IDBObjectStore': The transaction is inactive or finished.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbtransactionreadonlyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/transaction-read-only-expected.txt (193509 => 193510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/transaction-read-only-expected.txt        2015-12-05 04:31:49 UTC (rev 193509)
+++ trunk/LayoutTests/storage/indexeddb/transaction-read-only-expected.txt        2015-12-05 05:25:11 UTC (rev 193510)
</span><span class="lines">@@ -15,13 +15,13 @@
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'ReadOnlyError'
</span><del>-Exception message: ReadOnlyError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to store record in an IDBObjectStore: The transaction is read-only.
</ins><span class="cx"> trans = db.transaction('store')
</span><span class="cx"> Expecting exception from trans.objectStore('store').delete('x')
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'ReadOnlyError'
</span><del>-Exception message: ReadOnlyError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'delete' on 'IDBObjectStore': The transaction is read-only.
</ins><span class="cx"> trans = db.transaction('store')
</span><span class="cx"> cur = trans.objectStore('store').openCursor()
</span><span class="cx"> PASS !event.target.result is false
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'ReadOnlyError'
</span><del>-Exception message: ReadOnlyError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'delete' on 'IDBCursor': The record may not be deleted inside a read-only transaction.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (193509 => 193510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-12-05 04:31:49 UTC (rev 193509)
+++ trunk/Source/WebCore/ChangeLog        2015-12-05 05:25:11 UTC (rev 193510)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-12-04  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Modern IDB: Add some more custom exception messages, passing some more tests.
+        https://bugs.webkit.org/show_bug.cgi?id=151898
+
+        Reviewed by Alex Christensen.
+
+        No new tests (Some failing tests now pass).
+
+        * Modules/indexeddb/client/IDBTransactionImpl.cpp:
+        (WebCore::IDBClient::IDBTransaction::objectStore):
+
</ins><span class="cx"> 2015-12-04  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Place an upper bound on canvas pixel count
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp (193509 => 193510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp        2015-12-05 04:31:49 UTC (rev 193509)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp        2015-12-05 05:25:11 UTC (rev 193510)
</span><span class="lines">@@ -126,7 +126,8 @@
</span><span class="cx">     LOG(IndexedDB, &quot;IDBTransaction::objectStore&quot;);
</span><span class="cx"> 
</span><span class="cx">     if (isFinishedOrFinishing()) {
</span><del>-        ec.code = IDBDatabaseException::InvalidStateError;
</del><ins>+        ec.code = IDBDatabaseException::TransactionInactiveError;
+        ec.message = ASCIILiteral(&quot;Failed to execute 'objectStore' on 'IDBTransaction': The transaction is inactive or finished.&quot;);
</ins><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>