<!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>[193632] 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/193632">193632</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-07 09:30:25 -0800 (Mon, 07 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=151912

Reviewed by Andy Estes.

Source/WebCore:

No new tests (Covered by existing tests).

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

LayoutTests:

* platform/mac-wk1/TestExpectations:

* storage/indexeddb/exceptions-expected.txt:
* storage/indexeddb/get-keyrange-expected.txt:
* storage/indexeddb/invalid-keys-expected.txt:
* storage/indexeddb/keypath-edges-expected.txt:
* storage/indexeddb/keyrange-expected.txt:
* storage/indexeddb/transaction-active-flag-expected.txt:
* storage/indexeddb/transaction-and-objectstore-calls-expected.txt:

* storage/indexeddb/resources/exceptions.js:
* storage/indexeddb/resources/transaction-and-objectstore-calls.js:</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="#trunkLayoutTestsstorageindexeddbexceptionsexpectedtxt">trunk/LayoutTests/storage/indexeddb/exceptions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbgetkeyrangeexpectedtxt">trunk/LayoutTests/storage/indexeddb/get-keyrange-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbinvalidkeysexpectedtxt">trunk/LayoutTests/storage/indexeddb/invalid-keys-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbkeypathedgesexpectedtxt">trunk/LayoutTests/storage/indexeddb/keypath-edges-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbkeyrangeexpectedtxt">trunk/LayoutTests/storage/indexeddb/keyrange-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbresourcesexceptionsjs">trunk/LayoutTests/storage/indexeddb/resources/exceptions.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbresourcestransactionandobjectstorecallsjs">trunk/LayoutTests/storage/indexeddb/resources/transaction-and-objectstore-calls.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbtransactionactiveflagexpectedtxt">trunk/LayoutTests/storage/indexeddb/transaction-active-flag-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbtransactionandobjectstorecallsexpectedtxt">trunk/LayoutTests/storage/indexeddb/transaction-and-objectstore-calls-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBObjectStoreImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp</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 (193631 => 193632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-12-07 17:28:57 UTC (rev 193631)
+++ trunk/LayoutTests/ChangeLog        2015-12-07 17:30:25 UTC (rev 193632)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-12-07  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=151912
+
+        Reviewed by Andy Estes.
+
+        * platform/mac-wk1/TestExpectations:
+        
+        * storage/indexeddb/exceptions-expected.txt:
+        * storage/indexeddb/get-keyrange-expected.txt:
+        * storage/indexeddb/invalid-keys-expected.txt:
+        * storage/indexeddb/keypath-edges-expected.txt:
+        * storage/indexeddb/keyrange-expected.txt:
+        * storage/indexeddb/transaction-active-flag-expected.txt:
+        * storage/indexeddb/transaction-and-objectstore-calls-expected.txt:
+
+        * storage/indexeddb/resources/exceptions.js:
+        * storage/indexeddb/resources/transaction-and-objectstore-calls.js:
+
</ins><span class="cx"> 2015-12-07  Ryan Haddad  &lt;ryanhaddad@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Marking fast/dom/Window/property-access-on-cached-window-after-frame-removed.html as failing on Win
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (193631 => 193632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations        2015-12-07 17:28:57 UTC (rev 193631)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations        2015-12-07 17:30:25 UTC (rev 193632)
</span><span class="lines">@@ -125,7 +125,6 @@
</span><span class="cx"> storage/indexeddb/factory-basics.html [ Failure ]
</span><span class="cx"> storage/indexeddb/factory-cmp.html [ Failure ]
</span><span class="cx"> storage/indexeddb/factory-deletedatabase.html [ Failure ]
</span><del>-storage/indexeddb/get-keyrange.html [ Failure ]
</del><span class="cx"> storage/indexeddb/index-basics.html [ Failure ]
</span><span class="cx"> storage/indexeddb/index-count.html [ Failure ]
</span><span class="cx"> storage/indexeddb/index-cursor.html [ Failure ]
</span><span class="lines">@@ -140,11 +139,8 @@
</span><span class="cx"> storage/indexeddb/intversion-open-with-version.html [ Failure ]
</span><span class="cx"> storage/indexeddb/intversion-persistence.html [ Failure ]
</span><span class="cx"> storage/indexeddb/intversion-upgrades.html [ Failure ]
</span><del>-storage/indexeddb/invalid-keys.html [ Failure ]
</del><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-edges.html [ Failure ]
-storage/indexeddb/keyrange.html [ Failure ]
</del><span class="cx"> storage/indexeddb/lazy-index-types.html [ Failure ]
</span><span class="cx"> storage/indexeddb/metadata.html [ Failure ]
</span><span class="cx"> storage/indexeddb/objectstore-autoincrement.html [ Failure ]
</span><span class="lines">@@ -160,7 +156,6 @@
</span><span class="cx"> storage/indexeddb/request-leak.html [ Failure ]
</span><span class="cx"> storage/indexeddb/setversion-blocked-by-versionchange-close.html [ Failure ]
</span><span class="cx"> storage/indexeddb/setversion-not-blocked.html [ Failure ]
</span><del>-storage/indexeddb/transaction-active-flag.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="trunkLayoutTestsstorageindexeddbexceptionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/exceptions-expected.txt (193631 => 193632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/exceptions-expected.txt        2015-12-07 17:28:57 UTC (rev 193631)
+++ trunk/LayoutTests/storage/indexeddb/exceptions-expected.txt        2015-12-07 17:30:25 UTC (rev 193632)
</span><span class="lines">@@ -234,9 +234,9 @@
</span><span class="cx"> Occurs if a request is made on a source object that has been deleted or removed, or if the transaction the object store belongs to has finished.
</span><span class="cx"> Expecting exception from storeFromInactiveTransaction.index('index')
</span><span class="cx"> PASS Exception was thrown.
</span><del>-PASS code is 0
-PASS ename is 'TransactionInactiveError'
-Exception message: Failed to execute 'index' on 'IDBObjectStore': The transaction is inactive or finished.
</del><ins>+PASS code is 11
+PASS ename is 'InvalidStateError'
+Exception message: Failed to execute 'index' on 'IDBObjectStore': The transaction is finished.
</ins><span class="cx"> 
</span><span class="cx"> IDBObjectStore.openCursor()
</span><span class="cx"> If the range parameter is specified but is not a valid key or a key range, this method throws a DOMException of type DataError.
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbgetkeyrangeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/get-keyrange-expected.txt (193631 => 193632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/get-keyrange-expected.txt        2015-12-07 17:28:57 UTC (rev 193631)
+++ trunk/LayoutTests/storage/indexeddb/get-keyrange-expected.txt        2015-12-07 17:30:25 UTC (rev 193632)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><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 'get' on 'IDBObjectStore': No key or key range specified.
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> runIndexStoreTests()
</span><span class="cx"> index.get(IDBKeyRange.only(3))
</span><span class="cx"> PASS result.x is 3
</span><span class="lines">@@ -63,7 +63,7 @@
</span><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 'get' on 'IDBIndex': No key or key range specified.
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> runIndexKeyTests()
</span><span class="cx"> index.getKey(IDBKeyRange.only(3))
</span><span class="cx"> PASS result is 3
</span><span class="lines">@@ -85,7 +85,7 @@
</span><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 'getKey' on 'IDBIndex': No key or key range specified.
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> finishJSTest()
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbinvalidkeysexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/invalid-keys-expected.txt (193631 => 193632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/invalid-keys-expected.txt        2015-12-07 17:28:57 UTC (rev 193631)
+++ trunk/LayoutTests/storage/indexeddb/invalid-keys-expected.txt        2015-12-07 17:30:25 UTC (rev 193632)
</span><span class="lines">@@ -13,82 +13,82 @@
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', null)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', (function() { return arguments; }()))
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', true)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', false)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', new Error)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', function () {})
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', JSON)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', Math)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', NaN)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', new Date(NaN))
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', {})
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', /regex/)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', self)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', self.document)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Expecting exception from request = objectStore.put('value', self.document.body)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbkeypathedgesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/keypath-edges-expected.txt (193631 => 193632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/keypath-edges-expected.txt        2015-12-07 17:28:57 UTC (rev 193631)
+++ trunk/LayoutTests/storage/indexeddb/keypath-edges-expected.txt        2015-12-07 17:30:25 UTC (rev 193632)
</span><span class="lines">@@ -20,21 +20,21 @@
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> 
</span><span class="cx"> Key path doesn't resolve to a value; should yield null, should throw DATA_ERR
</span><span class="cx"> Expecting exception from store.put({})
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> 
</span><span class="cx"> Key path resolves to a value that is invalid key; should yield 'invalid' key, should throw DATA_ERR
</span><span class="cx"> Expecting exception from store.put({foo: null})
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> 
</span><span class="cx"> Key path resolves to a value that is valid key; should yield 'string' key, should succeed
</span><span class="cx"> store.put({foo: 'zoo'})
</span><span class="lines">@@ -49,14 +49,14 @@
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> 
</span><span class="cx"> Key path doesn't resolve to a value; should yield null but insertion would fail, so put request should raise exception
</span><span class="cx"> Expecting exception from store.put('string')
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> 
</span><span class="cx"> Key path doesn't resolve to a value; should yield null, key should be generated, put request should succeed
</span><span class="cx"> store.put({})
</span><span class="lines">@@ -67,7 +67,7 @@
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> 
</span><span class="cx"> Key path resolves to a value that is valid key; should yield 'string' key, should succeed
</span><span class="cx"> store.put({foo: 'zoo'})
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbkeyrangeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/keyrange-expected.txt (193631 => 193632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/keyrange-expected.txt        2015-12-07 17:28:57 UTC (rev 193631)
+++ trunk/LayoutTests/storage/indexeddb/keyrange-expected.txt        2015-12-07 17:30:25 UTC (rev 193632)
</span><span class="lines">@@ -214,61 +214,61 @@
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Passing an invalid key into upperBound({})
</span><span class="cx"> Expecting exception from IDBKeyRange.upperBound({})
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Passing an invalid key into lowerBound({})
</span><span class="cx"> Expecting exception from IDBKeyRange.lowerBound({})
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Passing an invalid key into bound(null, {})
</span><span class="cx"> Expecting exception from IDBKeyRange.bound(null, {})
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Passing an invalid key into bound({},null)
</span><span class="cx"> Expecting exception from IDBKeyRange.bound({}, null)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Passing an invalid key into bound({}, {})
</span><span class="cx"> Expecting exception from IDBKeyRange.bound({}, {})
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Lower key greater than higher key, bound(4, 3)
</span><span class="cx"> Expecting exception from IDBKeyRange.bound(4, 3)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Equal keys, either of the bounds is open, bound(4, 4, true, false)
</span><span class="cx"> Expecting exception from IDBKeyRange.bound(4, 4, true, false)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Equal keys, either of the bounds is open, bound(4, 4, false, true)
</span><span class="cx"> Expecting exception from IDBKeyRange.bound(4, 4, false, true)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Equal keys, either of the bounds is open, bound(4, 4, true, true)
</span><span class="cx"> Expecting exception from IDBKeyRange.bound(4, 4, true, true)
</span><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: DataError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: The data provided does not meet requirements.
</ins><span class="cx"> Equal keys, none of the bounds is open, bound(4, 4, false, false)
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbresourcesexceptionsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/resources/exceptions.js (193631 => 193632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/resources/exceptions.js        2015-12-07 17:28:57 UTC (rev 193631)
+++ trunk/LayoutTests/storage/indexeddb/resources/exceptions.js        2015-12-07 17:30:25 UTC (rev 193632)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx">     debug(&quot;There is no index with the given name, compared in a case-sensitive manner, in the connected database.&quot;);
</span><span class="cx">     evalAndExpectException(&quot;store.index('no-such-index')&quot;, &quot;DOMException.NOT_FOUND_ERR&quot;, &quot;'NotFoundError'&quot;);
</span><span class="cx">     debug(&quot;Occurs if a request is made on a source object that has been deleted or removed, or if the transaction the object store belongs to has finished.&quot;);
</span><del>-    evalAndExpectException(&quot;storeFromInactiveTransaction.index('index')&quot;, &quot;0&quot;, &quot;'TransactionInactiveError'&quot;);
</del><ins>+    evalAndExpectException(&quot;storeFromInactiveTransaction.index('index')&quot;, &quot;11&quot;, &quot;'InvalidStateError'&quot;);
</ins><span class="cx">     // &quot;Occurs if a request is made on a source object that has been deleted or removed.&quot; - covered in deleted-objects.html
</span><span class="cx"> 
</span><span class="cx">     debug(&quot;&quot;);
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbresourcestransactionandobjectstorecallsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/resources/transaction-and-objectstore-calls.js (193631 => 193632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/resources/transaction-and-objectstore-calls.js        2015-12-07 17:28:57 UTC (rev 193631)
+++ trunk/LayoutTests/storage/indexeddb/resources/transaction-and-objectstore-calls.js        2015-12-07 17:30:25 UTC (rev 193632)
</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;0&quot;, &quot;'TransactionInactiveError'&quot;);
-    evalAndExpectException(&quot;store.index('index')&quot;, &quot;0&quot;, &quot;'TransactionInactiveError'&quot;);
</del><ins>+    evalAndExpectException(&quot;trans.objectStore('store')&quot;, &quot;11&quot;, &quot;'InvalidStateError'&quot;);
+    evalAndExpectException(&quot;store.index('index')&quot;, &quot;11&quot;, &quot;'InvalidStateError'&quot;);
</ins><span class="cx"> 
</span><span class="cx">     finishJSTest();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbtransactionactiveflagexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/transaction-active-flag-expected.txt (193631 => 193632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/transaction-active-flag-expected.txt        2015-12-07 17:28:57 UTC (rev 193631)
+++ trunk/LayoutTests/storage/indexeddb/transaction-active-flag-expected.txt        2015-12-07 17:30:25 UTC (rev 193632)
</span><span class="lines">@@ -60,162 +60,162 @@
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to store record in an IDBObjectStore: The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from store.put(0, 0)
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to store record in an IDBObjectStore: The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from store.get(0)
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'get' on 'IDBObjectStore': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from store.get(IDBKeyRange.only(0))
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: A request was placed against a transaction which is either currently not active, or which is finished.
</ins><span class="cx"> Expecting exception from store.delete(0)
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'delete' on 'IDBObjectStore': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from store.delete(IDBKeyRange.only(0))
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'delete' on 'IDBObjectStore': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from store.count()
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'count' on 'IDBObjectStore': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from store.count(0)
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'count' on 'IDBObjectStore': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from store.count(IDBKeyRange.only(0))
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'count' on 'IDBObjectStore': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from store.clear()
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'clear' on 'IDBObjectStore': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from store.openCursor()
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openCursor' on 'IDBObjectStore': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from store.openCursor(0)
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openCursor' on 'IDBObjectStore': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from store.openCursor(0, 'next')
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openCursor' on 'IDBObjectStore': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from store.openCursor(IDBKeyRange.only(0))
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openCursor' on 'IDBObjectStore': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from store.openCursor(IDBKeyRange.only(0), 'next')
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openCursor' on 'IDBObjectStore': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.get(0)
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'get' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.get(IDBKeyRange.only(0))
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'get' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.getKey(0)
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'getKey' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.getKey(IDBKeyRange.only(0))
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'getKey' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.count()
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'count' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.count(0)
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'count' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.count(IDBKeyRange.only(0))
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'count' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.openCursor()
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openCursor' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.openCursor(0)
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openCursor' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.openCursor(0, 'next')
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openCursor' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.openCursor(IDBKeyRange.only(0))
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openCursor' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.openCursor(IDBKeyRange.only(0), 'next')
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openCursor' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.openKeyCursor()
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openKeyCursor' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.openKeyCursor(0)
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openKeyCursor' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.openKeyCursor(0, 'next')
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openKeyCursor' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.openKeyCursor(IDBKeyRange.only(0))
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openKeyCursor' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> Expecting exception from index.openKeyCursor(IDBKeyRange.only(0), 'next')
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is 0
</span><span class="cx"> PASS ename is 'TransactionInactiveError'
</span><del>-Exception message: TransactionInactiveError: DOM IDBDatabase Exception 0
</del><ins>+Exception message: Failed to execute 'openKeyCursor' on 'IDBIndex': The transaction is inactive or finished.
</ins><span class="cx"> 
</span><span class="cx"> testEventCallback():
</span><span class="cx"> Transaction should be active inside a non-IDB-event callback
</span><span class="lines">@@ -259,7 +259,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 'objectStore' on 'IDBTransaction': The transaction 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="trunkLayoutTestsstorageindexeddbtransactionandobjectstorecallsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/transaction-and-objectstore-calls-expected.txt (193631 => 193632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/transaction-and-objectstore-calls-expected.txt        2015-12-07 17:28:57 UTC (rev 193631)
+++ trunk/LayoutTests/storage/indexeddb/transaction-and-objectstore-calls-expected.txt        2015-12-07 17:30:25 UTC (rev 193632)
</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 0
-PASS ename is 'TransactionInactiveError'
-Exception message: Failed to execute 'objectStore' on 'IDBTransaction': The transaction is inactive or finished.
</del><ins>+PASS code is 11
+PASS ename is 'InvalidStateError'
+Exception message: Failed to execute 'objectStore' on 'IDBTransaction': The transaction finished.
</ins><span class="cx"> Expecting exception from store.index('index')
</span><span class="cx"> PASS Exception was thrown.
</span><del>-PASS code is 0
-PASS ename is 'TransactionInactiveError'
-Exception message: Failed to execute 'index' on 'IDBObjectStore': The transaction is inactive or finished.
</del><ins>+PASS code is 11
+PASS ename is 'InvalidStateError'
+Exception message: Failed to execute 'index' on 'IDBObjectStore': The transaction is 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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (193631 => 193632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-12-07 17:28:57 UTC (rev 193631)
+++ trunk/Source/WebCore/ChangeLog        2015-12-07 17:30:25 UTC (rev 193632)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-12-07  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=151912
+
+        Reviewed by Andy Estes.
+
+        No new tests (Covered by existing tests).
+
+        * Modules/indexeddb/client/IDBObjectStoreImpl.cpp:
+        (WebCore::IDBClient::IDBObjectStore::index):
+        * Modules/indexeddb/client/IDBTransactionImpl.cpp:
+        (WebCore::IDBClient::IDBTransaction::objectStore):
+
</ins><span class="cx"> 2015-12-07  Gwang Yoon Hwang  &lt;yoon@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [ThreadedCompositor] Add support for PlatformLayer.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBObjectStoreImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp (193631 => 193632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp        2015-12-07 17:28:57 UTC (rev 193631)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp        2015-12-07 17:30:25 UTC (rev 193632)
</span><span class="lines">@@ -462,9 +462,9 @@
</span><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (!m_transaction-&gt;isActive()) {
-        ec.code = IDBDatabaseException::TransactionInactiveError;
-        ec.message = ASCIILiteral(&quot;Failed to execute 'index' on 'IDBObjectStore': The transaction is inactive or finished.&quot;);
</del><ins>+    if (m_transaction-&gt;isFinishedOrFinishing()) {
+        ec.code = IDBDatabaseException::InvalidStateError;
+        ec.message = ASCIILiteral(&quot;Failed to execute 'index' on 'IDBObjectStore': The transaction is finished.&quot;);
</ins><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp (193631 => 193632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp        2015-12-07 17:28:57 UTC (rev 193631)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp        2015-12-07 17:30:25 UTC (rev 193632)
</span><span class="lines">@@ -126,8 +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::TransactionInactiveError;
-        ec.message = ASCIILiteral(&quot;Failed to execute 'objectStore' on 'IDBTransaction': The transaction is inactive or finished.&quot;);
</del><ins>+        ec.code = IDBDatabaseException::InvalidStateError;
+        ec.message = ASCIILiteral(&quot;Failed to execute 'objectStore' on 'IDBTransaction': The transaction finished.&quot;);
</ins><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>