<!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>[192890] 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/192890">192890</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-01 10:29:27 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: storage/indexeddb/basics.html fails.
https://bugs.webkit.org/show_bug.cgi?id=151694
Reviewed by Alex Christensen.
Source/WebCore:
No new tests (At least one failing test now passes, and covered by changes to 3 previously incorrect tests).
* Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:
(WebCore::IDBClient::IDBOpenDBRequest::versionChangeTransactionWillFinish): Set the flag determining whether
or not the request's transaction should be exposed to the DOM.
* Modules/indexeddb/client/IDBOpenDBRequestImpl.h:
* Modules/indexeddb/client/IDBRequestImpl.cpp:
(WebCore::IDBClient::IDBRequest::result): Throw an exception if the request is not done.
(WebCore::IDBClient::IDBRequest::error): Ditto.
(WebCore::IDBClient::IDBRequest::transaction): Only return the transaction to the DOM if the flag says so.
* Modules/indexeddb/client/IDBRequestImpl.h:
* Modules/indexeddb/client/IDBTransactionImpl.cpp:
(WebCore::IDBClient::IDBTransaction::abort):
(WebCore::IDBClient::IDBTransaction::commit):
LayoutTests:
* platform/mac-wk1/TestExpectations:
* storage/indexeddb/modern/deletedatabase-1.html:
* storage/indexeddb/modern/opendatabase-versions.html:
* storage/indexeddb/modern/versionchange-event.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="#trunkLayoutTestsstorageindexeddbmoderndeletedatabase1html">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabaseversionshtml">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html</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="#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="#trunkSourceWebCoreModulesindexeddbclientIDBRequestImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBRequestImplh">trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.h</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 (192889 => 192890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-01 18:26:18 UTC (rev 192889)
+++ trunk/LayoutTests/ChangeLog 2015-12-01 18:29:27 UTC (rev 192890)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-12-01 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: storage/indexeddb/basics.html fails.
+ https://bugs.webkit.org/show_bug.cgi?id=151694
+
+ Reviewed by Alex Christensen.
+
+ * platform/mac-wk1/TestExpectations:
+ * storage/indexeddb/modern/deletedatabase-1.html:
+ * storage/indexeddb/modern/opendatabase-versions.html:
+ * storage/indexeddb/modern/versionchange-event.html:
+
</ins><span class="cx"> 2015-12-01 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r192876.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (192889 => 192890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-01 18:26:18 UTC (rev 192889)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-01 18:29:27 UTC (rev 192890)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx">
</span><span class="cx"> # But Modern IndexedDB is.
</span><span class="cx"> storage/indexeddb/aborted-versionchange-closes.html [ Pass ]
</span><ins>+storage/indexeddb/basics.html [ Pass ]
</ins><span class="cx"> storage/indexeddb/cursor-cast.html [ Pass ]
</span><span class="cx"> storage/indexeddb/cursor-finished.html [ Pass ]
</span><span class="cx"> storage/indexeddb/modern [ Pass ]
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabase1html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html (192889 => 192890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html 2015-12-01 18:26:18 UTC (rev 192889)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html 2015-12-01 18:29:27 UTC (rev 192890)
</span><span class="lines">@@ -42,11 +42,10 @@
</span><span class="cx"> request.transaction.oncomplete = function()
</span><span class="cx"> {
</span><span class="cx"> log("Version change complete");
</span><del>- var connection = request.transaction.db;
- connection.onversionchange = function(e)
</del><ins>+ database.onversionchange = function(e)
</ins><span class="cx"> {
</span><span class="cx"> log("First connection received versionchange event: oldVersion " + e.oldVersion + ", newVersion " + e.newVersion);
</span><del>- connection.close();
</del><ins>+ database.close();
</ins><span class="cx"> }
</span><span class="cx"> continueTest1();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabaseversionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html (192889 => 192890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html 2015-12-01 18:26:18 UTC (rev 192889)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html 2015-12-01 18:29:27 UTC (rev 192890)
</span><span class="lines">@@ -28,12 +28,14 @@
</span><span class="cx">
</span><span class="cx"> request.onupgradeneeded = function(e)
</span><span class="cx"> {
</span><ins>+ var database = event.target.result;
+
</ins><span class="cx"> alert("upgradeneeded (firstPhase): old version - " + e.oldVersion + " new version - " + e.newVersion);
</span><span class="cx"> alert(request.transaction);
</span><span class="cx"> request.transaction.oncomplete = function()
</span><span class="cx"> {
</span><del>- alert("Version change complete (firstPhase). Database version is now - " + request.transaction.db.version);
- request.transaction.db.close();
</del><ins>+ alert("Version change complete (firstPhase). Database version is now - " + database.version);
+ database.close();
</ins><span class="cx"> secondPhase();
</span><span class="cx"> }
</span><span class="cx"> request.transaction.onabort = function()
</span><span class="lines">@@ -86,12 +88,14 @@
</span><span class="cx"> }
</span><span class="cx"> request.onupgradeneeded = function(e)
</span><span class="cx"> {
</span><ins>+ var database = event.target.result;
+
</ins><span class="cx"> alert("upgradeneeded (thirdPhase): old version - " + e.oldVersion + " new version - " + e.newVersion);
</span><span class="cx"> alert(request.transaction);
</span><span class="cx"> request.transaction.oncomplete = function()
</span><span class="cx"> {
</span><del>- alert("Version change complete (thirdPhase). Database version is now - " + request.transaction.db.version);
- request.transaction.db.close();
</del><ins>+ alert("Version change complete (thirdPhase). Database version is now - " + database.version);
+ database.close();
</ins><span class="cx"> fourthPhase();
</span><span class="cx"> }
</span><span class="cx"> request.transaction.onabort = function()
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernversionchangeeventhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.html (192889 => 192890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.html 2015-12-01 18:26:18 UTC (rev 192889)
+++ trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.html 2015-12-01 18:29:27 UTC (rev 192890)
</span><span class="lines">@@ -36,11 +36,14 @@
</span><span class="cx">
</span><span class="cx"> request.onupgradeneeded = function(e)
</span><span class="cx"> {
</span><ins>+ var database = event.target.result;
+
</ins><span class="cx"> alert("upgradeneeded (firstPhase): old version - " + e.oldVersion + " new version - " + e.newVersion);
</span><span class="cx"> request.transaction.oncomplete = function()
</span><span class="cx"> {
</span><del>- alert("Version change complete (firstPhase). Database version is now - " + request.transaction.db.version);
- connection1 = request.transaction.db;
</del><ins>+ alert("Version change complete (firstPhase). Database version is now - " + database.version);
+
+ connection1 = database;
</ins><span class="cx"> connection1.onversionchange = function(e)
</span><span class="cx"> {
</span><span class="cx"> connection1.oldVersion = e.oldVersion;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192889 => 192890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-01 18:26:18 UTC (rev 192889)
+++ trunk/Source/WebCore/ChangeLog 2015-12-01 18:29:27 UTC (rev 192890)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-12-01 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: storage/indexeddb/basics.html fails.
+ https://bugs.webkit.org/show_bug.cgi?id=151694
+
+ Reviewed by Alex Christensen.
+
+ No new tests (At least one failing test now passes, and covered by changes to 3 previously incorrect tests).
+
+ * Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:
+ (WebCore::IDBClient::IDBOpenDBRequest::versionChangeTransactionWillFinish): Set the flag determining whether
+ or not the request's transaction should be exposed to the DOM.
+ * Modules/indexeddb/client/IDBOpenDBRequestImpl.h:
+
+ * Modules/indexeddb/client/IDBRequestImpl.cpp:
+ (WebCore::IDBClient::IDBRequest::result): Throw an exception if the request is not done.
+ (WebCore::IDBClient::IDBRequest::error): Ditto.
+ (WebCore::IDBClient::IDBRequest::transaction): Only return the transaction to the DOM if the flag says so.
+ * Modules/indexeddb/client/IDBRequestImpl.h:
+
+ * Modules/indexeddb/client/IDBTransactionImpl.cpp:
+ (WebCore::IDBClient::IDBTransaction::abort):
+ (WebCore::IDBClient::IDBTransaction::commit):
+
</ins><span class="cx"> 2015-12-01 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] ASSERTION FAILED: m_table running /webkit2/BackForwardList/navigation in Debug build
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp (192889 => 192890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp 2015-12-01 18:26:18 UTC (rev 192889)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp 2015-12-01 18:29:27 UTC (rev 192890)
</span><span class="lines">@@ -67,6 +67,13 @@
</span><span class="cx"> enqueueEvent(Event::create(eventNames().errorEvent, true, true));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBOpenDBRequest::versionChangeTransactionWillFinish()
+{
+ // 3.3.7 "versionchange" transaction steps
+ // When the transaction is finished, immediately set request's transaction property to null.
+ m_shouldExposeTransactionToDOM = false;
+}
+
</ins><span class="cx"> void IDBOpenDBRequest::fireSuccessAfterVersionChangeCommit()
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBOpenDBRequest::fireSuccessAfterVersionChangeCommit()");
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h (192889 => 192890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h 2015-12-01 18:26:18 UTC (rev 192889)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h 2015-12-01 18:29:27 UTC (rev 192890)
</span><span class="lines">@@ -51,6 +51,8 @@
</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 versionChangeTransactionWillFinish();
</ins><span class="cx"> void fireSuccessAfterVersionChangeCommit();
</span><span class="cx"> void fireErrorAfterVersionChangeAbort();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp (192889 => 192890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp 2015-12-01 18:26:18 UTC (rev 192889)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp 2015-12-01 18:29:27 UTC (rev 192890)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "EventQueue.h"
</span><span class="cx"> #include "IDBBindingUtilities.h"
</span><span class="cx"> #include "IDBCursorImpl.h"
</span><ins>+#include "IDBDatabaseException.h"
</ins><span class="cx"> #include "IDBEventDispatcher.h"
</span><span class="cx"> #include "IDBKeyData.h"
</span><span class="cx"> #include "IDBResultData.h"
</span><span class="lines">@@ -119,9 +120,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebCore::IDBAny> IDBRequest::result(ExceptionCode&) const
</del><ins>+RefPtr<WebCore::IDBAny> IDBRequest::result(ExceptionCode& ec) const
</ins><span class="cx"> {
</span><del>- return m_result;
</del><ins>+ if (m_readyState == IDBRequestReadyState::Done)
+ return m_result;
+
+ ec = IDBDatabaseException::InvalidStateError;
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned short IDBRequest::errorCode(ExceptionCode&) const
</span><span class="lines">@@ -129,9 +134,13 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<DOMError> IDBRequest::error(ExceptionCode&) const
</del><ins>+RefPtr<DOMError> IDBRequest::error(ExceptionCode& ec) const
</ins><span class="cx"> {
</span><del>- return m_domError;
</del><ins>+ if (m_readyState == IDBRequestReadyState::Done)
+ return m_domError;
+
+ ec = IDBDatabaseException::InvalidStateError;
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCore::IDBAny> IDBRequest::source() const
</span><span class="lines">@@ -146,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCore::IDBTransaction> IDBRequest::transaction() const
</span><span class="cx"> {
</span><del>- return m_transaction;
</del><ins>+ return m_shouldExposeTransactionToDOM ? m_transaction : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& IDBRequest::readyState() const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBRequestImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.h (192889 => 192890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.h 2015-12-01 18:26:18 UTC (rev 192889)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.h 2015-12-01 18:29:27 UTC (rev 192890)
</span><span class="lines">@@ -120,6 +120,7 @@
</span><span class="cx"> IDBRequestReadyState m_readyState { IDBRequestReadyState::Pending };
</span><span class="cx"> RefPtr<IDBAny> m_result;
</span><span class="cx"> RefPtr<IDBTransaction> m_transaction;
</span><ins>+ bool m_shouldExposeTransactionToDOM { true };
</ins><span class="cx"> RefPtr<DOMError> m_domError;
</span><span class="cx"> IDBError m_idbError;
</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 (192889 => 192890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp 2015-12-01 18:26:18 UTC (rev 192889)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp 2015-12-01 18:29:27 UTC (rev 192890)
</span><span class="lines">@@ -177,6 +177,11 @@
</span><span class="cx"> m_state = IndexedDB::TransactionState::Aborting;
</span><span class="cx"> m_database->willAbortTransaction(*this);
</span><span class="cx">
</span><ins>+ if (isVersionChange()) {
+ ASSERT(m_openDBRequest);
+ m_openDBRequest->versionChangeTransactionWillFinish();
+ }
+
</ins><span class="cx"> m_abortQueue.swap(m_transactionOperationQueue);
</span><span class="cx">
</span><span class="cx"> auto operation = createTransactionOperation(*this, nullptr, &IDBTransaction::abortOnServerAndCancelRequests);
</span><span class="lines">@@ -285,6 +290,11 @@
</span><span class="cx"> m_state = IndexedDB::TransactionState::Committing;
</span><span class="cx"> m_database->willCommitTransaction(*this);
</span><span class="cx">
</span><ins>+ if (isVersionChange()) {
+ ASSERT(m_openDBRequest);
+ m_openDBRequest->versionChangeTransactionWillFinish();
+ }
+
</ins><span class="cx"> auto operation = createTransactionOperation(*this, nullptr, &IDBTransaction::commitOnServer);
</span><span class="cx"> scheduleOperation(WTF::move(operation));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>