<!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>[192720] 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/192720">192720</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-11-20 19:57:19 -0800 (Fri, 20 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: After versionchange transactions complete, fire onsuccess on the original IDBOpenDBRequest
https://bugs.webkit.org/show_bug.cgi?id=151522
Reviewed by Alex Christensen.
Source/WebCore:
Test: storage/indexeddb/modern/opendatabase-success-after-versionchange.html (And changes to other existing tests)
* Modules/indexeddb/client/IDBDatabaseImpl.cpp:
(WebCore::IDBClient::IDBDatabase::startVersionChangeTransaction):
* Modules/indexeddb/client/IDBDatabaseImpl.h:
* Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:
(WebCore::IDBClient::IDBOpenDBRequest::fireSuccessAfterVersionChangeCommit):
(WebCore::IDBClient::IDBOpenDBRequest::onUpgradeNeeded):
* Modules/indexeddb/client/IDBOpenDBRequestImpl.h:
* Modules/indexeddb/client/IDBTransactionImpl.cpp:
(WebCore::IDBClient::IDBTransaction::create):
(WebCore::IDBClient::IDBTransaction::IDBTransaction):
(WebCore::IDBClient::IDBTransaction::dispatchEvent):
* Modules/indexeddb/client/IDBTransactionImpl.h:
LayoutTests:
* storage/indexeddb/modern/deletedatabase-1-expected.txt:
* storage/indexeddb/modern/deletedatabase-1.html:
* storage/indexeddb/modern/deletedatabase-2-expected.txt:
* storage/indexeddb/modern/deletedatabase-2.html:
* storage/indexeddb/modern/opendatabase-success-after-versionchange-expected.txt: Added.
* storage/indexeddb/modern/opendatabase-success-after-versionchange.html: Added.
* storage/indexeddb/modern/opendatabase-versions-expected.txt:
* storage/indexeddb/modern/opendatabase-versions.html:
* storage/indexeddb/modern/versionchange-event-expected.txt:
* storage/indexeddb/modern/versionchange-event.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabase1expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabase1html">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabase2expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabase2html">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabaseversionsexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabaseversionshtml">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernversionchangeeventexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/versionchange-event-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernversionchangeeventhtml">trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.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="#trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplh">trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabasesuccessafterversionchangeexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabasesuccessafterversionchangehtml">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/LayoutTests/ChangeLog 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-11-20 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: After versionchange transactions complete, fire onsuccess on the original IDBOpenDBRequest
+ https://bugs.webkit.org/show_bug.cgi?id=151522
+
+ Reviewed by Alex Christensen.
+
+ * storage/indexeddb/modern/deletedatabase-1-expected.txt:
+ * storage/indexeddb/modern/deletedatabase-1.html:
+ * storage/indexeddb/modern/deletedatabase-2-expected.txt:
+ * storage/indexeddb/modern/deletedatabase-2.html:
+ * storage/indexeddb/modern/opendatabase-success-after-versionchange-expected.txt: Added.
+ * storage/indexeddb/modern/opendatabase-success-after-versionchange.html: Added.
+ * storage/indexeddb/modern/opendatabase-versions-expected.txt:
+ * storage/indexeddb/modern/opendatabase-versions.html:
+ * storage/indexeddb/modern/versionchange-event-expected.txt:
+ * storage/indexeddb/modern/versionchange-event.html:
+
</ins><span class="cx"> 2015-11-20 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, mark fast/replaced/replaced-breaking.html as failing on ElCapitan-wk1.
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabase1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1-expected.txt (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1-expected.txt 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1-expected.txt 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> Initial upgrade old version - 0 new version - 1
</span><span class="cx"> Version change complete
</span><span class="cx"> Requesting deleteDatabase
</span><ins>+open db success
</ins><span class="cx"> First connection received versionchange event: oldVersion 1, newVersion null
</span><span class="cx"> Delete database success: oldVersion 1, newVersion null
</span><span class="cx"> Recreating database to make sure it's new and empty
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabase1html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -22,8 +22,7 @@
</span><span class="cx"> var request = window.indexedDB.open("DeleteDatabase1TestDatabase");
</span><span class="cx"> request.onsuccess = function()
</span><span class="cx"> {
</span><del>- log("Unexpected success");
- done();
</del><ins>+ log("open db success");
</ins><span class="cx"> }
</span><span class="cx"> request.onerror = function(e)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabase2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2-expected.txt (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2-expected.txt 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2-expected.txt 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> Requesting deleteDatabase
</span><span class="cx"> First connection received versionchange event: oldVersion 0, newVersion null
</span><span class="cx"> First version change complete
</span><ins>+open db success
</ins><span class="cx"> Delete database success: oldVersion 1, newVersion null
</span><span class="cx"> Recreating database to make sure it's new and empty
</span><span class="cx"> Second upgrade old version - 0 new version - 1
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabase2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2.html (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2.html 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2.html 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -25,8 +25,7 @@
</span><span class="cx"> var request = window.indexedDB.open("DeleteDatabase2TestDatabase");
</span><span class="cx"> request.onsuccess = function()
</span><span class="cx"> {
</span><del>- log("Unexpected success");
- done();
</del><ins>+ log("open db success");
</ins><span class="cx"> }
</span><span class="cx"> request.onerror = function(e)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabasesuccessafterversionchangeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange-expected.txt (0 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange-expected.txt 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+This test verifies that:
+- Opening a new database results in the onupgradeneeded handler being called on the IDBOpenDBRequest.
+- The versionchange transaction representing the upgrade commits successfully.
+- After that transaction commits, the onsuccess handler on the original IDBOpenDBRequest is called.
+upgradeneeded: old version - 0 new version - 1
+[object IDBTransaction]
+Version change complete
+Got the onsuccess handler as expected.
+Done
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabasesuccessafterversionchangehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange.html (0 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange.html 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+This test verifies that:<br>
+ - Opening a new database results in the onupgradeneeded handler being called on the IDBOpenDBRequest.<br>
+ - The versionchange transaction representing the upgrade commits successfully.<br>
+ - After that transaction commits, the onsuccess handler on the original IDBOpenDBRequest is called.<br>
+<div id="logger"></div>
+<script>
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ log("Done");
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+function log(message)
+{
+ document.getElementById("logger").innerHTML += message + "<br>";
+}
+
+var request = window.indexedDB.open("OpenDatabaseSuccessAfterVersionChangeDatabase");
+
+request.onsuccess = function()
+{
+ log("Got the onsuccess handler as expected.");
+ done();
+}
+request.onerror = function(e)
+{
+ log("Unexpected onerror handler called");
+ done();
+}
+
+request.onupgradeneeded = function(e)
+{
+ log("upgradeneeded: old version - " + e.oldVersion + " new version - " + e.newVersion);
+ log(request.transaction);
+
+ request.transaction.oncomplete = function()
+ {
+ log("Version change complete");
+ }
+
+ request.transaction.onabort = function()
+ {
+ log("Version change unexpected abort");
+ done();
+ }
+
+ request.transaction.onerror = function()
+ {
+ log("Version change unexpected error");
+ done();
+ }
+}
+
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabaseversionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -3,12 +3,14 @@
</span><span class="cx"> ALERT: [object IDBTransaction]
</span><span class="cx"> ALERT: Version change complete (firstPhase). Database version is now - 1
</span><span class="cx"> ALERT: [object IDBOpenDBRequest] (secondPhase)
</span><ins>+ALERT: First version change successful
</ins><span class="cx"> ALERT: Successfully opened database at version 1 (secondPhase)
</span><span class="cx"> ALERT: [object IDBOpenDBRequest] (thirdPhase)
</span><span class="cx"> ALERT: upgradeneeded (thirdPhase): old version - 1 new version - 2
</span><span class="cx"> ALERT: [object IDBTransaction]
</span><span class="cx"> ALERT: Version change complete (thirdPhase). Database version is now - 2
</span><span class="cx"> ALERT: [object IDBOpenDBRequest] (fourthPhase)
</span><ins>+ALERT: Version change to version 2 successful
</ins><span class="cx"> ALERT: Expected error (fourthPhase) - VersionError
</span><span class="cx"> ALERT: Done
</span><span class="cx"> This test creates a new database with the default version, commits that versionchange transaction, and then reopens it at different versions to make sure the IDBOpenDBRequests behave appropriately.
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabaseversionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -18,8 +18,7 @@
</span><span class="cx">
</span><span class="cx"> request.onsuccess = function()
</span><span class="cx"> {
</span><del>- alert("Unexpected success (firstPhase)");
- done();
</del><ins>+ alert("First version change successful");
</ins><span class="cx"> }
</span><span class="cx"> request.onerror = function(e)
</span><span class="cx"> {
</span><span class="lines">@@ -78,8 +77,7 @@
</span><span class="cx"> alert(request + " (thirdPhase)");
</span><span class="cx"> request.onsuccess = function()
</span><span class="cx"> {
</span><del>- alert("Unexpected success (thirdPhase)");
- done();
</del><ins>+ alert("Version change to version 2 successful");
</ins><span class="cx"> }
</span><span class="cx"> request.onerror = function(e)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernversionchangeeventexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/versionchange-event-expected.txt (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/versionchange-event-expected.txt 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/LayoutTests/storage/indexeddb/modern/versionchange-event-expected.txt 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> ALERT: upgradeneeded (firstPhase): old version - 0 new version - 1
</span><span class="cx"> ALERT: Version change complete (firstPhase). Database version is now - 1
</span><ins>+ALERT: First version change successful
</ins><span class="cx"> ALERT: Open success (secondPhase)
</span><span class="cx"> ALERT: thirdPhase - Requested database connection with version 2
</span><span class="cx"> ALERT: Expected upgrade needed (thirdPhase)
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernversionchangeeventhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.html (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.html 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.html 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -26,8 +26,7 @@
</span><span class="cx">
</span><span class="cx"> request.onsuccess = function()
</span><span class="cx"> {
</span><del>- alert("Unexpected success (firstPhase)");
- done();
</del><ins>+ alert("First version change successful");
</ins><span class="cx"> }
</span><span class="cx"> request.onerror = function(e)
</span><span class="cx"> {
</span><span class="lines">@@ -95,8 +94,7 @@
</span><span class="cx"> alert("thirdPhase - Requested database connection with version 2");
</span><span class="cx"> request.onsuccess = function()
</span><span class="cx"> {
</span><del>- alert("Unexpected open success (thirdPhase)");
- done();
</del><ins>+ alert("Version change to version 2 successful");
</ins><span class="cx"> }
</span><span class="cx"> request.onerror = function(e)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/Source/WebCore/ChangeLog 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-11-20 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: After versionchange transactions complete, fire onsuccess on the original IDBOpenDBRequest
+ https://bugs.webkit.org/show_bug.cgi?id=151522
+
+ Reviewed by Alex Christensen.
+
+ Test: storage/indexeddb/modern/opendatabase-success-after-versionchange.html (And changes to other existing tests)
+
+ * Modules/indexeddb/client/IDBDatabaseImpl.cpp:
+ (WebCore::IDBClient::IDBDatabase::startVersionChangeTransaction):
+ * Modules/indexeddb/client/IDBDatabaseImpl.h:
+
+ * Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:
+ (WebCore::IDBClient::IDBOpenDBRequest::fireSuccessAfterVersionChangeCommit):
+ (WebCore::IDBClient::IDBOpenDBRequest::onUpgradeNeeded):
+ * Modules/indexeddb/client/IDBOpenDBRequestImpl.h:
+
+ * Modules/indexeddb/client/IDBTransactionImpl.cpp:
+ (WebCore::IDBClient::IDBTransaction::create):
+ (WebCore::IDBClient::IDBTransaction::IDBTransaction):
+ (WebCore::IDBClient::IDBTransaction::dispatchEvent):
+ * Modules/indexeddb/client/IDBTransactionImpl.h:
+
</ins><span class="cx"> 2015-11-20 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> More deviceRGB color cleanup
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -239,14 +239,14 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBTransaction> IDBDatabase::startVersionChangeTransaction(const IDBTransactionInfo& info)
</del><ins>+Ref<IDBTransaction> IDBDatabase::startVersionChangeTransaction(const IDBTransactionInfo& info, IDBOpenDBRequest& request)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBDatabase::startVersionChangeTransaction");
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_versionChangeTransaction);
</span><span class="cx"> ASSERT(info.mode() == IndexedDB::TransactionMode::VersionChange);
</span><span class="cx">
</span><del>- Ref<IDBTransaction> transaction = IDBTransaction::create(*this, info);
</del><ins>+ Ref<IDBTransaction> transaction = IDBTransaction::create(*this, info, request);
</ins><span class="cx"> m_versionChangeTransaction = &transaction.get();
</span><span class="cx">
</span><span class="cx"> m_activeTransactions.set(transaction->info().identifier(), &transaction.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> const IDBDatabaseInfo& info() const { return m_info; }
</span><span class="cx"> uint64_t databaseConnectionIdentifier() const { return m_databaseConnectionIdentifier; }
</span><span class="cx">
</span><del>- Ref<IDBTransaction> startVersionChangeTransaction(const IDBTransactionInfo&);
</del><ins>+ Ref<IDBTransaction> startVersionChangeTransaction(const IDBTransactionInfo&, IDBOpenDBRequest&);
</ins><span class="cx"> void didStartTransaction(IDBTransaction&);
</span><span class="cx">
</span><span class="cx"> void willCommitTransaction(IDBTransaction&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -67,6 +67,17 @@
</span><span class="cx"> enqueueEvent(Event::create(eventNames().errorEvent, true, true));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBOpenDBRequest::fireSuccessAfterVersionChangeCommit()
+{
+ LOG(IndexedDB, "IDBOpenDBRequest::fireSuccessAfterVersionChangeCommit()");
+
+ ASSERT(m_result);
+ ASSERT(m_result->type() == IDBAny::Type::IDBDatabase);
+ m_transaction->addRequest(*this);
+
+ enqueueEvent(Event::create(eventNames().successEvent, false, false));
+}
+
</ins><span class="cx"> void IDBOpenDBRequest::onSuccess(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBOpenDBRequest::onSuccess()");
</span><span class="lines">@@ -84,7 +95,7 @@
</span><span class="cx"> void IDBOpenDBRequest::onUpgradeNeeded(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> Ref<IDBDatabase> database = IDBDatabase::create(*scriptExecutionContext(), connection(), resultData);
</span><del>- Ref<IDBTransaction> transaction = database->startVersionChangeTransaction(resultData.transactionInfo());
</del><ins>+ Ref<IDBTransaction> transaction = database->startVersionChangeTransaction(resultData.transactionInfo(), *this);
</ins><span class="cx">
</span><span class="cx"> ASSERT(transaction->info().mode() == IndexedDB::TransactionMode::VersionChange);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> uint64_t version() const { return m_version; }
</span><span class="cx">
</span><span class="cx"> void requestCompleted(const IDBResultData&);
</span><ins>+ void fireSuccessAfterVersionChangeCommit();
</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 (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "IDBKeyData.h"
</span><span class="cx"> #include "IDBKeyRangeData.h"
</span><span class="cx"> #include "IDBObjectStore.h"
</span><ins>+#include "IDBOpenDBRequestImpl.h"
</ins><span class="cx"> #include "IDBRequestImpl.h"
</span><span class="cx"> #include "IDBResultData.h"
</span><span class="cx"> #include "JSDOMWindowBase.h"
</span><span class="lines">@@ -49,19 +50,26 @@
</span><span class="cx">
</span><span class="cx"> Ref<IDBTransaction> IDBTransaction::create(IDBDatabase& database, const IDBTransactionInfo& info)
</span><span class="cx"> {
</span><del>- return adoptRef(*new IDBTransaction(database, info));
</del><ins>+ return adoptRef(*new IDBTransaction(database, info, nullptr));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-IDBTransaction::IDBTransaction(IDBDatabase& database, const IDBTransactionInfo& info)
</del><ins>+Ref<IDBTransaction> IDBTransaction::create(IDBDatabase& database, const IDBTransactionInfo& info, IDBOpenDBRequest& request)
+{
+ return adoptRef(*new IDBTransaction(database, info, &request));
+}
+
+IDBTransaction::IDBTransaction(IDBDatabase& database, const IDBTransactionInfo& info, IDBOpenDBRequest* request)
</ins><span class="cx"> : WebCore::IDBTransaction(database.scriptExecutionContext())
</span><span class="cx"> , m_database(database)
</span><span class="cx"> , m_info(info)
</span><span class="cx"> , m_operationTimer(*this, &IDBTransaction::operationTimerFired)
</span><ins>+ , m_openDBRequest(request)
</ins><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> relaxAdoptionRequirement();
</span><span class="cx">
</span><span class="cx"> if (m_info.mode() == IndexedDB::TransactionMode::VersionChange) {
</span><ins>+ ASSERT(m_openDBRequest);
</ins><span class="cx"> m_originalDatabaseInfo = std::make_unique<IDBDatabaseInfo>(m_database->info());
</span><span class="cx"> m_startedOnServer = true;
</span><span class="cx"> } else {
</span><span class="lines">@@ -381,7 +389,14 @@
</span><span class="cx"> targets.append(this);
</span><span class="cx"> targets.append(db());
</span><span class="cx">
</span><del>- return IDBEventDispatcher::dispatch(event, targets);
</del><ins>+ bool result = IDBEventDispatcher::dispatch(event, targets);
+
+ if (isVersionChange() && event.type() == eventNames().completeEvent) {
+ ASSERT(m_openDBRequest);
+ m_openDBRequest->fireSuccessAfterVersionChangeCommit();
+ }
+
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<IDBObjectStore> IDBTransaction::createObjectStore(const IDBObjectStoreInfo& info)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h (192719 => 192720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h 2015-11-21 03:31:08 UTC (rev 192719)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h 2015-11-21 03:57:19 UTC (rev 192720)
</span><span class="lines">@@ -54,11 +54,13 @@
</span><span class="cx"> class IDBCursor;
</span><span class="cx"> class IDBDatabase;
</span><span class="cx"> class IDBIndex;
</span><ins>+class IDBOpenDBRequest;
</ins><span class="cx"> class TransactionOperation;
</span><span class="cx">
</span><span class="cx"> class IDBTransaction : public WebCore::IDBTransaction {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<IDBTransaction> create(IDBDatabase&, const IDBTransactionInfo&);
</span><ins>+ static Ref<IDBTransaction> create(IDBDatabase&, const IDBTransactionInfo&, IDBOpenDBRequest&);
</ins><span class="cx">
</span><span class="cx"> virtual ~IDBTransaction() override final;
</span><span class="cx">
</span><span class="lines">@@ -122,7 +124,7 @@
</span><span class="cx"> void operationDidComplete(TransactionOperation&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- IDBTransaction(IDBDatabase&, const IDBTransactionInfo&);
</del><ins>+ IDBTransaction(IDBDatabase&, const IDBTransactionInfo&, IDBOpenDBRequest*);
</ins><span class="cx">
</span><span class="cx"> bool isFinishedOrFinishing() const;
</span><span class="cx">
</span><span class="lines">@@ -194,6 +196,8 @@
</span><span class="cx"> Timer m_operationTimer;
</span><span class="cx"> std::unique_ptr<Timer> m_activationTimer;
</span><span class="cx">
</span><ins>+ RefPtr<IDBOpenDBRequest> m_openDBRequest;
+
</ins><span class="cx"> Deque<RefPtr<TransactionOperation>> m_transactionOperationQueue;
</span><span class="cx"> HashMap<IDBResourceIdentifier, RefPtr<TransactionOperation>> m_transactionOperationMap;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>