<!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>[208518] 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/208518">208518</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-11-09 17:42:24 -0800 (Wed, 09 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>IndexedDB 2.0: Clean up some exception ordering.
https://bugs.webkit.org/show_bug.cgi?id=164566
LayoutTests/imported/w3c:
Reviewed by NOBODY (OOPS!).
* IndexedDB-private-browsing/idbcursor_advance_index7-expected.txt:
* IndexedDB-private-browsing/idbcursor_continue_index7-expected.txt:
* web-platform-tests/IndexedDB/idbcursor_advance_index7-expected.txt:
* web-platform-tests/IndexedDB/idbcursor_continue_index7-expected.txt:
* web-platform-tests/IndexedDB/idbobjectstore_createIndex14-exception_order-expected.txt:
Source/WebCore:
Reviewed by Alex Christensen.
No new tests (Covered by existing tests).
* Modules/indexeddb/IDBCursor.cpp:
(WebCore::IDBCursor::advance):
(WebCore::IDBCursor::continueFunction):
* Modules/indexeddb/IDBObjectStore.cpp:
(WebCore::IDBObjectStore::createIndex):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cIndexedDBprivatebrowsingidbcursor_advance_index7expectedtxt">trunk/LayoutTests/imported/w3c/IndexedDB-private-browsing/idbcursor_advance_index7-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cIndexedDBprivatebrowsingidbcursor_continue_index7expectedtxt">trunk/LayoutTests/imported/w3c/IndexedDB-private-browsing/idbcursor_continue_index7-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBidbcursor_advance_index7expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbcursor_advance_index7-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBidbcursor_continue_index7expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbcursor_continue_index7-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBidbobjectstore_createIndex14exception_orderexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbobjectstore_createIndex14-exception_order-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBCursorcpp">trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBObjectStorecpp">trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (208517 => 208518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-11-10 01:36:34 UTC (rev 208517)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-11-10 01:42:24 UTC (rev 208518)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-09 Brady Eidson <beidson@apple.com>
+
+ IndexedDB 2.0: Clean up some exception ordering.
+ https://bugs.webkit.org/show_bug.cgi?id=164566
+
+ Reviewed by Alex Christensen.
+
+ * IndexedDB-private-browsing/idbcursor_advance_index7-expected.txt:
+ * IndexedDB-private-browsing/idbcursor_continue_index7-expected.txt:
+ * web-platform-tests/IndexedDB/idbcursor_advance_index7-expected.txt:
+ * web-platform-tests/IndexedDB/idbcursor_continue_index7-expected.txt:
+ * web-platform-tests/IndexedDB/idbobjectstore_createIndex14-exception_order-expected.txt:
+
</ins><span class="cx"> 2016-11-09 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> URLParser should not consider path of URLs with no host to start at the first slash after the colon
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cIndexedDBprivatebrowsingidbcursor_advance_index7expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/IndexedDB-private-browsing/idbcursor_advance_index7-expected.txt (208517 => 208518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/IndexedDB-private-browsing/idbcursor_advance_index7-expected.txt 2016-11-10 01:36:34 UTC (rev 208517)
+++ trunk/LayoutTests/imported/w3c/IndexedDB-private-browsing/idbcursor_advance_index7-expected.txt 2016-11-10 01:42:24 UTC (rev 208518)
</span><span class="lines">@@ -1,5 +1,3 @@
</span><span class="cx">
</span><del>-FAIL IDBCursor.advance() - index - throw TransactionInactiveError assert_throws: Calling advance() should throws an exception TransactionInactiveError when the transaction is not active. function "function () {
- cursor.advance(1);
- ..." threw object "InvalidStateError (DOM IDBDatabase Exception 11): Failed ..." that is not a DOMException TransactionInactiveError: property "code" is equal to 11, expected 0
</del><ins>+PASS IDBCursor.advance() - index - throw TransactionInactiveError
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cIndexedDBprivatebrowsingidbcursor_continue_index7expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/IndexedDB-private-browsing/idbcursor_continue_index7-expected.txt (208517 => 208518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/IndexedDB-private-browsing/idbcursor_continue_index7-expected.txt 2016-11-10 01:36:34 UTC (rev 208517)
+++ trunk/LayoutTests/imported/w3c/IndexedDB-private-browsing/idbcursor_continue_index7-expected.txt 2016-11-10 01:42:24 UTC (rev 208518)
</span><span class="lines">@@ -1,5 +1,3 @@
</span><span class="cx">
</span><del>-FAIL IDBCursor.continue() - index - throw TransactionInactiveError assert_throws: Calling continue() should throws an exception TransactionInactiveError when the transaction is not active. function "function () {
- cursor.continue();
- ..." threw object "InvalidStateError (DOM IDBDatabase Exception 11): Failed ..." that is not a DOMException TransactionInactiveError: property "code" is equal to 11, expected 0
</del><ins>+PASS IDBCursor.continue() - index - throw TransactionInactiveError
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBidbcursor_advance_index7expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbcursor_advance_index7-expected.txt (208517 => 208518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbcursor_advance_index7-expected.txt 2016-11-10 01:36:34 UTC (rev 208517)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbcursor_advance_index7-expected.txt 2016-11-10 01:42:24 UTC (rev 208518)
</span><span class="lines">@@ -1,5 +1,3 @@
</span><span class="cx">
</span><del>-FAIL IDBCursor.advance() - index - throw TransactionInactiveError assert_throws: Calling advance() should throws an exception TransactionInactiveError when the transaction is not active. function "function () {
- cursor.advance(1);
- ..." threw object "InvalidStateError (DOM IDBDatabase Exception 11): Failed ..." that is not a DOMException TransactionInactiveError: property "code" is equal to 11, expected 0
</del><ins>+PASS IDBCursor.advance() - index - throw TransactionInactiveError
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBidbcursor_continue_index7expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbcursor_continue_index7-expected.txt (208517 => 208518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbcursor_continue_index7-expected.txt 2016-11-10 01:36:34 UTC (rev 208517)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbcursor_continue_index7-expected.txt 2016-11-10 01:42:24 UTC (rev 208518)
</span><span class="lines">@@ -1,5 +1,3 @@
</span><span class="cx">
</span><del>-FAIL IDBCursor.continue() - index - throw TransactionInactiveError assert_throws: Calling continue() should throws an exception TransactionInactiveError when the transaction is not active. function "function () {
- cursor.continue();
- ..." threw object "InvalidStateError (DOM IDBDatabase Exception 11): Failed ..." that is not a DOMException TransactionInactiveError: property "code" is equal to 11, expected 0
</del><ins>+PASS IDBCursor.continue() - index - throw TransactionInactiveError
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBidbobjectstore_createIndex14exception_orderexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbobjectstore_createIndex14-exception_order-expected.txt (208517 => 208518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbobjectstore_createIndex14-exception_order-expected.txt 2016-11-10 01:36:34 UTC (rev 208517)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbobjectstore_createIndex14-exception_order-expected.txt 2016-11-10 01:42:24 UTC (rev 208518)
</span><span class="lines">@@ -2,7 +2,6 @@
</span><span class="cx"> PASS InvalidStateError(Incorrect mode) vs. TransactionInactiveError
</span><span class="cx"> PASS InvalidStateError(Deleted ObjectStore) vs. TransactionInactiveError
</span><span class="cx"> PASS TransactionInactiveError vs. ConstraintError
</span><del>-FAIL ConstraintError vs. SyntaxError assert_throws: Index name check should precede syntax check of the key path function "function () {
- store.createIndex("index", "inv..." threw object "SyntaxError (DOM IDBDatabase Exception 12): Failed to exe..." that is not a DOMException ConstraintError: property "code" is equal to 12, expected 0
</del><ins>+PASS ConstraintError vs. SyntaxError
</ins><span class="cx"> PASS SyntaxError vs. InvalidAccessError
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208517 => 208518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-10 01:36:34 UTC (rev 208517)
+++ trunk/Source/WebCore/ChangeLog 2016-11-10 01:42:24 UTC (rev 208518)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-11-09 Brady Eidson <beidson@apple.com>
+
+ IndexedDB 2.0: Clean up some exception ordering.
+ https://bugs.webkit.org/show_bug.cgi?id=164566
+
+ Reviewed by Alex Christensen.
+
+ No new tests (Covered by existing tests).
+
+ * Modules/indexeddb/IDBCursor.cpp:
+ (WebCore::IDBCursor::advance):
+ (WebCore::IDBCursor::continueFunction):
+
+ * Modules/indexeddb/IDBObjectStore.cpp:
+ (WebCore::IDBObjectStore::createIndex):
+
</ins><span class="cx"> 2016-11-09 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r208438.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp (208517 => 208518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp 2016-11-10 01:36:34 UTC (rev 208517)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp 2016-11-10 01:42:24 UTC (rev 208518)
</span><span class="lines">@@ -226,12 +226,12 @@
</span><span class="cx"> if (!count)
</span><span class="cx"> return Exception { TypeError, ASCIILiteral("Failed to execute 'advance' on 'IDBCursor': A count argument with value 0 (zero) was supplied, must be greater than 0.") };
</span><span class="cx">
</span><ins>+ if (!transaction().isActive())
+ return Exception { IDBDatabaseException::TransactionInactiveError, ASCIILiteral("Failed to execute 'advance' on 'IDBCursor': The transaction is inactive or finished.") };
+
</ins><span class="cx"> if (sourcesDeleted())
</span><span class="cx"> return Exception { IDBDatabaseException::InvalidStateError, ASCIILiteral("Failed to execute 'advance' on 'IDBCursor': The cursor's source or effective object store has been deleted.") };
</span><span class="cx">
</span><del>- if (!transaction().isActive())
- return Exception { IDBDatabaseException::TransactionInactiveError, ASCIILiteral("Failed to execute 'advance' on 'IDBCursor': The transaction is inactive or finished.") };
-
</del><span class="cx"> if (!m_gotValue)
</span><span class="cx"> return Exception { IDBDatabaseException::InvalidStateError, ASCIILiteral("Failed to execute 'advance' on 'IDBCursor': The cursor is being iterated or has iterated past its end.") };
</span><span class="cx">
</span><span class="lines">@@ -308,12 +308,12 @@
</span><span class="cx"> if (!m_request)
</span><span class="cx"> return Exception { IDBDatabaseException::InvalidStateError };
</span><span class="cx">
</span><ins>+ if (!transaction().isActive())
+ return Exception { IDBDatabaseException::TransactionInactiveError, ASCIILiteral("Failed to execute 'continue' on 'IDBCursor': The transaction is inactive or finished.") };
+
</ins><span class="cx"> if (sourcesDeleted())
</span><span class="cx"> return Exception { IDBDatabaseException::InvalidStateError, ASCIILiteral("Failed to execute 'continue' on 'IDBCursor': The cursor's source or effective object store has been deleted.") };
</span><span class="cx">
</span><del>- if (!transaction().isActive())
- return Exception { IDBDatabaseException::TransactionInactiveError, ASCIILiteral("Failed to execute 'continue' on 'IDBCursor': The transaction is inactive or finished.") };
-
</del><span class="cx"> if (!m_gotValue)
</span><span class="cx"> return Exception { IDBDatabaseException::InvalidStateError, ASCIILiteral("Failed to execute 'continue' on 'IDBCursor': The cursor is being iterated or has iterated past its end.") };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBObjectStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp (208517 => 208518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2016-11-10 01:36:34 UTC (rev 208517)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2016-11-10 01:42:24 UTC (rev 208518)
</span><span class="lines">@@ -397,15 +397,18 @@
</span><span class="cx"> LOG(IndexedDB, "IDBObjectStore::createIndex %s", name.utf8().data());
</span><span class="cx"> ASSERT(currentThread() == m_transaction.database().originThreadID());
</span><span class="cx">
</span><ins>+ if (!m_transaction.isVersionChange())
+ return Exception { IDBDatabaseException::InvalidStateError, ASCIILiteral("Failed to execute 'createIndex' on 'IDBObjectStore': The database is not running a version change transaction.") };
+
</ins><span class="cx"> if (m_deleted)
</span><span class="cx"> return Exception { IDBDatabaseException::InvalidStateError, ASCIILiteral("Failed to execute 'createIndex' on 'IDBObjectStore': The object store has been deleted.") };
</span><span class="cx">
</span><del>- if (!m_transaction.isVersionChange())
- return Exception { IDBDatabaseException::InvalidStateError, ASCIILiteral("Failed to execute 'createIndex' on 'IDBObjectStore': The database is not running a version change transaction.") };
-
</del><span class="cx"> if (!m_transaction.isActive())
</span><del>- return Exception { IDBDatabaseException::TransactionInactiveError };
</del><ins>+ return Exception { IDBDatabaseException::TransactionInactiveError, ASCIILiteral("Failed to execute 'createIndex' on 'IDBObjectStore': The transaction is inactive.")};
</ins><span class="cx">
</span><ins>+ if (m_info.hasIndex(name))
+ return Exception { IDBDatabaseException::ConstraintError, ASCIILiteral("Failed to execute 'createIndex' on 'IDBObjectStore': An index with the specified name already exists.") };
+
</ins><span class="cx"> if (!isIDBKeyPathValid(keyPath))
</span><span class="cx"> return Exception { IDBDatabaseException::SyntaxError, ASCIILiteral("Failed to execute 'createIndex' on 'IDBObjectStore': The keyPath argument contains an invalid key path.") };
</span><span class="cx">
</span><span class="lines">@@ -412,9 +415,6 @@
</span><span class="cx"> if (name.isNull())
</span><span class="cx"> return Exception { TypeError };
</span><span class="cx">
</span><del>- if (m_info.hasIndex(name))
- return Exception { IDBDatabaseException::ConstraintError, ASCIILiteral("Failed to execute 'createIndex' on 'IDBObjectStore': An index with the specified name already exists.") };
-
</del><span class="cx"> if (parameters.multiEntry && WTF::holds_alternative<Vector<String>>(keyPath))
</span><span class="cx"> return Exception { IDBDatabaseException::InvalidAccessError, ASCIILiteral("Failed to execute 'createIndex' on 'IDBObjectStore': The keyPath argument was an array and the multiEntry option is true.") };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>