<!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>[202935] 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/202935">202935</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-07-07 14:49:41 -0700 (Thu, 07 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: When IDBDatabase objects are garbage collected, they don't close their server connection.
<rdar://problem/25910345> and https://bugs.webkit.org/show_bug.cgi?id=159523
Reviewed by Alex Christensen.
Source/WebCore:
Tests: storage/indexeddb/modern/gc-closes-database-private.html
storage/indexeddb/modern/gc-closes-database.html
* Modules/indexeddb/IDBDatabase.cpp:
(WebCore::IDBDatabase::IDBDatabase): New logging.
(WebCore::IDBDatabase::~IDBDatabase): Close server connection.
(WebCore::IDBDatabase::fireVersionChangeEvent): New logging.
(WebCore::IDBDatabase::dispatchEvent): New logging.
* Modules/indexeddb/client/IDBConnectionToServer.cpp:
(WebCore::IDBClient::IDBConnectionToServer::openDatabase): New logging.
LayoutTests:
* storage/indexeddb/modern/gc-closes-database-expected.txt: Added.
* storage/indexeddb/modern/gc-closes-database-private-expected.txt: Added.
* storage/indexeddb/modern/gc-closes-database-private.html: Added.
* storage/indexeddb/modern/gc-closes-database.html: Added.
* storage/indexeddb/modern/resources/gc-closes-database.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServercpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderngcclosesdatabaseexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderngcclosesdatabaseprivateexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database-private-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderngcclosesdatabaseprivatehtml">trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database-private.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderngcclosesdatabasehtml">trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesgcclosesdatabasejs">trunk/LayoutTests/storage/indexeddb/modern/resources/gc-closes-database.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202934 => 202935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-07 21:48:12 UTC (rev 202934)
+++ trunk/LayoutTests/ChangeLog 2016-07-07 21:49:41 UTC (rev 202935)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-07-07 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: When IDBDatabase objects are garbage collected, they don't close their server connection.
+ <rdar://problem/25910345> and https://bugs.webkit.org/show_bug.cgi?id=159523
+
+ Reviewed by Alex Christensen.
+
+ * storage/indexeddb/modern/gc-closes-database-expected.txt: Added.
+ * storage/indexeddb/modern/gc-closes-database-private-expected.txt: Added.
+ * storage/indexeddb/modern/gc-closes-database-private.html: Added.
+ * storage/indexeddb/modern/gc-closes-database.html: Added.
+ * storage/indexeddb/modern/resources/gc-closes-database.js: Added.
+
</ins><span class="cx"> 2016-07-07 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> Refactor layout functions to avoid using flexbox in MathML
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderngcclosesdatabaseexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database-expected.txt (0 => 202935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database-expected.txt 2016-07-07 21:49:41 UTC (rev 202935)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+This tests that when IDBDatabase objects are destroyed in garbage collection that their database handles are closed.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Database deleted
+Creating the default database
+Database upgraded to version 1
+Database created
+Huge upgrade open success
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderngcclosesdatabaseprivateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database-private-expected.txt (0 => 202935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database-private-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database-private-expected.txt 2016-07-07 21:49:41 UTC (rev 202935)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+This tests that when IDBDatabase objects are destroyed in garbage collection that their database handles are closed.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Database deleted
+Creating the default database
+Database upgraded to version 1
+Database created
+Huge upgrade open success
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderngcclosesdatabaseprivatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database-private.html (0 => 202935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database-private.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database-private.html 2016-07-07 21:49:41 UTC (rev 202935)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/gc-closes-database.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderngcclosesdatabasehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database.html (0 => 202935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/gc-closes-database.html 2016-07-07 21:49:41 UTC (rev 202935)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/gc-closes-database.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesgcclosesdatabasejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/resources/gc-closes-database.js (0 => 202935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/gc-closes-database.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/gc-closes-database.js 2016-07-07 21:49:41 UTC (rev 202935)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+description("This tests that when IDBDatabase objects are destroyed in garbage collection that their database handles are closed.");
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(msg)
+{
+ debug(msg);
+}
+
+var databaseName;
+
+
+deleteRequest = indexedDB.deleteDatabase("gc-closes-database");
+deleteRequest.onsuccess = function() {
+ log("Database deleted");
+ continueTest();
+}
+
+deleteRequest.onerror = function() {
+ log("Error deleting database");
+ done();
+}
+
+function continueTest()
+{
+ log("Creating the default database");
+ var openRequest = indexedDB.open("gc-closes-database");
+
+ openRequest.onupgradeneeded = function(e) {
+ log("Database upgraded to version 1");
+ }
+
+ openRequest.onsuccess = function(e) {
+ log("Database created");
+ setTimeout(window.gc, 0);
+ }
+
+ openRequest.onerror = function() {
+ log("Error opening database");
+ done();
+ }
+
+ hugeUpgradeOpen = indexedDB.open("gc-closes-database", 928375298375);
+ hugeUpgradeOpen.onsuccess = function(e) {
+ log("Huge upgrade open success");
+ done();
+ }
+ hugeUpgradeOpen.onerror = function() {
+ log("Unexpected error");
+ done();
+ }
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202934 => 202935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-07 21:48:12 UTC (rev 202934)
+++ trunk/Source/WebCore/ChangeLog 2016-07-07 21:49:41 UTC (rev 202935)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-07-07 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: When IDBDatabase objects are garbage collected, they don't close their server connection.
+ <rdar://problem/25910345> and https://bugs.webkit.org/show_bug.cgi?id=159523
+
+ Reviewed by Alex Christensen.
+
+ Tests: storage/indexeddb/modern/gc-closes-database-private.html
+ storage/indexeddb/modern/gc-closes-database.html
+
+ * Modules/indexeddb/IDBDatabase.cpp:
+ (WebCore::IDBDatabase::IDBDatabase): New logging.
+ (WebCore::IDBDatabase::~IDBDatabase): Close server connection.
+ (WebCore::IDBDatabase::fireVersionChangeEvent): New logging.
+ (WebCore::IDBDatabase::dispatchEvent): New logging.
+
+ * Modules/indexeddb/client/IDBConnectionToServer.cpp:
+ (WebCore::IDBClient::IDBConnectionToServer::openDatabase): New logging.
+
</ins><span class="cx"> 2016-07-07 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> Refactor layout functions to avoid using flexbox in MathML
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (202934 => 202935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-07-07 21:48:12 UTC (rev 202934)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-07-07 21:49:41 UTC (rev 202935)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> , m_info(resultData.databaseInfo())
</span><span class="cx"> , m_databaseConnectionIdentifier(resultData.databaseConnectionIdentifier())
</span><span class="cx"> {
</span><del>- LOG(IndexedDB, "IDBDatabase::IDBDatabase - Creating database %s with version %" PRIu64 " connection %" PRIu64, m_info.name().utf8().data(), m_info.version(), m_databaseConnectionIdentifier);
</del><ins>+ LOG(IndexedDB, "IDBDatabase::IDBDatabase - Creating database %s with version %" PRIu64 " connection %" PRIu64 " (%p)", m_info.name().utf8().data(), m_info.version(), m_databaseConnectionIdentifier, this);
</ins><span class="cx"> suspendIfNeeded();
</span><span class="cx"> m_connectionProxy->registerDatabaseConnection(*this);
</span><span class="cx"> }
</span><span class="lines">@@ -63,6 +63,10 @@
</span><span class="cx"> IDBDatabase::~IDBDatabase()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(currentThread() == originThreadID());
</span><ins>+
+ if (!m_closedInServer)
+ m_connectionProxy->databaseConnectionClosed(*this);
+
</ins><span class="cx"> m_connectionProxy->unregisterDatabaseConnection(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -460,7 +464,7 @@
</span><span class="cx"> void IDBDatabase::fireVersionChangeEvent(const IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion)
</span><span class="cx"> {
</span><span class="cx"> uint64_t currentVersion = m_info.version();
</span><del>- LOG(IndexedDB, "IDBDatabase::fireVersionChangeEvent - current version %" PRIu64 ", requested version %" PRIu64 ", connection %" PRIu64, currentVersion, requestedVersion, m_databaseConnectionIdentifier);
</del><ins>+ LOG(IndexedDB, "IDBDatabase::fireVersionChangeEvent - current version %" PRIu64 ", requested version %" PRIu64 ", connection %" PRIu64 " (%p)", currentVersion, requestedVersion, m_databaseConnectionIdentifier, this);
</ins><span class="cx">
</span><span class="cx"> ASSERT(currentThread() == originThreadID());
</span><span class="cx">
</span><span class="lines">@@ -476,7 +480,7 @@
</span><span class="cx">
</span><span class="cx"> bool IDBDatabase::dispatchEvent(Event& event)
</span><span class="cx"> {
</span><del>- LOG(IndexedDB, "IDBDatabase::dispatchEvent (%" PRIu64 ")", m_databaseConnectionIdentifier);
</del><ins>+ LOG(IndexedDB, "IDBDatabase::dispatchEvent (%" PRIu64 ") (%p)", m_databaseConnectionIdentifier, this);
</ins><span class="cx"> ASSERT(currentThread() == originThreadID());
</span><span class="cx">
</span><span class="cx"> bool result = EventTargetWithInlineData::dispatchEvent(event);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp (202934 => 202935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2016-07-07 21:48:12 UTC (rev 202934)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2016-07-07 21:49:41 UTC (rev 202935)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::openDatabase(const IDBRequestData& request)
</span><span class="cx"> {
</span><del>- LOG(IndexedDB, "IDBConnectionToServer::openDatabase - %s (%" PRIu64 ")", request.databaseIdentifier().debugString().utf8().data(), request.requestedVersion());
</del><ins>+ LOG(IndexedDB, "IDBConnectionToServer::openDatabase - %s (%s) (%" PRIu64 ")", request.databaseIdentifier().debugString().utf8().data(), request.requestIdentifier().loggingString().utf8().data(), request.requestedVersion());
</ins><span class="cx"> m_delegate->openDatabase(request);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>