<!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>[192813] 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/192813">192813</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-11-30 12:12:07 -0800 (Mon, 30 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: After versionchange transactions abort, fire onerror on the original IDBOpenDBRequest.
https://bugs.webkit.org/show_bug.cgi?id=151648
Reviewed by Andy Estes.
Source/WebCore:
No new tests. Covered by at least one existing failing test which now passes, and many
other tests updated to fix their incorrect behavior.
* Modules/indexeddb/client/IDBDatabaseImpl.cpp:
(WebCore::IDBClient::IDBDatabase::transaction):
(WebCore::IDBClient::IDBDatabase::willAbortTransaction):
(WebCore::IDBClient::IDBDatabase::didAbortTransaction):
* Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:
(WebCore::IDBClient::IDBOpenDBRequest::fireErrorAfterVersionChangeAbort):
* Modules/indexeddb/client/IDBOpenDBRequestImpl.h:
* Modules/indexeddb/client/IDBTransactionImpl.cpp:
(WebCore::IDBClient::IDBTransaction::notifyDidAbort):
(WebCore::IDBClient::IDBTransaction::didAbort):
(WebCore::IDBClient::IDBTransaction::didCommit):
* Modules/indexeddb/client/IDBTransactionImpl.h:
LayoutTests:
* platform/mac-wk1/TestExpectations:
* storage/indexeddb/modern/abort-requests-cancelled-expected.txt:
* storage/indexeddb/modern/abort-requests-cancelled.html:
* storage/indexeddb/modern/aborted-put-expected.txt:
* storage/indexeddb/modern/aborted-put.html:
* storage/indexeddb/modern/createobjectstore-basic-expected.txt:
* storage/indexeddb/modern/createobjectstore-basic.html:
* storage/indexeddb/modern/deleteindex-2-expected.txt:
* storage/indexeddb/modern/deleteindex-2.html:
* storage/indexeddb/modern/deleteobjectstore-1-expected.txt:
* storage/indexeddb/modern/deleteobjectstore-1.html:
* storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt:
* storage/indexeddb/modern/versionchange-abort-then-reopen-expected.txt:
* storage/indexeddb/modern/versionchange-abort-then-reopen.html:</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="#trunkLayoutTestsstorageindexeddbmodernabortrequestscancelledexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernabortrequestscancelledhtml">trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernabortedputexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/aborted-put-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernabortedputhtml">trunk/LayoutTests/storage/indexeddb/modern/aborted-put.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncreateobjectstorebasicexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncreateobjectstorebasichtml">trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeleteindex2expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeleteindex2html">trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeleteobjectstore1expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeleteobjectstore1html">trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbdatabasetransactionfailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernversionchangeabortthenreopenexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernversionchangeabortthenreopenhtml">trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplh">trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplh">trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/ChangeLog 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-11-30 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: After versionchange transactions abort, fire onerror on the original IDBOpenDBRequest.
+ https://bugs.webkit.org/show_bug.cgi?id=151648
+
+ Reviewed by Andy Estes.
+
+ * platform/mac-wk1/TestExpectations:
+ * storage/indexeddb/modern/abort-requests-cancelled-expected.txt:
+ * storage/indexeddb/modern/abort-requests-cancelled.html:
+ * storage/indexeddb/modern/aborted-put-expected.txt:
+ * storage/indexeddb/modern/aborted-put.html:
+ * storage/indexeddb/modern/createobjectstore-basic-expected.txt:
+ * storage/indexeddb/modern/createobjectstore-basic.html:
+ * storage/indexeddb/modern/deleteindex-2-expected.txt:
+ * storage/indexeddb/modern/deleteindex-2.html:
+ * storage/indexeddb/modern/deleteobjectstore-1-expected.txt:
+ * storage/indexeddb/modern/deleteobjectstore-1.html:
+ * storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt:
+ * storage/indexeddb/modern/versionchange-abort-then-reopen-expected.txt:
+ * storage/indexeddb/modern/versionchange-abort-then-reopen.html:
+
</ins><span class="cx"> 2015-11-30 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> location.origin is undefined in a web worker
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> inspector/indexeddb
</span><span class="cx">
</span><span class="cx"> # But Modern IndexedDB is.
</span><ins>+storage/indexeddb/aborted-versionchange-closes.html [ Pass ]
</ins><span class="cx"> storage/indexeddb/modern [ Pass ]
</span><span class="cx"> storage/indexeddb/mozilla/add-twice-failure.html [ Pass ]
</span><span class="cx"> storage/indexeddb/mozilla/autoincrement-indexes.html [ Pass ]
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernabortrequestscancelledexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled-expected.txt (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled-expected.txt 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled-expected.txt 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> Error handling: "objectStore.put({ bar: 'B' }, 2);" (error)
</span><span class="cx"> Error handling: "objectStore.put({ bar: 'C' }, 3);" (error)
</span><span class="cx"> Initial upgrade versionchange transaction aborted
</span><ins>+Initial upgrade versionchange transaction error [object Event]
</ins><span class="cx"> Second upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Success handling: "objectStore.put({ bar: 'A' }, 1);"
</span><span class="cx"> Success handling: "objectStore.put({ bar: 'B' }, 2);"
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernabortrequestscancelledhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled.html (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled.html 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled.html 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -64,8 +64,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> versionTransaction.onerror = function(event) {
</span><del>- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
</del><ins>+ log("Initial upgrade versionchange transaction error " + event);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernabortedputexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/aborted-put-expected.txt (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/aborted-put-expected.txt 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/storage/indexeddb/modern/aborted-put-expected.txt 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> ALERT: get1 'foo' succeeded - value was 'baz'
</span><span class="cx"> ALERT: get2 'far' succeeded - value was 'boo'
</span><span class="cx"> ALERT: Second version change transaction abort
</span><ins>+ALERT: Second version change transaction error - [object Event]
</ins><span class="cx"> ALERT: Third upgrade needed: Old version - 1 New version - 2
</span><span class="cx"> ALERT: [object IDBTransaction] - versionchange
</span><span class="cx"> ALERT: [object IDBDatabase]
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernabortedputhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/aborted-put.html (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/aborted-put.html 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/storage/indexeddb/modern/aborted-put.html 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -142,8 +142,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> tx.onerror = function(event) {
</span><del>- alert("Second version change transaction unexpected error - " + event);
- done();
</del><ins>+ alert("Second version change transaction error - " + event);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncreateobjectstorebasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic-expected.txt (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic-expected.txt 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic-expected.txt 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> ALERT: Put succeeded
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction aborted
</span><span class="cx"> ALERT: Object store names:
</span><ins>+ALERT: Initial upgrade versionchange transaction error [object Event]
</ins><span class="cx"> ALERT: Second upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Object store names:
</span><span class="cx"> ALERT: Second upgrade versionchange transaction complete
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncreateobjectstorebasichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic.html (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic.html 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic.html 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -56,8 +56,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> versionTransaction.onerror = function(event) {
</span><del>- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
</del><ins>+ alert("Initial upgrade versionchange transaction error " + event);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeleteindex2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2-expected.txt (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2-expected.txt 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2-expected.txt 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> Deleted the index
</span><span class="cx"> Aborted the transaction
</span><span class="cx"> Second upgrade versionchange transaction abort
</span><ins>+Second upgrade versionchange transaction error [object Event]
</ins><span class="cx"> Third upgrade needed: Old version - 1 New version - 3
</span><span class="cx"> Count is: 2
</span><span class="cx"> Cursor at record: A / 1
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeleteindex2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2.html (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2.html 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2.html 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -102,8 +102,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> versionTransaction.onerror = function(event) {
</span><del>- log("Second upgrade versionchange transaction unexpected error" + event);
- done();
</del><ins>+ log("Second upgrade versionchange transaction error " + event);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeleteobjectstore1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1-expected.txt (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1-expected.txt 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1-expected.txt 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -3,6 +3,8 @@
</span><span class="cx"> ALERT: Second upgrade needed: Old version - 1 New version - 2
</span><span class="cx"> ALERT: Deleting object store
</span><span class="cx"> ALERT: Second version change transaction abort
</span><ins>+ALERT: Request error - [object Event]
+ALERT: Second version change transaction error - [object Event]
</ins><span class="cx"> ALERT: Success opening database connection - Starting final transaction
</span><span class="cx"> ALERT: Value gotten was AH AH AH AH AH
</span><span class="cx"> ALERT: Value gotten was AH AH AH AH AH
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeleteobjectstore1html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1.html (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1.html 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1.html 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -52,8 +52,7 @@
</span><span class="cx"> var openRequest = window.indexedDB.open("DeleteObjectStore1Database", 2);
</span><span class="cx">
</span><span class="cx"> openRequest.onerror = function(event) {
</span><del>- alert("Request unexpected error - " + event);
- done();
</del><ins>+ alert("Request error - " + event);
</ins><span class="cx"> }
</span><span class="cx"> openRequest.onblocked = function(event) {
</span><span class="cx"> alert("Request unexpected blocked - " + event);
</span><span class="lines">@@ -87,8 +86,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> versionTransaction.onerror = function(event) {
</span><del>- alert("Second version change transaction unexpected error - " + event);
- done();
</del><ins>+ alert("Second version change transaction error - " + event);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbdatabasetransactionfailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> ALERT: Upgrade needed: Old version - 0 New version - 1
</span><del>-ALERT: Failed to start a transaction while a versionChange transaction was in progress - Error: InvalidStateError: DOM Exception 11
</del><ins>+ALERT: Failed to start a transaction while a versionChange transaction was in progress - Error: InvalidStateError: DOM IDBDatabase Exception 11
</ins><span class="cx"> ALERT: versionchange transaction completed
</span><del>-ALERT: Failed to start a transaction with an empty set of object stores - Error: InvalidAccessError: DOM Exception 15
-ALERT: Failed to start a transaction to a nonexistent object store - Error: NotFoundError: DOM Exception 8
</del><ins>+ALERT: Failed to start a transaction with an empty set of object stores - Error: InvalidAccessError: DOM IDBDatabase Exception 15
+ALERT: Failed to start a transaction to a nonexistent object store - Error: NotFoundError: DOM IDBDatabase Exception 8
</ins><span class="cx"> ALERT: Failed to start a transaction with an invalid mode - TypeError: Type error
</span><span class="cx"> ALERT: Failed to explicitly start a versionchange transaction - TypeError: Type error
</span><del>-ALERT: Failed to explicitly start a transaction with the close pending flag set - Error: InvalidStateError: DOM Exception 11
</del><ins>+ALERT: Failed to explicitly start a transaction with the close pending flag set - Error: InvalidStateError: DOM IDBDatabase Exception 11
</ins><span class="cx"> ALERT: Done
</span><span class="cx"> This tests some obvious failures that can happen while calling IDBDatabase.transaction()
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernversionchangeabortthenreopenexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen-expected.txt (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen-expected.txt 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen-expected.txt 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -1,9 +1,11 @@
</span><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction aborted
</span><ins>+ALERT: Initial upgrade versionchange transaction error [object Event]
</ins><span class="cx"> ALERT: Second upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Second upgrade versionchange transaction complete
</span><span class="cx"> ALERT: Third upgrade needed: Old version - 1 New version - 2
</span><span class="cx"> ALERT: Third upgrade versionchange transaction aborted
</span><ins>+ALERT: Third upgrade versionchange transaction error[object Event]
</ins><span class="cx"> ALERT: Fourth upgrade needed: Old version - 1 New version - 2
</span><span class="cx"> ALERT: Done
</span><span class="cx"> This test opens a new database, then aborts the version change transaction.
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernversionchangeabortthenreopenhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen.html (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen.html 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen.html 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -38,8 +38,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> versionTransaction.onerror = function(event) {
</span><del>- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
</del><ins>+ alert("Initial upgrade versionchange transaction error " + event);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -95,8 +94,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> versionTransaction.onerror = function(event) {
</span><del>- alert("Third upgrade versionchange transaction unexpected error" + event);
- done();
</del><ins>+ alert("Third upgrade versionchange transaction error" + event);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/Source/WebCore/ChangeLog 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-11-30 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: After versionchange transactions abort, fire onerror on the original IDBOpenDBRequest.
+ https://bugs.webkit.org/show_bug.cgi?id=151648
+
+ Reviewed by Andy Estes.
+
+ No new tests. Covered by at least one existing failing test which now passes, and many
+ other tests updated to fix their incorrect behavior.
+
+ * Modules/indexeddb/client/IDBDatabaseImpl.cpp:
+ (WebCore::IDBClient::IDBDatabase::transaction):
+ (WebCore::IDBClient::IDBDatabase::willAbortTransaction):
+ (WebCore::IDBClient::IDBDatabase::didAbortTransaction):
+
+ * Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:
+ (WebCore::IDBClient::IDBOpenDBRequest::fireErrorAfterVersionChangeAbort):
+ * Modules/indexeddb/client/IDBOpenDBRequestImpl.h:
+
+ * Modules/indexeddb/client/IDBTransactionImpl.cpp:
+ (WebCore::IDBClient::IDBTransaction::notifyDidAbort):
+ (WebCore::IDBClient::IDBTransaction::didAbort):
+ (WebCore::IDBClient::IDBTransaction::didCommit):
+ * Modules/indexeddb/client/IDBTransactionImpl.h:
+
</ins><span class="cx"> 2015-11-30 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> location.origin is undefined in a web worker
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -138,12 +138,12 @@
</span><span class="cx"> LOG(IndexedDB, "IDBDatabase::transaction");
</span><span class="cx">
</span><span class="cx"> if (m_closePending) {
</span><del>- ec = INVALID_STATE_ERR;
</del><ins>+ ec = IDBDatabaseException::InvalidStateError;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (objectStores.isEmpty()) {
</span><del>- ec = INVALID_ACCESS_ERR;
</del><ins>+ ec = IDBDatabaseException::InvalidAccessError;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -157,14 +157,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_versionChangeTransaction && !m_versionChangeTransaction->isFinishedOrFinishing()) {
</span><del>- ec = INVALID_STATE_ERR;
</del><ins>+ ec = IDBDatabaseException::InvalidStateError;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto& objectStoreName : objectStores) {
</span><span class="cx"> if (m_info.hasObjectStore(objectStoreName))
</span><span class="cx"> continue;
</span><del>- ec = NOT_FOUND_ERR;
</del><ins>+ ec = IDBDatabaseException::NotFoundError;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -294,6 +294,9 @@
</span><span class="cx"> auto refTransaction = m_activeTransactions.take(transaction.info().identifier());
</span><span class="cx"> ASSERT(refTransaction);
</span><span class="cx"> m_abortingTransactions.set(transaction.info().identifier(), WTF::move(refTransaction));
</span><ins>+
+ if (transaction.isVersionChange())
+ m_closePending = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBDatabase::didAbortTransaction(IDBTransaction& transaction)
</span><span class="lines">@@ -303,6 +306,9 @@
</span><span class="cx"> if (transaction.isVersionChange()) {
</span><span class="cx"> ASSERT(transaction.originalDatabaseInfo());
</span><span class="cx"> m_info = *transaction.originalDatabaseInfo();
</span><ins>+ m_closePending = true;
+ m_closedInServer = true;
+ m_serverConnection->databaseConnectionClosed(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> didCommitOrAbortTransaction(transaction);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -79,6 +79,19 @@
</span><span class="cx"> enqueueEvent(Event::create(eventNames().successEvent, false, false));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBOpenDBRequest::fireErrorAfterVersionChangeAbort()
+{
+ LOG(IndexedDB, "IDBOpenDBRequest::fireErrorAfterVersionChangeAbort()");
+
+ ASSERT(hasPendingActivity());
+
+ IDBError idbError(IDBExceptionCode::AbortError);
+ m_domError = DOMError::create(idbError.name());
+
+ m_transaction->addRequest(*this);
+ enqueueEvent(Event::create(eventNames().errorEvent, true, true));
+}
+
</ins><span class="cx"> void IDBOpenDBRequest::onSuccess(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBOpenDBRequest::onSuccess()");
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx">
</span><span class="cx"> void requestCompleted(const IDBResultData&);
</span><span class="cx"> void fireSuccessAfterVersionChangeCommit();
</span><ins>+ void fireErrorAfterVersionChangeAbort();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> IDBOpenDBRequest(IDBConnectionToServer&, ScriptExecutionContext*, const IDBDatabaseIdentifier&, uint64_t version);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -321,6 +321,18 @@
</span><span class="cx"> scheduleOperationTimer();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBTransaction::notifyDidAbort(const IDBError& error)
+{
+ m_database->didAbortTransaction(*this);
+ m_idbError = error;
+ fireOnAbort();
+
+ if (isVersionChange()) {
+ ASSERT(m_openDBRequest);
+ m_openDBRequest->fireErrorAfterVersionChangeAbort();
+ }
+}
+
</ins><span class="cx"> void IDBTransaction::didAbort(const IDBError& error)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::didAbort");
</span><span class="lines">@@ -328,11 +340,8 @@
</span><span class="cx"> if (m_state == IndexedDB::TransactionState::Finished)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_database->didAbortTransaction(*this);
</del><ins>+ notifyDidAbort(error);
</ins><span class="cx">
</span><del>- m_idbError = error;
- fireOnAbort();
-
</del><span class="cx"> finishAbortOrCommit();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -345,11 +354,8 @@
</span><span class="cx"> if (error.isNull()) {
</span><span class="cx"> m_database->didCommitTransaction(*this);
</span><span class="cx"> fireOnComplete();
</span><del>- } else {
- m_database->didAbortTransaction(*this);
- m_idbError = error;
- fireOnAbort();
- }
</del><ins>+ } else
+ notifyDidAbort(error);
</ins><span class="cx">
</span><span class="cx"> finishAbortOrCommit();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h (192812 => 192813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h 2015-11-30 20:07:18 UTC (rev 192812)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h 2015-11-30 20:12:07 UTC (rev 192813)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx">
</span><span class="cx"> void commit();
</span><span class="cx">
</span><ins>+ void notifyDidAbort(const IDBError&);
</ins><span class="cx"> void finishAbortOrCommit();
</span><span class="cx">
</span><span class="cx"> void scheduleOperation(RefPtr<TransactionOperation>&&);
</span></span></pre>
</div>
</div>
</body>
</html>