<!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>[194173] trunk/Source/WebCore</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/194173">194173</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-16 13:52:11 -0800 (Wed, 16 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Refactor UniqueIDBDatabase in preparation for consolidation open and delete requests.
https://bugs.webkit.org/show_bug.cgi?id=152355
Reviewed by Alex Christensen.
No new tests (Refactor, existing tests pass).
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::openDatabaseConnection):
(WebCore::IDBServer::UniqueIDBDatabase::performCurrentOpenOperation):
(WebCore::IDBServer::UniqueIDBDatabase::performCurrentDeleteOperation):
(WebCore::IDBServer::UniqueIDBDatabase::handleDatabaseOperations):
(WebCore::IDBServer::UniqueIDBDatabase::didOpenBackingStore):
(WebCore::IDBServer::UniqueIDBDatabase::operationAndTransactionTimerFired):
(WebCore::IDBServer::UniqueIDBDatabase::handleOpenDatabaseOperations): Deleted.
* Modules/indexeddb/server/UniqueIDBDatabase.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194172 => 194173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-16 21:50:09 UTC (rev 194172)
+++ trunk/Source/WebCore/ChangeLog 2015-12-16 21:52:11 UTC (rev 194173)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-12-16 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: Refactor UniqueIDBDatabase in preparation for consolidation open and delete requests.
+ https://bugs.webkit.org/show_bug.cgi?id=152355
+
+ Reviewed by Alex Christensen.
+
+ No new tests (Refactor, existing tests pass).
+
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::openDatabaseConnection):
+ (WebCore::IDBServer::UniqueIDBDatabase::performCurrentOpenOperation):
+ (WebCore::IDBServer::UniqueIDBDatabase::performCurrentDeleteOperation):
+ (WebCore::IDBServer::UniqueIDBDatabase::handleDatabaseOperations):
+ (WebCore::IDBServer::UniqueIDBDatabase::didOpenBackingStore):
+ (WebCore::IDBServer::UniqueIDBDatabase::operationAndTransactionTimerFired):
+ (WebCore::IDBServer::UniqueIDBDatabase::handleOpenDatabaseOperations): Deleted.
+ * Modules/indexeddb/server/UniqueIDBDatabase.h:
+
+2015-12-16 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: Have IDBServerOperations know whether they represent an open or delete request.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152351
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (194172 => 194173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2015-12-16 21:50:09 UTC (rev 194172)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2015-12-16 21:52:11 UTC (rev 194173)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_databaseInfo) {
</span><del>- handleOpenDatabaseOperations();
</del><ins>+ handleDatabaseOperations();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -118,51 +118,44 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::handleOpenDatabaseOperations()
</del><ins>+void UniqueIDBDatabase::performCurrentOpenOperation()
</ins><span class="cx"> {
</span><del>- ASSERT(isMainThread());
- LOG(IndexedDB, "(main) UniqueIDBDatabase::handleOpenDatabaseOperations");
</del><ins>+ LOG(IndexedDB, "(main) UniqueIDBDatabase::performCurrentOpenOperation");
</ins><span class="cx">
</span><del>- // If a version change transaction is currently in progress, no new connections can be opened right now.
- // We will try again later.
- if (m_versionChangeDatabaseConnection)
- return;
</del><ins>+ ASSERT(m_currentOperation);
+ ASSERT(m_currentOperation->isOpenRequest());
</ins><span class="cx">
</span><del>- if (m_pendingOpenDatabaseOperations.isEmpty())
- return;
-
- auto operation = m_pendingOpenDatabaseOperations.takeFirst();
-
</del><span class="cx"> // 3.3.1 Opening a database
</span><span class="cx"> // If requested version is undefined, then let requested version be 1 if db was created in the previous step,
</span><span class="cx"> // or the current version of db otherwise.
</span><del>- uint64_t requestedVersion = operation->requestData().requestedVersion();
</del><ins>+ uint64_t requestedVersion = m_currentOperation->requestData().requestedVersion();
</ins><span class="cx"> if (!requestedVersion)
</span><span class="cx"> requestedVersion = m_databaseInfo->version() ? m_databaseInfo->version() : 1;
</span><span class="cx">
</span><span class="cx"> // 3.3.1 Opening a database
</span><span class="cx"> // If the database version higher than the requested version, abort these steps and return a VersionError.
</span><span class="cx"> if (requestedVersion < m_databaseInfo->version()) {
</span><del>- auto result = IDBResultData::error(operation->requestData().requestIdentifier(), IDBError(IDBDatabaseException::VersionError));
- operation->connection().didOpenDatabase(result);
</del><ins>+ auto result = IDBResultData::error(m_currentOperation->requestData().requestIdentifier(), IDBError(IDBDatabaseException::VersionError));
+ m_currentOperation->connection().didOpenDatabase(result);
+ m_currentOperation = nullptr;
+
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<UniqueIDBDatabaseConnection> connection = UniqueIDBDatabaseConnection::create(*this, operation->connection());
</del><ins>+ Ref<UniqueIDBDatabaseConnection> connection = UniqueIDBDatabaseConnection::create(*this, m_currentOperation->connection());
</ins><span class="cx"> UniqueIDBDatabaseConnection* rawConnection = &connection.get();
</span><span class="cx">
</span><span class="cx"> if (requestedVersion == m_databaseInfo->version()) {
</span><span class="cx"> addOpenDatabaseConnection(WTF::move(connection));
</span><span class="cx">
</span><del>- auto result = IDBResultData::openDatabaseSuccess(operation->requestData().requestIdentifier(), *rawConnection);
- operation->connection().didOpenDatabase(result);
</del><ins>+ auto result = IDBResultData::openDatabaseSuccess(m_currentOperation->requestData().requestIdentifier(), *rawConnection);
+ m_currentOperation->connection().didOpenDatabase(result);
+ m_currentOperation = nullptr;
+
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(!m_currentOperation);
</del><span class="cx"> ASSERT(!m_versionChangeDatabaseConnection);
</span><del>-
- m_currentOperation = WTF::move(operation);
</del><span class="cx"> m_versionChangeDatabaseConnection = rawConnection;
</span><span class="cx">
</span><span class="cx"> // 3.3.7 "versionchange" transaction steps
</span><span class="lines">@@ -179,6 +172,42 @@
</span><span class="cx"> m_versionChangeDatabaseConnection->connectionToClient().notifyOpenDBRequestBlocked(m_currentOperation->requestData().requestIdentifier(), m_databaseInfo->version(), requestedVersion);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UniqueIDBDatabase::performCurrentDeleteOperation()
+{
+ LOG(IndexedDB, "(main) UniqueIDBDatabase::performCurrentDeleteOperation");
+
+ // Not used yet.
+}
+
+void UniqueIDBDatabase::handleDatabaseOperations()
+{
+ ASSERT(isMainThread());
+ LOG(IndexedDB, "(main) UniqueIDBDatabase::handleDatabaseOperations");
+
+ // If a version change transaction is currently in progress, no new connections can be opened right now.
+ // We will try again later.
+ if (m_versionChangeDatabaseConnection)
+ return;
+
+ if (m_pendingOpenDatabaseOperations.isEmpty())
+ return;
+
+ if (m_currentOperation)
+ return;
+
+ m_currentOperation = m_pendingOpenDatabaseOperations.takeFirst();
+
+ // FIXME: Once handleDatabaseOperations also handles delete operations, remove this ASSERT.
+ ASSERT(m_currentOperation->isOpenRequest());
+
+ if (m_currentOperation->isOpenRequest())
+ performCurrentOpenOperation();
+ else if (m_currentOperation->isDeleteRequest())
+ performCurrentDeleteOperation();
+ else
+ ASSERT_NOT_REACHED();
+}
+
</ins><span class="cx"> bool UniqueIDBDatabase::hasAnyOpenConnections() const
</span><span class="cx"> {
</span><span class="cx"> return !m_openDatabaseConnections.isEmpty();
</span><span class="lines">@@ -326,7 +355,7 @@
</span><span class="cx"> ASSERT(m_isOpeningBackingStore);
</span><span class="cx"> m_isOpeningBackingStore = false;
</span><span class="cx">
</span><del>- handleOpenDatabaseOperations();
</del><ins>+ handleDatabaseOperations();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::createObjectStore(UniqueIDBDatabaseTransaction& transaction, const IDBObjectStoreInfo& info, ErrorCallback callback)
</span><span class="lines">@@ -916,7 +945,7 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "(main) UniqueIDBDatabase::operationAndTransactionTimerFired");
</span><span class="cx">
</span><del>- handleOpenDatabaseOperations();
</del><ins>+ handleDatabaseOperations();
</ins><span class="cx">
</span><span class="cx"> if (m_deletePending && maybeDeleteDatabase(nullptr))
</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 (194172 => 194173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2015-12-16 21:50:09 UTC (rev 194172)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2015-12-16 21:52:11 UTC (rev 194173)
</span><span class="lines">@@ -104,7 +104,9 @@
</span><span class="cx"> private:
</span><span class="cx"> UniqueIDBDatabase(IDBServer&, const IDBDatabaseIdentifier&);
</span><span class="cx">
</span><del>- void handleOpenDatabaseOperations();
</del><ins>+ void handleDatabaseOperations();
+ void performCurrentOpenOperation();
+ void performCurrentDeleteOperation();
</ins><span class="cx"> void addOpenDatabaseConnection(Ref<UniqueIDBDatabaseConnection>&&);
</span><span class="cx"> bool maybeDeleteDatabase(IDBServerOperation*);
</span><span class="cx"> bool hasAnyOpenConnections() const;
</span></span></pre>
</div>
</div>
</body>
</html>