<!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>[194671] 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/194671">194671</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-06 14:34:58 -0800 (Wed, 06 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Modern IDB: storage/indexeddb/odd-strings.html is flaky.
https://bugs.webkit.org/show_bug.cgi?id=152800

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (Existing flaky test is now rock solid and unskipped).

* Modules/indexeddb/client/IDBDatabaseImpl.cpp:
(WebCore::IDBClient::IDBDatabase::IDBDatabase):
(WebCore::IDBClient::IDBDatabase::maybeCloseInServer): Only refuse to close in the server if there
  are active transactions. In the case of page navigation where stop() has been called on active DOM objects,
  there will never be any active transactions.

* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::commitTransaction):

LayoutTests:

* platform/mac-wk1/TestExpectations:</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="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194670 => 194671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-01-06 22:21:47 UTC (rev 194670)
+++ trunk/LayoutTests/ChangeLog        2016-01-06 22:34:58 UTC (rev 194671)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2016-01-06  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Modern IDB: storage/indexeddb/odd-strings.html is flaky.
+        https://bugs.webkit.org/show_bug.cgi?id=152800
+
+        Reviewed by Alex Christensen.
+
+        * platform/mac-wk1/TestExpectations:
+
+2016-01-06  Brady Eidson  &lt;beidson@apple.com&gt;
+
</ins><span class="cx">         Modern IDB: storage/indexeddb/intversion-gated-on-delete.html is flaky.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=152795
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (194670 => 194671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations        2016-01-06 22:21:47 UTC (rev 194670)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations        2016-01-06 22:34:58 UTC (rev 194671)
</span><span class="lines">@@ -84,7 +84,6 @@
</span><span class="cx"> # IDB tests with other text failures
</span><span class="cx"> fast/history/page-cache-indexed-closed-db.html [ Failure ]
</span><span class="cx"> storage/indexeddb/intversion-long-queue.html [ Failure ]
</span><del>-storage/indexeddb/odd-strings.html [ Failure ]
</del><span class="cx"> storage/indexeddb/open-db-private-browsing.html [ Failure ]
</span><span class="cx"> storage/indexeddb/properties-disabled-at-runtime.html [ Failure ]
</span><span class="cx"> storage/indexeddb/setversion-blocked-by-versionchange-close.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194670 => 194671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-01-06 22:21:47 UTC (rev 194670)
+++ trunk/Source/WebCore/ChangeLog        2016-01-06 22:34:58 UTC (rev 194671)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-01-06  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Modern IDB: storage/indexeddb/odd-strings.html is flaky.
+        https://bugs.webkit.org/show_bug.cgi?id=152800
+
+        Reviewed by Alex Christensen.
+
+        No new tests (Existing flaky test is now rock solid and unskipped).
+
+        * Modules/indexeddb/client/IDBDatabaseImpl.cpp:
+        (WebCore::IDBClient::IDBDatabase::IDBDatabase):
+        (WebCore::IDBClient::IDBDatabase::maybeCloseInServer): Only refuse to close in the server if there
+          are active transactions. In the case of page navigation where stop() has been called on active DOM objects,
+          there will never be any active transactions.
+        
+        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabase::commitTransaction):
+
+2016-01-06  Brady Eidson  &lt;beidson@apple.com&gt;
+
</ins><span class="cx">         Modern IDB: storage/indexeddb/intversion-gated-on-delete.html is flaky.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=152795
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp (194670 => 194671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp        2016-01-06 22:21:47 UTC (rev 194670)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp        2016-01-06 22:34:58 UTC (rev 194671)
</span><span class="lines">@@ -52,7 +52,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, &quot;IDBDatabase::IDBDatabase - Creating database %s with version %&quot; PRIu64, m_info.name().utf8().data(), m_info.version());
</del><ins>+    LOG(IndexedDB, &quot;IDBDatabase::IDBDatabase - Creating database %s with version %&quot; PRIu64 &quot; connection %&quot; PRIu64, m_info.name().utf8().data(), m_info.version(), m_databaseConnectionIdentifier);
</ins><span class="cx">     suspendIfNeeded();
</span><span class="cx">     relaxAdoptionRequirement();
</span><span class="cx">     m_serverConnection-&gt;registerDatabaseConnection(*this);
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx">     // 3.3.9 Database closing steps
</span><span class="cx">     // Wait for all transactions created using this connection to complete.
</span><span class="cx">     // Once they are complete, this connection is closed.
</span><del>-    if (!m_activeTransactions.isEmpty() || !m_committingTransactions.isEmpty())
</del><ins>+    if (!m_activeTransactions.isEmpty())
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     m_closedInServer = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (194670 => 194671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp        2016-01-06 22:21:47 UTC (rev 194670)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp        2016-01-06 22:34:58 UTC (rev 194671)
</span><span class="lines">@@ -912,7 +912,7 @@
</span><span class="cx">     ASSERT(&amp;transaction.databaseConnection().database() == this);
</span><span class="cx"> 
</span><span class="cx">     if (m_versionChangeTransaction == &amp;transaction) {
</span><del>-        ASSERT(&amp;m_versionChangeTransaction-&gt;databaseConnection() == m_versionChangeDatabaseConnection);
</del><ins>+        ASSERT(!m_versionChangeDatabaseConnection || &amp;m_versionChangeTransaction-&gt;databaseConnection() == m_versionChangeDatabaseConnection);
</ins><span class="cx">         ASSERT(m_databaseInfo-&gt;version() == transaction.info().newVersion());
</span><span class="cx"> 
</span><span class="cx">         invokeOperationAndTransactionTimer();
</span></span></pre>
</div>
</div>

</body>
</html>