<!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>[194275] 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/194275">194275</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-18 10:31:34 -0800 (Fri, 18 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Refactor when opening the backing store takes place.
https://bugs.webkit.org/show_bug.cgi?id=152405
Reviewed by Alex Christensen.
Source/WebCore:
No new tests (At least one failing test now passes).
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::openDatabaseConnection): Move the "open backing store" logic
from here to performCurrentOpenOperation.
(WebCore::IDBServer::UniqueIDBDatabase::performCurrentOpenOperation): If the database backing store is
not open yet, kick off opening it here.
(WebCore::IDBServer::UniqueIDBDatabase::handleDatabaseOperations): Rework this stuff to be better.
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="#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 (194274 => 194275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-18 18:19:46 UTC (rev 194274)
+++ trunk/LayoutTests/ChangeLog 2015-12-18 18:31:34 UTC (rev 194275)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-12-18 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Refactor when opening the backing store takes place.
+ https://bugs.webkit.org/show_bug.cgi?id=152405
+
+ Reviewed by Alex Christensen.
+
+ * platform/mac-wk1/TestExpectations:
+
</ins><span class="cx"> 2015-12-18 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Unreviewed gardening
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (194274 => 194275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-18 18:19:46 UTC (rev 194274)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-18 18:31:34 UTC (rev 194275)
</span><span class="lines">@@ -99,7 +99,6 @@
</span><span class="cx"> storage/indexeddb/intversion-two-opens-no-versions.html [ Failure ]
</span><span class="cx"> storage/indexeddb/odd-strings.html [ Failure ]
</span><span class="cx"> storage/indexeddb/open-db-private-browsing.html [ Failure ]
</span><del>-storage/indexeddb/open-ordering.html [ Failure ]
</del><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 class="cx"> storage/indexeddb/transaction-basics.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194274 => 194275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-18 18:19:46 UTC (rev 194274)
+++ trunk/Source/WebCore/ChangeLog 2015-12-18 18:31:34 UTC (rev 194275)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-12-18 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Refactor when opening the backing store takes place.
+ https://bugs.webkit.org/show_bug.cgi?id=152405
+
+ Reviewed by Alex Christensen.
+
+ No new tests (At least one failing test now passes).
+
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::openDatabaseConnection): Move the "open backing store" logic
+ from here to performCurrentOpenOperation.
+ (WebCore::IDBServer::UniqueIDBDatabase::performCurrentOpenOperation): If the database backing store is
+ not open yet, kick off opening it here.
+ (WebCore::IDBServer::UniqueIDBDatabase::handleDatabaseOperations): Rework this stuff to be better.
+
</ins><span class="cx"> 2015-12-17 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Refactor open/delete requests to exist in the same queue.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (194274 => 194275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2015-12-18 18:19:46 UTC (rev 194274)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2015-12-18 18:31:34 UTC (rev 194275)
</span><span class="lines">@@ -75,13 +75,7 @@
</span><span class="cx"> if (m_isOpeningBackingStore)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_databaseInfo) {
- handleDatabaseOperations();
- return;
- }
-
- m_isOpeningBackingStore = true;
- m_server.postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::openBackingStore, m_identifier));
</del><ins>+ handleDatabaseOperations();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabase::hasAnyPendingCallbacks() const
</span><span class="lines">@@ -109,6 +103,12 @@
</span><span class="cx"> ASSERT(m_currentOperation);
</span><span class="cx"> ASSERT(m_currentOperation->isOpenRequest());
</span><span class="cx">
</span><ins>+ if (!m_databaseInfo) {
+ m_isOpeningBackingStore = true;
+ m_server.postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::openBackingStore, m_identifier));
+ return;
+ }
+
</ins><span class="cx"> // If we previously started a version change operation but were blocked by having open connections,
</span><span class="cx"> // we might now be unblocked.
</span><span class="cx"> if (m_versionChangeDatabaseConnection) {
</span><span class="lines">@@ -206,18 +206,24 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> LOG(IndexedDB, "(main) UniqueIDBDatabase::handleDatabaseOperations - There are %zu pending", m_pendingDatabaseOperations.size());
</span><span class="cx">
</span><del>- if (m_pendingDatabaseOperations.isEmpty())
- return;
-
</del><span class="cx"> if (m_versionChangeDatabaseConnection || m_currentOperation) {
</span><span class="cx"> // We can't start the next database operation quite yet, but we might need to notify all open connections
</span><span class="cx"> // about a pending delete.
</span><del>- if (m_pendingDatabaseOperations.first()->isDeleteRequest() && !m_hasNotifiedConnectionsOfDelete) {
</del><ins>+ if (!m_pendingDatabaseOperations.isEmpty() && m_pendingDatabaseOperations.first()->isDeleteRequest() && !m_hasNotifiedConnectionsOfDelete) {
</ins><span class="cx"> m_hasNotifiedConnectionsOfDelete = true;
</span><span class="cx"> notifyConnectionsOfVersionChange(0);
</span><span class="cx"> }
</span><ins>+
+ // Some operations (such as the first open operation after a delete) require multiple passes to completely handle
+ if (m_currentOperation)
+ handleCurrentOperation();
+
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (m_pendingDatabaseOperations.isEmpty())
+ return;
+
</ins><span class="cx"> m_currentOperation = m_pendingDatabaseOperations.takeFirst();
</span><span class="cx"> LOG(IndexedDB, "UniqueIDBDatabase::handleDatabaseOperations - Popped an operation, now there are %zu pending", m_pendingDatabaseOperations.size());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>