<!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>[200485] 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/200485">200485</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-05-05 15:14:08 -0700 (Thu, 05 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Move all IDB DOM object management from IDBConnectionToServer to IDBConnectionProxy.
https://bugs.webkit.org/show_bug.cgi?id=157348
Reviewed by Alex Christensen.
No new tests (Refactor, no change in behavior yet).
This is in-progress IDB-in-Workers code that is isolated enough to land right now.
The goal is to have IDBConnectionToServer be a main-thread-only object, leaving IDBConnectionProxy
as the threading bridge between the worker thread and the main thread.
As such, IDBConnectionToServer no longer maintains maps of IDB DOM objects, but instead the proxy
does and guards that access with locks.
No threading changes takes place in this patch but it does scatter some isMainThread() checks and FIXMEs
accurately representing where threading changes will take place once I can return to this.
* Modules/indexeddb/IDBDatabase.cpp:
(WebCore::IDBDatabase::IDBDatabase):
(WebCore::IDBDatabase::~IDBDatabase):
(WebCore::IDBDatabase::maybeCloseInServer):
* Modules/indexeddb/IDBOpenDBRequest.cpp:
(WebCore::IDBOpenDBRequest::dispatchEvent):
* Modules/indexeddb/IDBTransaction.cpp:
(WebCore::IDBTransaction::abortOnServerAndCancelRequests):
(WebCore::IDBTransaction::commitOnServer):
(WebCore::IDBTransaction::establishOnServer):
* Modules/indexeddb/client/IDBConnectionProxy.cpp:
(WebCore::IDBClient::IDBConnectionProxy::openDatabase):
(WebCore::IDBClient::IDBConnectionProxy::deleteDatabase):
(WebCore::IDBClient::IDBConnectionProxy::didOpenDatabase):
(WebCore::IDBClient::IDBConnectionProxy::didDeleteDatabase):
(WebCore::IDBClient::IDBConnectionProxy::completeOpenDBRequest):
(WebCore::IDBClient::IDBConnectionProxy::fireVersionChangeEvent):
(WebCore::IDBClient::IDBConnectionProxy::didFireVersionChangeEvent):
(WebCore::IDBClient::IDBConnectionProxy::notifyOpenDBRequestBlocked):
(WebCore::IDBClient::IDBConnectionProxy::establishTransaction):
(WebCore::IDBClient::IDBConnectionProxy::didStartTransaction):
(WebCore::IDBClient::IDBConnectionProxy::commitTransaction):
(WebCore::IDBClient::IDBConnectionProxy::didCommitTransaction):
(WebCore::IDBClient::IDBConnectionProxy::abortTransaction):
(WebCore::IDBClient::IDBConnectionProxy::didAbortTransaction):
(WebCore::IDBClient::IDBConnectionProxy::hasRecordOfTransaction):
(WebCore::IDBClient::IDBConnectionProxy::didFinishHandlingVersionChangeTransaction):
(WebCore::IDBClient::IDBConnectionProxy::databaseConnectionClosed):
(WebCore::IDBClient::IDBConnectionProxy::registerDatabaseConnection):
(WebCore::IDBClient::IDBConnectionProxy::unregisterDatabaseConnection):
* Modules/indexeddb/client/IDBConnectionProxy.h:
* Modules/indexeddb/client/IDBConnectionToServer.cpp:
(WebCore::IDBClient::IDBConnectionToServer::deleteDatabase):
(WebCore::IDBClient::IDBConnectionToServer::didDeleteDatabase):
(WebCore::IDBClient::IDBConnectionToServer::openDatabase):
(WebCore::IDBClient::IDBConnectionToServer::didOpenDatabase):
(WebCore::IDBClient::IDBConnectionToServer::establishTransaction):
(WebCore::IDBClient::IDBConnectionToServer::commitTransaction):
(WebCore::IDBClient::IDBConnectionToServer::didCommitTransaction):
(WebCore::IDBClient::IDBConnectionToServer::didFinishHandlingVersionChangeTransaction):
(WebCore::IDBClient::IDBConnectionToServer::abortTransaction):
(WebCore::IDBClient::IDBConnectionToServer::didAbortTransaction):
(WebCore::IDBClient::IDBConnectionToServer::fireVersionChangeEvent):
(WebCore::IDBClient::IDBConnectionToServer::didFireVersionChangeEvent):
(WebCore::IDBClient::IDBConnectionToServer::didStartTransaction):
(WebCore::IDBClient::IDBConnectionToServer::notifyOpenDBRequestBlocked):
(WebCore::IDBClient::IDBConnectionToServer::databaseConnectionClosed):
(WebCore::IDBClient::IDBConnectionToServer::registerDatabaseConnection): Deleted.
(WebCore::IDBClient::IDBConnectionToServer::unregisterDatabaseConnection): Deleted.
(WebCore::IDBClient::IDBConnectionToServer::hasRecordOfTransaction): Deleted.
* Modules/indexeddb/client/IDBConnectionToServer.h:
* Modules/indexeddb/shared/IDBRequestData.cpp:
(WebCore::IDBRequestData::IDBRequestData):
* Modules/indexeddb/shared/IDBRequestData.h:
* Modules/indexeddb/shared/IDBResourceIdentifier.cpp:
(WebCore::IDBResourceIdentifier::IDBResourceIdentifier):
* Modules/indexeddb/shared/IDBResourceIdentifier.h:</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCoreModulesindexeddbIDBDatabaseh">trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBOpenDBRequestcpp">trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactioncpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionh">trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxycpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxyh">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServercpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServerh">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBRequestDatacpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBRequestDatah">trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBResourceIdentifiercpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBResourceIdentifierh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200484 => 200485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-05 22:14:02 UTC (rev 200484)
+++ trunk/Source/WebCore/ChangeLog 2016-05-05 22:14:08 UTC (rev 200485)
</span><span class="lines">@@ -1,5 +1,89 @@
</span><span class="cx"> 2016-05-04 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: Move all IDB DOM object management from IDBConnectionToServer to IDBConnectionProxy.
+ https://bugs.webkit.org/show_bug.cgi?id=157348
+
+ Reviewed by Alex Christensen.
+
+ No new tests (Refactor, no change in behavior yet).
+
+ This is in-progress IDB-in-Workers code that is isolated enough to land right now.
+
+ The goal is to have IDBConnectionToServer be a main-thread-only object, leaving IDBConnectionProxy
+ as the threading bridge between the worker thread and the main thread.
+
+ As such, IDBConnectionToServer no longer maintains maps of IDB DOM objects, but instead the proxy
+ does and guards that access with locks.
+
+ No threading changes takes place in this patch but it does scatter some isMainThread() checks and FIXMEs
+ accurately representing where threading changes will take place once I can return to this.
+
+ * Modules/indexeddb/IDBDatabase.cpp:
+ (WebCore::IDBDatabase::IDBDatabase):
+ (WebCore::IDBDatabase::~IDBDatabase):
+ (WebCore::IDBDatabase::maybeCloseInServer):
+
+ * Modules/indexeddb/IDBOpenDBRequest.cpp:
+ (WebCore::IDBOpenDBRequest::dispatchEvent):
+
+ * Modules/indexeddb/IDBTransaction.cpp:
+ (WebCore::IDBTransaction::abortOnServerAndCancelRequests):
+ (WebCore::IDBTransaction::commitOnServer):
+ (WebCore::IDBTransaction::establishOnServer):
+
+ * Modules/indexeddb/client/IDBConnectionProxy.cpp:
+ (WebCore::IDBClient::IDBConnectionProxy::openDatabase):
+ (WebCore::IDBClient::IDBConnectionProxy::deleteDatabase):
+ (WebCore::IDBClient::IDBConnectionProxy::didOpenDatabase):
+ (WebCore::IDBClient::IDBConnectionProxy::didDeleteDatabase):
+ (WebCore::IDBClient::IDBConnectionProxy::completeOpenDBRequest):
+ (WebCore::IDBClient::IDBConnectionProxy::fireVersionChangeEvent):
+ (WebCore::IDBClient::IDBConnectionProxy::didFireVersionChangeEvent):
+ (WebCore::IDBClient::IDBConnectionProxy::notifyOpenDBRequestBlocked):
+ (WebCore::IDBClient::IDBConnectionProxy::establishTransaction):
+ (WebCore::IDBClient::IDBConnectionProxy::didStartTransaction):
+ (WebCore::IDBClient::IDBConnectionProxy::commitTransaction):
+ (WebCore::IDBClient::IDBConnectionProxy::didCommitTransaction):
+ (WebCore::IDBClient::IDBConnectionProxy::abortTransaction):
+ (WebCore::IDBClient::IDBConnectionProxy::didAbortTransaction):
+ (WebCore::IDBClient::IDBConnectionProxy::hasRecordOfTransaction):
+ (WebCore::IDBClient::IDBConnectionProxy::didFinishHandlingVersionChangeTransaction):
+ (WebCore::IDBClient::IDBConnectionProxy::databaseConnectionClosed):
+ (WebCore::IDBClient::IDBConnectionProxy::registerDatabaseConnection):
+ (WebCore::IDBClient::IDBConnectionProxy::unregisterDatabaseConnection):
+ * Modules/indexeddb/client/IDBConnectionProxy.h:
+
+ * Modules/indexeddb/client/IDBConnectionToServer.cpp:
+ (WebCore::IDBClient::IDBConnectionToServer::deleteDatabase):
+ (WebCore::IDBClient::IDBConnectionToServer::didDeleteDatabase):
+ (WebCore::IDBClient::IDBConnectionToServer::openDatabase):
+ (WebCore::IDBClient::IDBConnectionToServer::didOpenDatabase):
+ (WebCore::IDBClient::IDBConnectionToServer::establishTransaction):
+ (WebCore::IDBClient::IDBConnectionToServer::commitTransaction):
+ (WebCore::IDBClient::IDBConnectionToServer::didCommitTransaction):
+ (WebCore::IDBClient::IDBConnectionToServer::didFinishHandlingVersionChangeTransaction):
+ (WebCore::IDBClient::IDBConnectionToServer::abortTransaction):
+ (WebCore::IDBClient::IDBConnectionToServer::didAbortTransaction):
+ (WebCore::IDBClient::IDBConnectionToServer::fireVersionChangeEvent):
+ (WebCore::IDBClient::IDBConnectionToServer::didFireVersionChangeEvent):
+ (WebCore::IDBClient::IDBConnectionToServer::didStartTransaction):
+ (WebCore::IDBClient::IDBConnectionToServer::notifyOpenDBRequestBlocked):
+ (WebCore::IDBClient::IDBConnectionToServer::databaseConnectionClosed):
+ (WebCore::IDBClient::IDBConnectionToServer::registerDatabaseConnection): Deleted.
+ (WebCore::IDBClient::IDBConnectionToServer::unregisterDatabaseConnection): Deleted.
+ (WebCore::IDBClient::IDBConnectionToServer::hasRecordOfTransaction): Deleted.
+ * Modules/indexeddb/client/IDBConnectionToServer.h:
+
+ * Modules/indexeddb/shared/IDBRequestData.cpp:
+ (WebCore::IDBRequestData::IDBRequestData):
+ * Modules/indexeddb/shared/IDBRequestData.h:
+
+ * Modules/indexeddb/shared/IDBResourceIdentifier.cpp:
+ (WebCore::IDBResourceIdentifier::IDBResourceIdentifier):
+ * Modules/indexeddb/shared/IDBResourceIdentifier.h:
+
+2016-05-04 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: Add isolatedCopy to a few more objects.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157330
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (200484 => 200485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-05-05 22:14:02 UTC (rev 200484)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-05-05 22:14:08 UTC (rev 200485)
</span><span class="lines">@@ -56,14 +56,13 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBDatabase::IDBDatabase - Creating database %s with version %" PRIu64 " connection %" PRIu64, m_info.name().utf8().data(), m_info.version(), m_databaseConnectionIdentifier);
</span><span class="cx"> suspendIfNeeded();
</span><del>- relaxAdoptionRequirement();
- m_connectionProxy->connectionToServer().registerDatabaseConnection(*this);
</del><ins>+ m_connectionProxy->registerDatabaseConnection(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBDatabase::~IDBDatabase()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(currentThread() == m_originThreadID);
</span><del>- m_connectionProxy->connectionToServer().unregisterDatabaseConnection(*this);
</del><ins>+ m_connectionProxy->unregisterDatabaseConnection(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool IDBDatabase::hasPendingActivity() const
</span><span class="lines">@@ -262,7 +261,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_closedInServer = true;
</span><del>- m_connectionProxy->connectionToServer().databaseConnectionClosed(*this);
</del><ins>+ m_connectionProxy->databaseConnectionClosed(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* IDBDatabase::activeDOMObjectName() const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h (200484 => 200485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2016-05-05 22:14:02 UTC (rev 200484)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2016-05-05 22:14:08 UTC (rev 200485)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> class IDBTransaction;
</span><span class="cx"> class IDBTransactionInfo;
</span><span class="cx">
</span><del>-class IDBDatabase : public RefCounted<IDBDatabase>, public EventTargetWithInlineData, public ActiveDOMObject {
</del><ins>+class IDBDatabase : public ThreadSafeRefCounted<IDBDatabase>, public EventTargetWithInlineData, public ActiveDOMObject {
</ins><span class="cx"> public:
</span><span class="cx"> static Ref<IDBDatabase> create(ScriptExecutionContext&, IDBClient::IDBConnectionProxy&, const IDBResultData&);
</span><span class="cx">
</span><span class="lines">@@ -64,11 +64,11 @@
</span><span class="cx"> // EventTarget
</span><span class="cx"> EventTargetInterface eventTargetInterface() const final { return IDBDatabaseEventTargetInterfaceType; }
</span><span class="cx"> ScriptExecutionContext* scriptExecutionContext() const final { return ActiveDOMObject::scriptExecutionContext(); }
</span><del>- void refEventTarget() final { RefCounted<IDBDatabase>::ref(); }
- void derefEventTarget() final { RefCounted<IDBDatabase>::deref(); }
</del><ins>+ void refEventTarget() final { ThreadSafeRefCounted<IDBDatabase>::ref(); }
+ void derefEventTarget() final { ThreadSafeRefCounted<IDBDatabase>::deref(); }
</ins><span class="cx">
</span><del>- using RefCounted<IDBDatabase>::ref;
- using RefCounted<IDBDatabase>::deref;
</del><ins>+ using ThreadSafeRefCounted<IDBDatabase>::ref;
+ using ThreadSafeRefCounted<IDBDatabase>::deref;
</ins><span class="cx">
</span><span class="cx"> const char* activeDOMObjectName() const final;
</span><span class="cx"> bool canSuspendForDocumentSuspension() const final;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBOpenDBRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp (200484 => 200485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp 2016-05-05 22:14:02 UTC (rev 200484)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp 2016-05-05 22:14:08 UTC (rev 200485)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> bool result = IDBRequest::dispatchEvent(event);
</span><span class="cx">
</span><span class="cx"> if (m_transaction && m_transaction->isVersionChange() && (event.type() == eventNames().errorEvent || event.type() == eventNames().successEvent))
</span><del>- m_transaction->database().serverConnection().didFinishHandlingVersionChangeTransaction(*m_transaction);
</del><ins>+ m_transaction->database().connectionProxy().didFinishHandlingVersionChangeTransaction(*m_transaction);
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (200484 => 200485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-05-05 22:14:02 UTC (rev 200484)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-05-05 22:14:08 UTC (rev 200485)
</span><span class="lines">@@ -133,8 +133,6 @@
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::IDBTransaction - %s", m_info.loggingString().utf8().data());
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- relaxAdoptionRequirement();
-
</del><span class="cx"> if (m_info.mode() == IndexedDB::TransactionMode::VersionChange) {
</span><span class="cx"> ASSERT(m_openDBRequest);
</span><span class="cx"> m_openDBRequest->setVersionChangeTransaction(*this);
</span><span class="lines">@@ -295,7 +293,7 @@
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx"> ASSERT(m_transactionOperationQueue.isEmpty());
</span><span class="cx">
</span><del>- serverConnection().abortTransaction(*this);
</del><ins>+ m_database->connectionProxy().abortTransaction(*this);
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_transactionOperationMap.contains(operation.identifier()));
</span><span class="cx"> m_transactionOperationMap.remove(operation.identifier());
</span><span class="lines">@@ -432,7 +430,7 @@
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::commitOnServer");
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- serverConnection().commitTransaction(*this);
</del><ins>+ m_database->connectionProxy().commitTransaction(*this);
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_transactionOperationMap.contains(operation.identifier()));
</span><span class="cx"> m_transactionOperationMap.remove(operation.identifier());
</span><span class="lines">@@ -1044,7 +1042,7 @@
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::establishOnServer");
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- serverConnection().establishTransaction(*this);
</del><ins>+ m_database->connectionProxy().establishTransaction(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::activate()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h (200484 => 200485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2016-05-05 22:14:02 UTC (rev 200484)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2016-05-05 22:14:08 UTC (rev 200485)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> class TransactionOperation;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class IDBTransaction : public RefCounted<IDBTransaction>, public EventTargetWithInlineData, private ActiveDOMObject {
</del><ins>+class IDBTransaction : public ThreadSafeRefCounted<IDBTransaction>, public EventTargetWithInlineData, private ActiveDOMObject {
</ins><span class="cx"> public:
</span><span class="cx"> static const AtomicString& modeReadOnly();
</span><span class="cx"> static const AtomicString& modeReadWrite();
</span><span class="lines">@@ -83,13 +83,13 @@
</span><span class="cx">
</span><span class="cx"> EventTargetInterface eventTargetInterface() const final { return IDBTransactionEventTargetInterfaceType; }
</span><span class="cx"> ScriptExecutionContext* scriptExecutionContext() const final { return ActiveDOMObject::scriptExecutionContext(); }
</span><del>- void refEventTarget() final { RefCounted::ref(); }
- void derefEventTarget() final { RefCounted::deref(); }
</del><ins>+ void refEventTarget() final { ThreadSafeRefCounted::ref(); }
+ void derefEventTarget() final { ThreadSafeRefCounted::deref(); }
</ins><span class="cx"> using EventTarget::dispatchEvent;
</span><span class="cx"> bool dispatchEvent(Event&) final;
</span><span class="cx">
</span><del>- using RefCounted<IDBTransaction>::ref;
- using RefCounted<IDBTransaction>::deref;
</del><ins>+ using ThreadSafeRefCounted<IDBTransaction>::ref;
+ using ThreadSafeRefCounted<IDBTransaction>::deref;
</ins><span class="cx">
</span><span class="cx"> const char* activeDOMObjectName() const final;
</span><span class="cx"> bool canSuspendForDocumentSuspension() const final;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp (200484 => 200485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-05-05 22:14:02 UTC (rev 200484)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-05-05 22:14:08 UTC (rev 200485)
</span><span class="lines">@@ -28,7 +28,10 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><ins>+#include "IDBDatabase.h"
</ins><span class="cx"> #include "IDBOpenDBRequest.h"
</span><ins>+#include "IDBRequestData.h"
+#include "IDBResultData.h"
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -66,9 +69,21 @@
</span><span class="cx"> if (!isMainThread())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- auto request = IDBOpenDBRequest::createOpenRequest(context, *this, databaseIdentifier, version);
- m_connectionToServer.openDatabase(request.get());
- return WTFMove(request);
</del><ins>+ RefPtr<IDBOpenDBRequest> request;
+ {
+ Locker<Lock> locker(m_openDBRequestMapLock);
+
+ request = IDBOpenDBRequest::createOpenRequest(context, *this, databaseIdentifier, version);
+ ASSERT(!m_openDBRequestMap.contains(request->resourceIdentifier()));
+ m_openDBRequestMap.set(request->resourceIdentifier(), request.get());
+ }
+
+ IDBRequestData requestData(*this, *request);
+
+ // FIXME: For workers, marshall this to the main thread if necessary.
+ m_connectionToServer.openDatabase(requestData);
+
+ return request;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBOpenDBRequest> IDBConnectionProxy::deleteDatabase(ScriptExecutionContext& context, const IDBDatabaseIdentifier& databaseIdentifier)
</span><span class="lines">@@ -77,11 +92,203 @@
</span><span class="cx"> if (!isMainThread())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- auto request = IDBOpenDBRequest::createDeleteRequest(context, *this, databaseIdentifier);
- m_connectionToServer.deleteDatabase(request.get());
- return WTFMove(request);
</del><ins>+ RefPtr<IDBOpenDBRequest> request;
+ {
+ Locker<Lock> locker(m_openDBRequestMapLock);
+
+ request = IDBOpenDBRequest::createDeleteRequest(context, *this, databaseIdentifier);
+ ASSERT(!m_openDBRequestMap.contains(request->resourceIdentifier()));
+ m_openDBRequestMap.set(request->resourceIdentifier(), request.get());
+ }
+
+ IDBRequestData requestData(*this, *request);
+
+ // FIXME: For workers, marshall this to the main thread if necessary.
+ m_connectionToServer.deleteDatabase(requestData);
+
+ return request;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBConnectionProxy::didOpenDatabase(const IDBResultData& resultData)
+{
+ completeOpenDBRequest(resultData);
+}
+
+void IDBConnectionProxy::didDeleteDatabase(const IDBResultData& resultData)
+{
+ completeOpenDBRequest(resultData);
+}
+
+void IDBConnectionProxy::completeOpenDBRequest(const IDBResultData& resultData)
+{
+ ASSERT(isMainThread());
+
+ RefPtr<IDBOpenDBRequest> request;
+ {
+ Locker<Lock> locker(m_openDBRequestMapLock);
+ request = m_openDBRequestMap.get(resultData.requestIdentifier());
+ ASSERT(request);
+ }
+
+ request->requestCompleted(resultData);
+}
+
+void IDBConnectionProxy::fireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion)
+{
+ ASSERT(isMainThread());
+
+ RefPtr<IDBDatabase> database;
+ {
+ Locker<Lock> locker(m_databaseConnectionMapLock);
+ database = m_databaseConnectionMap.get(databaseConnectionIdentifier);
+ }
+
+ if (!database)
+ return;
+
+ database->fireVersionChangeEvent(requestIdentifier, requestedVersion);
+}
+
+void IDBConnectionProxy::didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier)
+{
+ // FIXME: Handle Workers
+ if (!isMainThread())
+ return;
+
+ m_connectionToServer.didFireVersionChangeEvent(databaseConnectionIdentifier, requestIdentifier);
+}
+
+void IDBConnectionProxy::notifyOpenDBRequestBlocked(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion)
+{
+ ASSERT(isMainThread());
+
+ RefPtr<IDBOpenDBRequest> request;
+ {
+ Locker<Lock> locker(m_openDBRequestMapLock);
+ request = m_openDBRequestMap.get(requestIdentifier);
+ }
+
+ ASSERT(request);
+
+ request->requestBlocked(oldVersion, newVersion);
+}
+
+void IDBConnectionProxy::establishTransaction(IDBTransaction& transaction)
+{
+ {
+ Locker<Lock> locker(m_transactionMapLock);
+ ASSERT(!hasRecordOfTransaction(transaction));
+ m_pendingTransactions.set(transaction.info().identifier(), &transaction);
+ }
+
+ // FIXME: Handle Workers
+ if (!isMainThread())
+ return;
+
+ m_connectionToServer.establishTransaction(transaction.database().databaseConnectionIdentifier(), transaction.info());
+}
+
+void IDBConnectionProxy::didStartTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError& error)
+{
+ RefPtr<IDBTransaction> transaction;
+ {
+ Locker<Lock> locker(m_transactionMapLock);
+ transaction = m_pendingTransactions.take(transactionIdentifier);
+ }
+
+ ASSERT(transaction);
+
+ // FIXME: Handle hopping to the Worker thread here if necessary.
+
+ transaction->didStart(error);
+}
+
+void IDBConnectionProxy::commitTransaction(IDBTransaction& transaction)
+{
+ {
+ Locker<Lock> locker(m_transactionMapLock);
+ ASSERT(!m_committingTransactions.contains(transaction.info().identifier()));
+ m_committingTransactions.set(transaction.info().identifier(), &transaction);
+ }
+
+ // FIXME: Handle Workers
+ if (!isMainThread())
+ return;
+
+ m_connectionToServer.commitTransaction(transaction.info().identifier());
+}
+
+void IDBConnectionProxy::didCommitTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError& error)
+{
+ RefPtr<IDBTransaction> transaction;
+ {
+ Locker<Lock> locker(m_transactionMapLock);
+ transaction = m_committingTransactions.take(transactionIdentifier);
+ }
+
+ ASSERT(transaction);
+
+ // FIXME: Handle hopping to the Worker thread here if necessary.
+
+ transaction->didCommit(error);
+}
+
+void IDBConnectionProxy::abortTransaction(IDBTransaction& transaction)
+{
+ {
+ Locker<Lock> locker(m_transactionMapLock);
+ ASSERT(!m_abortingTransactions.contains(transaction.info().identifier()));
+ m_abortingTransactions.set(transaction.info().identifier(), &transaction);
+ }
+
+ // FIXME: Handle Workers
+ if (!isMainThread())
+ return;
+
+ m_connectionToServer.abortTransaction(transaction.info().identifier());
+}
+
+void IDBConnectionProxy::didAbortTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError& error)
+{
+ RefPtr<IDBTransaction> transaction;
+ {
+ Locker<Lock> locker(m_transactionMapLock);
+ transaction = m_abortingTransactions.take(transactionIdentifier);
+ }
+
+ ASSERT(transaction);
+
+ // FIXME: Handle hopping to the Worker thread here if necessary.
+
+ transaction->didAbort(error);
+}
+
+bool IDBConnectionProxy::hasRecordOfTransaction(const IDBTransaction& transaction) const
+{
+ ASSERT(m_transactionMapLock.isLocked());
+
+ auto identifier = transaction.info().identifier();
+ return m_pendingTransactions.contains(identifier) || m_committingTransactions.contains(identifier) || m_abortingTransactions.contains(identifier);
+}
+
+void IDBConnectionProxy::didFinishHandlingVersionChangeTransaction(IDBTransaction& transaction)
+{
+ // FIXME: Handle Workers
+ if (!isMainThread())
+ return;
+
+ m_connectionToServer.didFinishHandlingVersionChangeTransaction(transaction.info().identifier());
+}
+
+void IDBConnectionProxy::databaseConnectionClosed(IDBDatabase& database)
+{
+ // FIXME: Handle Workers
+ if (!isMainThread())
+ return;
+
+ m_connectionToServer.databaseConnectionClosed(database.databaseConnectionIdentifier());
+}
+
</ins><span class="cx"> void IDBConnectionProxy::getAllDatabaseNames(const SecurityOrigin& mainFrameOrigin, const SecurityOrigin& openingOrigin, std::function<void (const Vector<String>&)> callback)
</span><span class="cx"> {
</span><span class="cx"> // This method is only meant to be called by the web inspector on the main thread.
</span><span class="lines">@@ -90,7 +297,23 @@
</span><span class="cx"> m_connectionToServer.getAllDatabaseNames(mainFrameOrigin, openingOrigin, callback);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBConnectionProxy::registerDatabaseConnection(IDBDatabase& database)
+{
+ Locker<Lock> locker(m_databaseConnectionMapLock);
</ins><span class="cx">
</span><ins>+ ASSERT(!m_databaseConnectionMap.contains(database.databaseConnectionIdentifier()));
+ m_databaseConnectionMap.set(database.databaseConnectionIdentifier(), &database);
+}
+
+void IDBConnectionProxy::unregisterDatabaseConnection(IDBDatabase& database)
+{
+ Locker<Lock> locker(m_databaseConnectionMapLock);
+
+ ASSERT(m_databaseConnectionMap.contains(database.databaseConnectionIdentifier()));
+ ASSERT(m_databaseConnectionMap.get(database.databaseConnectionIdentifier()) == &database);
+ m_databaseConnectionMap.remove(database.databaseConnectionIdentifier());
+}
+
</ins><span class="cx"> } // namesapce IDBClient
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h (200484 => 200485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-05-05 22:14:02 UTC (rev 200484)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-05-05 22:14:08 UTC (rev 200485)
</span><span class="lines">@@ -28,15 +28,21 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="cx"> #include "IDBConnectionToServer.h"
</span><ins>+#include "IDBResourceIdentifier.h"
</ins><span class="cx"> #include <functional>
</span><ins>+#include <wtf/HashMap.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class IDBDatabase;
</ins><span class="cx"> class IDBDatabaseIdentifier;
</span><ins>+class IDBError;
</ins><span class="cx"> class IDBOpenDBRequest;
</span><ins>+class IDBResultData;
+class IDBTransaction;
</ins><span class="cx"> class ScriptExecutionContext;
</span><span class="cx"> class SecurityOrigin;
</span><span class="cx">
</span><span class="lines">@@ -49,8 +55,27 @@
</span><span class="cx"> IDBConnectionProxy(IDBConnectionToServer&);
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBOpenDBRequest> openDatabase(ScriptExecutionContext&, const IDBDatabaseIdentifier&, uint64_t version);
</span><ins>+ void didOpenDatabase(const IDBResultData&);
+
</ins><span class="cx"> RefPtr<IDBOpenDBRequest> deleteDatabase(ScriptExecutionContext&, const IDBDatabaseIdentifier&);
</span><ins>+ void didDeleteDatabase(const IDBResultData&);
</ins><span class="cx">
</span><ins>+ void fireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion);
+ void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier);
+
+ void notifyOpenDBRequestBlocked(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion);
+
+ void establishTransaction(IDBTransaction&);
+ void commitTransaction(IDBTransaction&);
+ void abortTransaction(IDBTransaction&);
+
+ void didStartTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&);
+ void didCommitTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&);
+ void didAbortTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&);
+
+ void didFinishHandlingVersionChangeTransaction(IDBTransaction&);
+ void databaseConnectionClosed(IDBDatabase&);
+
</ins><span class="cx"> uint64_t serverConnectionIdentifier() const { return m_serverConnectionIdentifier; }
</span><span class="cx">
</span><span class="cx"> // FIXME: Temporarily required during bringup of IDB-in-Workers.
</span><span class="lines">@@ -63,9 +88,26 @@
</span><span class="cx">
</span><span class="cx"> void getAllDatabaseNames(const SecurityOrigin& mainFrameOrigin, const SecurityOrigin& openingOrigin, std::function<void (const Vector<String>&)>);
</span><span class="cx">
</span><ins>+ void registerDatabaseConnection(IDBDatabase&);
+ void unregisterDatabaseConnection(IDBDatabase&);
+
</ins><span class="cx"> private:
</span><ins>+ void completeOpenDBRequest(const IDBResultData&);
+ bool hasRecordOfTransaction(const IDBTransaction&) const;
+
</ins><span class="cx"> IDBConnectionToServer& m_connectionToServer;
</span><span class="cx"> uint64_t m_serverConnectionIdentifier;
</span><ins>+
+ HashMap<uint64_t, IDBDatabase*> m_databaseConnectionMap;
+ Lock m_databaseConnectionMapLock;
+
+ HashMap<IDBResourceIdentifier, RefPtr<IDBOpenDBRequest>> m_openDBRequestMap;
+ Lock m_openDBRequestMapLock;
+
+ HashMap<IDBResourceIdentifier, RefPtr<IDBTransaction>> m_pendingTransactions;
+ HashMap<IDBResourceIdentifier, RefPtr<IDBTransaction>> m_committingTransactions;
+ HashMap<IDBResourceIdentifier, RefPtr<IDBTransaction>> m_abortingTransactions;
+ Lock m_transactionMapLock;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace IDBClient
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp (200484 => 200485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2016-05-05 22:14:02 UTC (rev 200484)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2016-05-05 22:14:08 UTC (rev 200485)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "IDBResultData.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "TransactionOperation.h"
</span><ins>+#include <wtf/MainThread.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace IDBClient {
</span><span class="lines">@@ -62,46 +63,28 @@
</span><span class="cx"> return *m_proxy;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::deleteDatabase(IDBOpenDBRequest& request)
</del><ins>+void IDBConnectionToServer::deleteDatabase(const IDBRequestData& request)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::deleteDatabase - %s", request.databaseIdentifier().debugString().utf8().data());
</span><del>-
- ASSERT(!m_openDBRequestMap.contains(request.resourceIdentifier()));
- m_openDBRequestMap.set(request.resourceIdentifier(), &request);
-
- IDBRequestData requestData(*this, request);
- m_delegate->deleteDatabase(requestData);
</del><ins>+ m_delegate->deleteDatabase(request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didDeleteDatabase(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didDeleteDatabase");
</span><del>-
- auto request = m_openDBRequestMap.take(resultData.requestIdentifier());
- ASSERT(request);
-
- request->requestCompleted(resultData);
</del><ins>+ m_proxy->didDeleteDatabase(resultData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::openDatabase(IDBOpenDBRequest& request)
</del><ins>+void IDBConnectionToServer::openDatabase(const IDBRequestData& request)
</ins><span class="cx"> {
</span><del>- LOG(IndexedDB, "IDBConnectionToServer::openDatabase - %s (%" PRIu64 ")", request.databaseIdentifier().debugString().utf8().data(), request.version());
-
- ASSERT(!m_openDBRequestMap.contains(request.resourceIdentifier()));
- m_openDBRequestMap.set(request.resourceIdentifier(), &request);
-
- IDBRequestData requestData(*this, request);
- m_delegate->openDatabase(requestData);
</del><ins>+ LOG(IndexedDB, "IDBConnectionToServer::openDatabase - %s (%" PRIu64 ")", request.databaseIdentifier().debugString().utf8().data(), request.requestedVersion());
+ m_delegate->openDatabase(request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didOpenDatabase(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didOpenDatabase");
</span><del>-
- auto request = m_openDBRequestMap.take(resultData.requestIdentifier());
- ASSERT(request);
-
- request->requestCompleted(resultData);
</del><ins>+ m_proxy->didOpenDatabase(resultData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::createObjectStore(TransactionOperation& operation, const IDBObjectStoreInfo& info)
</span><span class="lines">@@ -269,77 +252,66 @@
</span><span class="cx"> completeOperation(resultData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::establishTransaction(IDBTransaction& transaction)
</del><ins>+void IDBConnectionToServer::establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo& info)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::establishTransaction");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- ASSERT(!hasRecordOfTransaction(transaction));
- m_pendingTransactions.set(transaction.info().identifier(), &transaction);
-
- m_delegate->establishTransaction(transaction.database().databaseConnectionIdentifier(), transaction.info());
</del><ins>+ m_delegate->establishTransaction(databaseConnectionIdentifier, info);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::commitTransaction(IDBTransaction& transaction)
</del><ins>+void IDBConnectionToServer::commitTransaction(const IDBResourceIdentifier& transactionIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::commitTransaction");
</span><del>- ASSERT(!m_committingTransactions.contains(transaction.info().identifier()));
- m_committingTransactions.set(transaction.info().identifier(), &transaction);
</del><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- auto identifier = transaction.info().identifier();
- m_delegate->commitTransaction(identifier);
</del><ins>+ m_delegate->commitTransaction(transactionIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didCommitTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError& error)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didCommitTransaction");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- auto transaction = m_committingTransactions.take(transactionIdentifier);
- ASSERT(transaction);
-
- transaction->didCommit(error);
</del><ins>+ m_proxy->didCommitTransaction(transactionIdentifier, error);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::didFinishHandlingVersionChangeTransaction(IDBTransaction& transaction)
</del><ins>+void IDBConnectionToServer::didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier& transactionIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didFinishHandlingVersionChangeTransaction");
</span><del>- auto identifier = transaction.info().identifier();
- m_delegate->didFinishHandlingVersionChangeTransaction(identifier);
</del><ins>+ ASSERT(isMainThread());
+
+ m_delegate->didFinishHandlingVersionChangeTransaction(transactionIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::abortTransaction(IDBTransaction& transaction)
</del><ins>+void IDBConnectionToServer::abortTransaction(const IDBResourceIdentifier& transactionIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::abortTransaction");
</span><del>- ASSERT(!m_abortingTransactions.contains(transaction.info().identifier()));
- m_abortingTransactions.set(transaction.info().identifier(), &transaction);
</del><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- auto identifier = transaction.info().identifier();
- m_delegate->abortTransaction(identifier);
</del><ins>+ m_delegate->abortTransaction(transactionIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didAbortTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError& error)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didAbortTransaction");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- auto transaction = m_abortingTransactions.take(transactionIdentifier);
- ASSERT(transaction);
-
- transaction->didAbort(error);
</del><ins>+ m_proxy->didAbortTransaction(transactionIdentifier, error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::fireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::fireVersionChangeEvent");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- auto connection = m_databaseConnectionMap.get(databaseConnectionIdentifier);
- if (!connection)
- return;
-
- connection->fireVersionChangeEvent(requestIdentifier, requestedVersion);
</del><ins>+ m_proxy->fireVersionChangeEvent(databaseConnectionIdentifier, requestIdentifier, requestedVersion);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didFireVersionChangeEvent");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><span class="cx"> m_delegate->didFireVersionChangeEvent(databaseConnectionIdentifier, requestIdentifier);
</span><span class="cx"> }
</span><span class="lines">@@ -347,28 +319,25 @@
</span><span class="cx"> void IDBConnectionToServer::didStartTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError& error)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didStartTransaction");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- auto transaction = m_pendingTransactions.take(transactionIdentifier);
- ASSERT(transaction);
-
- transaction->didStart(error);
</del><ins>+ m_proxy->didStartTransaction(transactionIdentifier, error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::notifyOpenDBRequestBlocked(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didStartTransaction");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- auto openDBRequest = m_openDBRequestMap.get(requestIdentifier);
- ASSERT(openDBRequest);
-
- openDBRequest->requestBlocked(oldVersion, newVersion);
</del><ins>+ m_proxy->notifyOpenDBRequestBlocked(requestIdentifier, oldVersion, newVersion);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::databaseConnectionClosed(IDBDatabase& database)
</del><ins>+void IDBConnectionToServer::databaseConnectionClosed(uint64_t databaseConnectionIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::databaseConnectionClosed");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- m_delegate->databaseConnectionClosed(database.databaseConnectionIdentifier());
</del><ins>+ m_delegate->databaseConnectionClosed(databaseConnectionIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
</span><span class="lines">@@ -378,19 +347,6 @@
</span><span class="cx"> m_delegate->abortOpenAndUpgradeNeeded(databaseConnectionIdentifier, transactionIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::registerDatabaseConnection(IDBDatabase& database)
-{
- ASSERT(!m_databaseConnectionMap.contains(database.databaseConnectionIdentifier()));
- m_databaseConnectionMap.set(database.databaseConnectionIdentifier(), &database);
-}
-
-void IDBConnectionToServer::unregisterDatabaseConnection(IDBDatabase& database)
-{
- ASSERT(m_databaseConnectionMap.contains(database.databaseConnectionIdentifier()));
- ASSERT(m_databaseConnectionMap.get(database.databaseConnectionIdentifier()) == &database);
- m_databaseConnectionMap.remove(database.databaseConnectionIdentifier());
-}
-
</del><span class="cx"> void IDBConnectionToServer::saveOperation(TransactionOperation& operation)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_activeOperations.contains(operation.identifier()));
</span><span class="lines">@@ -405,12 +361,6 @@
</span><span class="cx"> operation->completed(resultData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool IDBConnectionToServer::hasRecordOfTransaction(const IDBTransaction& transaction) const
-{
- auto identifier = transaction.info().identifier();
- return m_pendingTransactions.contains(identifier) || m_committingTransactions.contains(identifier) || m_abortingTransactions.contains(identifier);
-}
-
</del><span class="cx"> void IDBConnectionToServer::getAllDatabaseNames(const SecurityOrigin& mainFrameOrigin, const SecurityOrigin& openingOrigin, std::function<void (const Vector<String>&)> callback)
</span><span class="cx"> {
</span><span class="cx"> static uint64_t callbackID = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h (200484 => 200485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2016-05-05 22:14:02 UTC (rev 200484)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2016-05-05 22:14:08 UTC (rev 200485)
</span><span class="lines">@@ -42,9 +42,7 @@
</span><span class="cx"> class IDBDatabase;
</span><span class="cx"> class IDBError;
</span><span class="cx"> class IDBObjectStoreInfo;
</span><del>-class IDBOpenDBRequest;
</del><span class="cx"> class IDBResultData;
</span><del>-class IDBTransaction;
</del><span class="cx"> class IDBValue;
</span><span class="cx">
</span><span class="cx"> namespace IDBClient {
</span><span class="lines">@@ -59,10 +57,10 @@
</span><span class="cx">
</span><span class="cx"> IDBConnectionProxy& proxy();
</span><span class="cx">
</span><del>- void deleteDatabase(IDBOpenDBRequest&);
</del><ins>+ void deleteDatabase(const IDBRequestData&);
</ins><span class="cx"> WEBCORE_EXPORT void didDeleteDatabase(const IDBResultData&);
</span><span class="cx">
</span><del>- void openDatabase(IDBOpenDBRequest&);
</del><ins>+ void openDatabase(const IDBRequestData&);
</ins><span class="cx"> WEBCORE_EXPORT void didOpenDatabase(const IDBResultData&);
</span><span class="cx">
</span><span class="cx"> void createObjectStore(TransactionOperation&, const IDBObjectStoreInfo&);
</span><span class="lines">@@ -98,12 +96,12 @@
</span><span class="cx"> void iterateCursor(TransactionOperation&, const IDBKeyData&, unsigned long count);
</span><span class="cx"> WEBCORE_EXPORT void didIterateCursor(const IDBResultData&);
</span><span class="cx">
</span><del>- void commitTransaction(IDBTransaction&);
</del><ins>+ void commitTransaction(const IDBResourceIdentifier& transactionIdentifier);
</ins><span class="cx"> WEBCORE_EXPORT void didCommitTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&);
</span><span class="cx">
</span><del>- void didFinishHandlingVersionChangeTransaction(IDBTransaction&);
</del><ins>+ void didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier&);
</ins><span class="cx">
</span><del>- void abortTransaction(IDBTransaction&);
</del><ins>+ void abortTransaction(const IDBResourceIdentifier& transactionIdentifier);
</ins><span class="cx"> WEBCORE_EXPORT void didAbortTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void fireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion);
</span><span class="lines">@@ -112,16 +110,13 @@
</span><span class="cx"> WEBCORE_EXPORT void didStartTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&);
</span><span class="cx"> WEBCORE_EXPORT void notifyOpenDBRequestBlocked(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion);
</span><span class="cx">
</span><del>- void establishTransaction(IDBTransaction&);
</del><ins>+ void establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo&);
</ins><span class="cx">
</span><del>- void databaseConnectionClosed(IDBDatabase&);
</del><ins>+ void databaseConnectionClosed(uint64_t databaseConnectionIdentifier);
</ins><span class="cx">
</span><span class="cx"> // To be used when an IDBOpenDBRequest gets a new database connection, optionally with a
</span><span class="cx"> // versionchange transaction, but the page is already torn down.
</span><span class="cx"> void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier);
</span><del>-
- void registerDatabaseConnection(IDBDatabase&);
- void unregisterDatabaseConnection(IDBDatabase&);
</del><span class="cx">
</span><span class="cx"> void getAllDatabaseNames(const SecurityOrigin& mainFrameOrigin, const SecurityOrigin& openingOrigin, std::function<void (const Vector<String>&)>);
</span><span class="cx"> WEBCORE_EXPORT void didGetAllDatabaseNames(uint64_t callbackID, const Vector<String>& databaseNames);
</span><span class="lines">@@ -132,15 +127,8 @@
</span><span class="cx"> void saveOperation(TransactionOperation&);
</span><span class="cx"> void completeOperation(const IDBResultData&);
</span><span class="cx">
</span><del>- bool hasRecordOfTransaction(const IDBTransaction&) const;
-
</del><span class="cx"> Ref<IDBConnectionToServerDelegate> m_delegate;
</span><span class="cx">
</span><del>- HashMap<IDBResourceIdentifier, RefPtr<IDBOpenDBRequest>> m_openDBRequestMap;
- HashMap<uint64_t, IDBDatabase*> m_databaseConnectionMap;
- HashMap<IDBResourceIdentifier, RefPtr<IDBTransaction>> m_pendingTransactions;
- HashMap<IDBResourceIdentifier, RefPtr<IDBTransaction>> m_committingTransactions;
- HashMap<IDBResourceIdentifier, RefPtr<IDBTransaction>> m_abortingTransactions;
</del><span class="cx"> HashMap<IDBResourceIdentifier, RefPtr<TransactionOperation>> m_activeOperations;
</span><span class="cx">
</span><span class="cx"> HashMap<uint64_t, std::function<void (const Vector<String>&)>> m_getAllDatabaseNamesCallbacks;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBRequestDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.cpp (200484 => 200485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.cpp 2016-05-05 22:14:02 UTC (rev 200484)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.cpp 2016-05-05 22:14:08 UTC (rev 200485)
</span><span class="lines">@@ -38,9 +38,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IDBRequestData::IDBRequestData(const IDBClient::IDBConnectionToServer& connection, const IDBOpenDBRequest& request)
- : m_serverConnectionIdentifier(connection.identifier())
- , m_requestIdentifier(std::make_unique<IDBResourceIdentifier>(connection, request))
</del><ins>+IDBRequestData::IDBRequestData(const IDBClient::IDBConnectionProxy& connectionProxy, const IDBOpenDBRequest& request)
+ : m_serverConnectionIdentifier(connectionProxy.serverConnectionIdentifier())
+ , m_requestIdentifier(std::make_unique<IDBResourceIdentifier>(connectionProxy, request))
</ins><span class="cx"> , m_databaseIdentifier(request.databaseIdentifier())
</span><span class="cx"> , m_requestedVersion(request.version())
</span><span class="cx"> , m_requestType(request.requestType())
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBRequestDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h (200484 => 200485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h 2016-05-05 22:14:02 UTC (rev 200484)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h 2016-05-05 22:14:08 UTC (rev 200485)
</span><span class="lines">@@ -42,13 +42,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace IDBClient {
</span><del>-class IDBConnectionToServer;
</del><ins>+class IDBConnectionProxy;
</ins><span class="cx"> class TransactionOperation;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class IDBRequestData {
</span><span class="cx"> public:
</span><del>- IDBRequestData(const IDBClient::IDBConnectionToServer&, const IDBOpenDBRequest&);
</del><ins>+ IDBRequestData(const IDBClient::IDBConnectionProxy&, const IDBOpenDBRequest&);
</ins><span class="cx"> explicit IDBRequestData(IDBClient::TransactionOperation&);
</span><span class="cx"> IDBRequestData(const IDBRequestData&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBResourceIdentifiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp (200484 => 200485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp 2016-05-05 22:14:02 UTC (rev 200484)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp 2016-05-05 22:14:08 UTC (rev 200485)
</span><span class="lines">@@ -72,8 +72,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IDBResourceIdentifier::IDBResourceIdentifier(const IDBClient::IDBConnectionToServer& connection, const IDBRequest& request)
- : m_idbConnectionIdentifier(connection.identifier())
</del><ins>+IDBResourceIdentifier::IDBResourceIdentifier(const IDBClient::IDBConnectionProxy& connectionProxy, const IDBRequest& request)
+ : m_idbConnectionIdentifier(connectionProxy.serverConnectionIdentifier())
</ins><span class="cx"> , m_resourceNumber(request.resourceIdentifier().m_resourceNumber)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBResourceIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h (200484 => 200485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h 2016-05-05 22:14:02 UTC (rev 200484)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h 2016-05-05 22:14:08 UTC (rev 200485)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> class IDBRequest;
</span><span class="cx">
</span><span class="cx"> namespace IDBClient {
</span><ins>+class IDBConnectionProxy;
</ins><span class="cx"> class IDBConnectionToServer;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -44,7 +45,7 @@
</span><span class="cx"> class IDBResourceIdentifier {
</span><span class="cx"> public:
</span><span class="cx"> explicit IDBResourceIdentifier(const IDBClient::IDBConnectionToServer&);
</span><del>- IDBResourceIdentifier(const IDBClient::IDBConnectionToServer&, const IDBRequest&);
</del><ins>+ IDBResourceIdentifier(const IDBClient::IDBConnectionProxy&, const IDBRequest&);
</ins><span class="cx"> explicit IDBResourceIdentifier(const IDBServer::IDBConnectionToClient&);
</span><span class="cx">
</span><span class="cx"> // FIXME: This constructor will be needed during the development of IDB-in-Workers.
</span></span></pre>
</div>
</div>
</body>
</html>