<!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>[194781] 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/194781">194781</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-08 13:12:08 -0800 (Fri, 08 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Blocked event can fire on a delete request even after the last open connection has closed.
https://bugs.webkit.org/show_bug.cgi?id=152896
Reviewed by Alex Christensen.
LayoutTests/imported/w3c:
* indexeddb/idbfactory_open12-expected.txt:
* indexeddb/idbversionchangeevent-expected.txt:
* indexeddb/transaction-lifetime-expected.txt:
Source/WebCore:
No new tests (Progression in many tests).
* Modules/indexeddb/client/IDBFactoryImpl.cpp:
(WebCore::IDBClient::IDBFactory::deleteDatabase):
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::performCurrentDeleteOperation): Allow for handling 2+ delete operations in a row.
(WebCore::IDBServer::UniqueIDBDatabase::didDeleteBackingStore): Ditto.
(WebCore::IDBServer::UniqueIDBDatabase::connectionClosedFromClient): Call "notifyCurrentRequestConnectionClosedOrFiredVersionChangeEvent"
after the connection is actually removed from the set of open connections.
* Modules/indexeddb/server/UniqueIDBDatabase.h:
LayoutTests:
* platform/mac-wk1/TestExpectations:
* platform/wk2/imported/w3c/indexeddb/idbfactory_open12-expected.txt: Copied from LayoutTests/imported/w3c/indexeddb/idbfactory_open12-expected.txt.
* platform/wk2/imported/w3c/indexeddb/idbversionchangeevent-expected.txt: Copied from LayoutTests/imported/w3c/indexeddb/idbversionchangeevent-expected.txt.
* storage/indexeddb/database-wrapper-expected.txt:
* storage/indexeddb/delete-in-upgradeneeded-close-in-versionchange-expected.txt:
* storage/indexeddb/deletedatabase-not-blocked-expected.txt:
* storage/indexeddb/intversion-upgrades-expected.txt:
* storage/indexeddb/resources/delete-in-upgradeneeded-close-in-versionchange.js:
* storage/indexeddb/resources/deletedatabase-not-blocked.js:
* storage/indexeddb/resources/setversion-not-blocked.js:
* storage/indexeddb/setversion-not-blocked-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cindexeddbidbfactory_open12expectedtxt">trunk/LayoutTests/imported/w3c/indexeddb/idbfactory_open12-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cindexeddbidbversionchangeeventexpectedtxt">trunk/LayoutTests/imported/w3c/indexeddb/idbversionchangeevent-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cindexeddbtransactionlifetimeexpectedtxt">trunk/LayoutTests/imported/w3c/indexeddb/transaction-lifetime-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbdatabasewrapperexpectedtxt">trunk/LayoutTests/storage/indexeddb/database-wrapper-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbdeleteinupgradeneededcloseinversionchangeexpectedtxt">trunk/LayoutTests/storage/indexeddb/delete-in-upgradeneeded-close-in-versionchange-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbdeletedatabasenotblockedexpectedtxt">trunk/LayoutTests/storage/indexeddb/deletedatabase-not-blocked-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbintversionupgradesexpectedtxt">trunk/LayoutTests/storage/indexeddb/intversion-upgrades-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbresourcesdeleteinupgradeneededcloseinversionchangejs">trunk/LayoutTests/storage/indexeddb/resources/delete-in-upgradeneeded-close-in-versionchange.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbresourcesdeletedatabasenotblockedjs">trunk/LayoutTests/storage/indexeddb/resources/deletedatabase-not-blocked.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbresourcessetversionnotblockedjs">trunk/LayoutTests/storage/indexeddb/resources/setversion-not-blocked.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbsetversionnotblockedexpectedtxt">trunk/LayoutTests/storage/indexeddb/setversion-not-blocked-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBFactoryImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBFactoryImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformwk2importedw3cindexeddbidbfactory_open12expectedtxt">trunk/LayoutTests/platform/wk2/imported/w3c/indexeddb/idbfactory_open12-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwk2importedw3cindexeddbidbversionchangeeventexpectedtxt">trunk/LayoutTests/platform/wk2/imported/w3c/indexeddb/idbversionchangeevent-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/LayoutTests/ChangeLog 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-01-08 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Blocked event can fire on a delete request even after the last open connection has closed.
+ https://bugs.webkit.org/show_bug.cgi?id=152896
+
+ Reviewed by Alex Christensen.
+
+ * platform/mac-wk1/TestExpectations:
+
+ * platform/wk2/imported/w3c/indexeddb/idbfactory_open12-expected.txt: Copied from LayoutTests/imported/w3c/indexeddb/idbfactory_open12-expected.txt.
+ * platform/wk2/imported/w3c/indexeddb/idbversionchangeevent-expected.txt: Copied from LayoutTests/imported/w3c/indexeddb/idbversionchangeevent-expected.txt.
+
+ * storage/indexeddb/database-wrapper-expected.txt:
+ * storage/indexeddb/delete-in-upgradeneeded-close-in-versionchange-expected.txt:
+ * storage/indexeddb/deletedatabase-not-blocked-expected.txt:
+ * storage/indexeddb/intversion-upgrades-expected.txt:
+ * storage/indexeddb/resources/delete-in-upgradeneeded-close-in-versionchange.js:
+ * storage/indexeddb/resources/deletedatabase-not-blocked.js:
+ * storage/indexeddb/resources/setversion-not-blocked.js:
+ * storage/indexeddb/setversion-not-blocked-expected.txt:
+
</ins><span class="cx"> 2016-01-08 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Several animation tests fail with accelerated compositing enabled
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-01-08 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: Blocked event can fire on a delete request even after the last open connection has closed.
+ https://bugs.webkit.org/show_bug.cgi?id=152896
+
+ Reviewed by Alex Christensen.
+
+ * indexeddb/idbfactory_open12-expected.txt:
+ * indexeddb/idbversionchangeevent-expected.txt:
+ * indexeddb/transaction-lifetime-expected.txt:
+
+2016-01-08 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: imported/w3c/indexeddb/idbobjectstore_createIndex6-event_order.htm fails.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152891
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cindexeddbidbfactory_open12expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/indexeddb/idbfactory_open12-expected.txt (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/indexeddb/idbfactory_open12-expected.txt 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/LayoutTests/imported/w3c/indexeddb/idbfactory_open12-expected.txt 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx">
</span><span class="cx"> PASS IDBFactory.open() - upgradeneeded gets VersionChangeEvent
</span><del>-FAIL IDBFactory.open() - upgradeneeded gets VersionChangeEvent - second upgrade assert_unreached: unexpected open.blocked event Reached unreachable code
</del><ins>+PASS IDBFactory.open() - upgradeneeded gets VersionChangeEvent - second upgrade
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cindexeddbidbversionchangeeventexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/indexeddb/idbversionchangeevent-expected.txt (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/indexeddb/idbversionchangeevent-expected.txt 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/LayoutTests/imported/w3c/indexeddb/idbversionchangeevent-expected.txt 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><span class="cx">
</span><del>-FAIL IDBVersionChangeEvent fired in upgradeneeded, versionchange and deleteDatabase assert_equals: new version (versionchange) expected (object) null but got (number) 0
</del><ins>+PASS IDBVersionChangeEvent fired in upgradeneeded, versionchange and deleteDatabase
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cindexeddbtransactionlifetimeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/indexeddb/transaction-lifetime-expected.txt (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/indexeddb/transaction-lifetime-expected.txt 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/LayoutTests/imported/w3c/indexeddb/transaction-lifetime-expected.txt 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><span class="cx">
</span><del>-FAIL Test events opening a second database when one connection is open already assert_unreached: open2.blocked Reached unreachable code
</del><ins>+PASS Test events opening a second database when one connection is open already
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -74,7 +74,6 @@
</span><span class="cx"> imported/w3c/indexeddb/keyorder.htm [ Skip ]
</span><span class="cx">
</span><span class="cx"> # W3C IDB tests - Legacy IDB fails, Modern IDB fails differently
</span><del>-imported/w3c/indexeddb/idbversionchangeevent.htm [ Failure ]
</del><span class="cx"> imported/w3c/indexeddb/keypath.htm [ Failure ]
</span><span class="cx">
</span><span class="cx"> # W3C IDB tests where the test is wrong (the spec, other browsers, and WebKit all agree)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwk2importedw3cindexeddbidbfactory_open12expectedtxtfromrev194780trunkLayoutTestsimportedw3cindexeddbidbfactory_open12expectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/wk2/imported/w3c/indexeddb/idbfactory_open12-expected.txt (from rev 194780, trunk/LayoutTests/imported/w3c/indexeddb/idbfactory_open12-expected.txt) (0 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/imported/w3c/indexeddb/idbfactory_open12-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/wk2/imported/w3c/indexeddb/idbfactory_open12-expected.txt 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+PASS IDBFactory.open() - upgradeneeded gets VersionChangeEvent
+FAIL IDBFactory.open() - upgradeneeded gets VersionChangeEvent - second upgrade assert_unreached: unexpected open.blocked event Reached unreachable code
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformwk2importedw3cindexeddbidbversionchangeeventexpectedtxtfromrev194780trunkLayoutTestsimportedw3cindexeddbidbversionchangeeventexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/wk2/imported/w3c/indexeddb/idbversionchangeevent-expected.txt (from rev 194780, trunk/LayoutTests/imported/w3c/indexeddb/idbversionchangeevent-expected.txt) (0 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/imported/w3c/indexeddb/idbversionchangeevent-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/wk2/imported/w3c/indexeddb/idbversionchangeevent-expected.txt 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+FAIL IDBVersionChangeEvent fired in upgradeneeded, versionchange and deleteDatabase assert_equals: new version (versionchange) expected (object) null but got (number) 0
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbdatabasewrapperexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/database-wrapper-expected.txt (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/database-wrapper-expected.txt 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/LayoutTests/storage/indexeddb/database-wrapper-expected.txt 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -27,9 +27,6 @@
</span><span class="cx"> event.target.close()
</span><span class="cx"> sawVersionChangeEvent = true
</span><span class="cx">
</span><del>-onBlocked():
-FIXME: Blocked event shouldn't fire. http://crbug.com/100123
-
</del><span class="cx"> openAgainSuccess():
</span><span class="cx"> PASS sawVersionChangeEvent is true
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbdeleteinupgradeneededcloseinversionchangeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/delete-in-upgradeneeded-close-in-versionchange-expected.txt (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/delete-in-upgradeneeded-close-in-versionchange-expected.txt 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/LayoutTests/storage/indexeddb/delete-in-upgradeneeded-close-in-versionchange-expected.txt 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -27,14 +27,9 @@
</span><span class="cx"> Closing the connection before the IDBOpenDBRequest's success fires will cause the open to fail.
</span><span class="cx"> db.close()
</span><span class="cx">
</span><del>-deleteBlockedCallback():
-PASS sawVersionChange is true
-sawDeleteBlocked = true
-
</del><span class="cx"> deleteSuccessCallback():
</span><span class="cx"> PASS sawVersionChange is true
</span><del>-FIXME: Blocked events shouldn't fire if connections close in versionchange handler. http://crbug.com/100123
-FAIL sawDeleteBlocked should be false. Was true.
</del><ins>+PASS sawDeleteBlocked is false
</ins><span class="cx"> PASS sawUpgradeNeeded is true
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbdeletedatabasenotblockedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/deletedatabase-not-blocked-expected.txt (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/deletedatabase-not-blocked-expected.txt 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/LayoutTests/storage/indexeddb/deletedatabase-not-blocked-expected.txt 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -19,12 +19,8 @@
</span><span class="cx"> PASS event.newVersion is null
</span><span class="cx"> h.close()
</span><span class="cx">
</span><del>-deleteDatabaseOnBlocked():
-blockedEventFired = true
-
</del><span class="cx"> deleteDatabaseOnSuccess():
</span><del>-FIXME: blocked event should not fire since connection closed. http://webkit.org/b/71130
-FAIL blockedEventFired should be false. Was true.
</del><ins>+PASS blockedEventFired is false
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbintversionupgradesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/intversion-upgrades-expected.txt (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/intversion-upgrades-expected.txt 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/LayoutTests/storage/indexeddb/intversion-upgrades-expected.txt 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -23,9 +23,6 @@
</span><span class="cx"> connection1VersionChangeCallback():
</span><span class="cx"> connection1.close()
</span><span class="cx">
</span><del>-connection2BlockedCallback():
-This should not be called: http://crbug.com/100123
-
</del><span class="cx"> connection2UpgradeNeeded():
</span><span class="cx"> connection2 = event.target.result
</span><span class="cx"> PASS String(connection2) is "[object IDBDatabase]"
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbresourcesdeleteinupgradeneededcloseinversionchangejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/resources/delete-in-upgradeneeded-close-in-versionchange.js (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/resources/delete-in-upgradeneeded-close-in-versionchange.js 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/LayoutTests/storage/indexeddb/resources/delete-in-upgradeneeded-close-in-versionchange.js 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> {
</span><span class="cx"> preamble(evt);
</span><span class="cx"> shouldBeTrue("sawVersionChange");
</span><del>- debug("FIXME: Blocked events shouldn't fire if connections close in versionchange handler. http://crbug.com/100123");
</del><span class="cx"> shouldBeFalse("sawDeleteBlocked");
</span><span class="cx"> shouldBeTrue("sawUpgradeNeeded");
</span><span class="cx"> finishJSTest();
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbresourcesdeletedatabasenotblockedjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/resources/deletedatabase-not-blocked.js (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/resources/deletedatabase-not-blocked.js 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/LayoutTests/storage/indexeddb/resources/deletedatabase-not-blocked.js 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> };
</span><span class="cx"> request.onsuccess = function deleteDatabaseOnSuccess(evt) {
</span><span class="cx"> preamble(evt);
</span><del>- debug("FIXME: blocked event should not fire since connection closed. http://webkit.org/b/71130");
</del><span class="cx"> shouldBeFalse("blockedEventFired");
</span><span class="cx"> finishJSTest();
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbresourcessetversionnotblockedjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/resources/setversion-not-blocked.js (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/resources/setversion-not-blocked.js 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/LayoutTests/storage/indexeddb/resources/setversion-not-blocked.js 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> request.onsuccess = function h2OpenSuccess(evt) {
</span><span class="cx"> preamble(evt);
</span><span class="cx"> shouldBeTrue("versionchangeEventFired");
</span><del>- debug("FIXME: blocked should not have fired since connection closed; http://webkit.org/b/71130");
</del><span class="cx"> shouldBeFalse("blockedEventFired");
</span><span class="cx"> finishJSTest();
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbsetversionnotblockedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/setversion-not-blocked-expected.txt (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/setversion-not-blocked-expected.txt 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/LayoutTests/storage/indexeddb/setversion-not-blocked-expected.txt 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -22,19 +22,13 @@
</span><span class="cx"> PASS event.newVersion is 2
</span><span class="cx"> h1.close()
</span><span class="cx">
</span><del>-h2OpenBlocked():
-PASS event.oldVersion is 1
-PASS event.newVersion is 2
-blockedEventFired = true
-
</del><span class="cx"> h2UpgradeNeeded():
</span><span class="cx"> PASS event.oldVersion is 1
</span><span class="cx"> PASS event.newVersion is 2
</span><span class="cx">
</span><span class="cx"> h2OpenSuccess():
</span><span class="cx"> PASS versionchangeEventFired is true
</span><del>-FIXME: blocked should not have fired since connection closed; http://webkit.org/b/71130
-FAIL blockedEventFired should be false. Was true.
</del><ins>+PASS blockedEventFired is false
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/Source/WebCore/ChangeLog 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-01-08 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Blocked event can fire on a delete request even after the last open connection has closed.
+ https://bugs.webkit.org/show_bug.cgi?id=152896
+
+ Reviewed by Alex Christensen.
+
+ No new tests (Progression in many tests).
+
+ * Modules/indexeddb/client/IDBFactoryImpl.cpp:
+ (WebCore::IDBClient::IDBFactory::deleteDatabase):
+
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::performCurrentDeleteOperation): Allow for handling 2+ delete operations in a row.
+ (WebCore::IDBServer::UniqueIDBDatabase::didDeleteBackingStore): Ditto.
+ (WebCore::IDBServer::UniqueIDBDatabase::connectionClosedFromClient): Call "notifyCurrentRequestConnectionClosedOrFiredVersionChangeEvent"
+ after the connection is actually removed from the set of open connections.
+ * Modules/indexeddb/server/UniqueIDBDatabase.h:
+
</ins><span class="cx"> 2016-01-08 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Hovering link on http://help.apple.com/appletv/#/ does not show text underline.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBFactoryImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBFactoryImpl.cpp (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBFactoryImpl.cpp 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBFactoryImpl.cpp 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCore::IDBOpenDBRequest> IDBFactory::deleteDatabase(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- LOG(IndexedDB, "IDBFactory::deleteDatabase");
</del><ins>+ LOG(IndexedDB, "IDBFactory::deleteDatabase - %s", name.utf8().data());
</ins><span class="cx">
</span><span class="cx"> if (name.isNull()) {
</span><span class="cx"> ec = TypeError;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -164,9 +164,8 @@
</span><span class="cx"> void UniqueIDBDatabase::performCurrentDeleteOperation()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- LOG(IndexedDB, "(main) UniqueIDBDatabase::performCurrentDeleteOperation");
</del><ins>+ LOG(IndexedDB, "(main) UniqueIDBDatabase::performCurrentDeleteOperation - %s", m_identifier.debugString().utf8().data());
</ins><span class="cx">
</span><del>- ASSERT(m_databaseInfo);
</del><span class="cx"> ASSERT(m_currentOpenDBRequest);
</span><span class="cx"> ASSERT(m_currentOpenDBRequest->isDeleteRequest());
</span><span class="cx">
</span><span class="lines">@@ -189,8 +188,17 @@
</span><span class="cx"> ASSERT(m_pendingTransactions.isEmpty());
</span><span class="cx"> ASSERT(m_openDatabaseConnections.isEmpty());
</span><span class="cx">
</span><del>- m_deleteBackingStoreInProgress = true;
- m_server.postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::deleteBackingStore));
</del><ins>+ // It's possible to have multiple delete requests queued up in a row.
+ // In that scenario only the first request will actually have to delete the database.
+ // Subsequent requests can immediately notify their completion.
+
+ if (m_databaseInfo) {
+ m_deleteBackingStoreInProgress = true;
+ m_server.postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::deleteBackingStore));
+ } else {
+ ASSERT(m_mostRecentDeletedDatabaseInfo);
+ didDeleteBackingStore();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::deleteBackingStore()
</span><span class="lines">@@ -211,7 +219,6 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> LOG(IndexedDB, "(main) UniqueIDBDatabase::didDeleteBackingStore");
</span><span class="cx">
</span><del>- ASSERT(m_databaseInfo);
</del><span class="cx"> ASSERT(m_currentOpenDBRequest);
</span><span class="cx"> ASSERT(m_currentOpenDBRequest->isDeleteRequest());
</span><span class="cx"> ASSERT(!hasAnyPendingCallbacks());
</span><span class="lines">@@ -219,9 +226,13 @@
</span><span class="cx"> ASSERT(m_pendingTransactions.isEmpty());
</span><span class="cx"> ASSERT(m_openDatabaseConnections.isEmpty());
</span><span class="cx">
</span><del>- m_currentOpenDBRequest->notifyDidDeleteDatabase(*m_databaseInfo);
</del><ins>+ if (m_databaseInfo)
+ m_mostRecentDeletedDatabaseInfo = WTFMove(m_databaseInfo);
+
+ ASSERT(m_mostRecentDeletedDatabaseInfo);
+ m_currentOpenDBRequest->notifyDidDeleteDatabase(*m_mostRecentDeletedDatabaseInfo);
</ins><span class="cx"> m_currentOpenDBRequest = nullptr;
</span><del>- m_databaseInfo = nullptr;
</del><ins>+
</ins><span class="cx"> m_deletePending = false;
</span><span class="cx"> m_deleteBackingStoreInProgress = false;
</span><span class="cx">
</span><span class="lines">@@ -1007,9 +1018,6 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_openDatabaseConnections.contains(&connection));
</span><span class="cx">
</span><del>- if (m_currentOpenDBRequest)
- notifyCurrentRequestConnectionClosedOrFiredVersionChangeEvent(connection.identifier());
-
</del><span class="cx"> Deque<RefPtr<UniqueIDBDatabaseTransaction>> pendingTransactions;
</span><span class="cx"> while (!m_pendingTransactions.isEmpty()) {
</span><span class="cx"> auto transaction = m_pendingTransactions.takeFirst();
</span><span class="lines">@@ -1022,6 +1030,10 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<UniqueIDBDatabaseConnection> refConnection(&connection);
</span><span class="cx"> m_openDatabaseConnections.remove(&connection);
</span><ins>+
+ if (m_currentOpenDBRequest)
+ notifyCurrentRequestConnectionClosedOrFiredVersionChangeEvent(connection.identifier());
+
</ins><span class="cx"> if (connection.hasNonFinishedTransactions()) {
</span><span class="cx"> m_closePendingDatabaseConnections.add(WTFMove(refConnection));
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h (194780 => 194781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2016-01-08 21:01:26 UTC (rev 194780)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2016-01-08 21:12:08 UTC (rev 194781)
</span><span class="lines">@@ -193,6 +193,7 @@
</span><span class="cx"> bool m_isOpeningBackingStore { false };
</span><span class="cx"> std::unique_ptr<IDBBackingStore> m_backingStore;
</span><span class="cx"> std::unique_ptr<IDBDatabaseInfo> m_databaseInfo;
</span><ins>+ std::unique_ptr<IDBDatabaseInfo> m_mostRecentDeletedDatabaseInfo;
</ins><span class="cx">
</span><span class="cx"> HashMap<uint64_t, ErrorCallback> m_errorCallbacks;
</span><span class="cx"> HashMap<uint64_t, KeyDataCallback> m_keyDataCallbacks;
</span></span></pre>
</div>
</div>
</body>
</html>