<!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>[200495] 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/200495">200495</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-05-05 16:54:44 -0700 (Thu, 05 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB (Workers): Remove the need for IDBConnectionProxy to expose its IDBConnectionToServer.
https://bugs.webkit.org/show_bug.cgi?id=157394
Reviewed by Alex Christensen.
No new tests (No current change in behavior, will be tested as bug 149953 makes progress).
* Modules/indexeddb/IDBDatabase.cpp:
(WebCore::IDBDatabase::transaction):
(WebCore::IDBDatabase::fireVersionChangeEvent):
(WebCore::IDBDatabase::dispatchEvent):
* Modules/indexeddb/IDBDatabase.h:
(WebCore::IDBDatabase::serverConnection): Deleted.
* Modules/indexeddb/IDBOpenDBRequest.cpp:
(WebCore::IDBOpenDBRequest::requestCompleted):
* Modules/indexeddb/IDBRequest.cpp:
(WebCore::IDBRequest::IDBRequest):
* Modules/indexeddb/IDBTransaction.cpp:
(WebCore::IDBTransaction::connectionProxy):
(WebCore::IDBTransaction::serverConnection): Deleted.
* Modules/indexeddb/IDBTransaction.h:
* Modules/indexeddb/client/IDBConnectionProxy.cpp:
(WebCore::IDBClient::IDBConnectionProxy::abortOpenAndUpgradeNeeded):
(WebCore::IDBClient::IDBConnectionProxy::connectionToServer): Deleted.
* Modules/indexeddb/client/IDBConnectionProxy.h:
* Modules/indexeddb/client/IDBConnectionToServer.cpp:
(WebCore::IDBClient::IDBConnectionToServer::abortOpenAndUpgradeNeeded):
* Modules/indexeddb/client/TransactionOperation.h:
(WebCore::IDBClient::TransactionOperation::TransactionOperation):
* Modules/indexeddb/shared/IDBCursorInfo.cpp:
(WebCore::IDBCursorInfo::IDBCursorInfo):
* Modules/indexeddb/shared/IDBRequestData.cpp:
(WebCore::IDBRequestData::IDBRequestData):
* Modules/indexeddb/shared/IDBResourceIdentifier.cpp:
(WebCore::IDBResourceIdentifier::IDBResourceIdentifier):
* Modules/indexeddb/shared/IDBResourceIdentifier.h:
* Modules/indexeddb/shared/IDBTransactionInfo.cpp:
(WebCore::IDBTransactionInfo::clientTransaction):
* Modules/indexeddb/shared/IDBTransactionInfo.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="#trunkSourceWebCoreModulesindexeddbIDBRequestcpp">trunk/Source/WebCore/Modules/indexeddb/IDBRequest.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="#trunkSourceWebCoreModulesindexeddbclientTransactionOperationh">trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBCursorInfocpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBCursorInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBRequestDatacpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.cpp</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>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBTransactionInfocpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBTransactionInfoh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/ChangeLog 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2016-05-05 Brady Eidson <beidson@apple.com>
+
+ Modern IDB (Workers): Remove the need for IDBConnectionProxy to expose its IDBConnectionToServer.
+ https://bugs.webkit.org/show_bug.cgi?id=157394
+
+ Reviewed by Alex Christensen.
+
+ No new tests (No current change in behavior, will be tested as bug 149953 makes progress).
+
+ * Modules/indexeddb/IDBDatabase.cpp:
+ (WebCore::IDBDatabase::transaction):
+ (WebCore::IDBDatabase::fireVersionChangeEvent):
+ (WebCore::IDBDatabase::dispatchEvent):
+ * Modules/indexeddb/IDBDatabase.h:
+ (WebCore::IDBDatabase::serverConnection): Deleted.
+
+ * Modules/indexeddb/IDBOpenDBRequest.cpp:
+ (WebCore::IDBOpenDBRequest::requestCompleted):
+
+ * Modules/indexeddb/IDBRequest.cpp:
+ (WebCore::IDBRequest::IDBRequest):
+
+ * Modules/indexeddb/IDBTransaction.cpp:
+ (WebCore::IDBTransaction::connectionProxy):
+ (WebCore::IDBTransaction::serverConnection): Deleted.
+ * Modules/indexeddb/IDBTransaction.h:
+
+ * Modules/indexeddb/client/IDBConnectionProxy.cpp:
+ (WebCore::IDBClient::IDBConnectionProxy::abortOpenAndUpgradeNeeded):
+ (WebCore::IDBClient::IDBConnectionProxy::connectionToServer): Deleted.
+ * Modules/indexeddb/client/IDBConnectionProxy.h:
+
+ * Modules/indexeddb/client/IDBConnectionToServer.cpp:
+ (WebCore::IDBClient::IDBConnectionToServer::abortOpenAndUpgradeNeeded):
+
+ * Modules/indexeddb/client/TransactionOperation.h:
+ (WebCore::IDBClient::TransactionOperation::TransactionOperation):
+
+ * Modules/indexeddb/shared/IDBCursorInfo.cpp:
+ (WebCore::IDBCursorInfo::IDBCursorInfo):
+
+ * Modules/indexeddb/shared/IDBRequestData.cpp:
+ (WebCore::IDBRequestData::IDBRequestData):
+
+ * Modules/indexeddb/shared/IDBResourceIdentifier.cpp:
+ (WebCore::IDBResourceIdentifier::IDBResourceIdentifier):
+ * Modules/indexeddb/shared/IDBResourceIdentifier.h:
+
+ * Modules/indexeddb/shared/IDBTransactionInfo.cpp:
+ (WebCore::IDBTransactionInfo::clientTransaction):
+ * Modules/indexeddb/shared/IDBTransactionInfo.h:
+
</ins><span class="cx"> 2016-05-05 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r200479.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto info = IDBTransactionInfo::clientTransaction(m_connectionProxy->connectionToServer(), objectStores, mode);
</del><ins>+ auto info = IDBTransactionInfo::clientTransaction(m_connectionProxy.get(), objectStores, mode);
</ins><span class="cx"> auto transaction = IDBTransaction::create(*this, info);
</span><span class="cx">
</span><span class="cx"> LOG(IndexedDB, "IDBDatabase::transaction - Added active transaction %s", info.identifier().loggingString().utf8().data());
</span><span class="lines">@@ -427,7 +427,7 @@
</span><span class="cx"> ASSERT(currentThread() == m_originThreadID);
</span><span class="cx">
</span><span class="cx"> if (!scriptExecutionContext() || m_closePending) {
</span><del>- serverConnection().didFireVersionChangeEvent(m_databaseConnectionIdentifier, requestIdentifier);
</del><ins>+ connectionProxy().didFireVersionChangeEvent(m_databaseConnectionIdentifier, requestIdentifier);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> bool result = EventTargetWithInlineData::dispatchEvent(event);
</span><span class="cx">
</span><span class="cx"> if (event.isVersionChangeEvent() && event.type() == eventNames().versionchangeEvent)
</span><del>- serverConnection().didFireVersionChangeEvent(m_databaseConnectionIdentifier, downcast<IDBVersionChangeEvent>(event).requestIdentifier());
</del><ins>+ connectionProxy().didFireVersionChangeEvent(m_databaseConnectionIdentifier, downcast<IDBVersionChangeEvent>(event).requestIdentifier());
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -89,9 +89,6 @@
</span><span class="cx">
</span><span class="cx"> IDBClient::IDBConnectionProxy& connectionProxy() { return m_connectionProxy.get(); }
</span><span class="cx">
</span><del>- // FIXME: Remove the need for this accessor.
- IDBClient::IDBConnectionToServer& serverConnection() { return m_connectionProxy->connectionToServer(); }
-
</del><span class="cx"> void didCreateIndexInfo(const IDBIndexInfo&);
</span><span class="cx"> void didDeleteIndexInfo(const IDBIndexInfo&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBOpenDBRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -184,10 +184,10 @@
</span><span class="cx"> if (m_contextStopped) {
</span><span class="cx"> switch (data.type()) {
</span><span class="cx"> case IDBResultType::OpenDatabaseSuccess:
</span><del>- connectionProxy().connectionToServer().abortOpenAndUpgradeNeeded(data.databaseConnectionIdentifier(), IDBResourceIdentifier::emptyValue());
</del><ins>+ connectionProxy().abortOpenAndUpgradeNeeded(data.databaseConnectionIdentifier(), IDBResourceIdentifier::emptyValue());
</ins><span class="cx"> break;
</span><span class="cx"> case IDBResultType::OpenDatabaseUpgradeNeeded:
</span><del>- connectionProxy().connectionToServer().abortOpenAndUpgradeNeeded(data.databaseConnectionIdentifier(), data.transactionInfo().identifier());
</del><ins>+ connectionProxy().abortOpenAndUpgradeNeeded(data.databaseConnectionIdentifier(), data.transactionInfo().identifier());
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> IDBRequest::IDBRequest(ScriptExecutionContext& context, IDBObjectStore& objectStore, IDBTransaction& transaction)
</span><span class="cx"> : ActiveDOMObject(&context)
</span><span class="cx"> , m_transaction(&transaction)
</span><del>- , m_resourceIdentifier(transaction.serverConnection())
</del><ins>+ , m_resourceIdentifier(transaction.connectionProxy())
</ins><span class="cx"> , m_objectStoreSource(&objectStore)
</span><span class="cx"> , m_connectionProxy(transaction.database().connectionProxy())
</span><span class="cx"> {
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> IDBRequest::IDBRequest(ScriptExecutionContext& context, IDBCursor& cursor, IDBTransaction& transaction)
</span><span class="cx"> : ActiveDOMObject(&context)
</span><span class="cx"> , m_transaction(&transaction)
</span><del>- , m_resourceIdentifier(transaction.serverConnection())
</del><ins>+ , m_resourceIdentifier(transaction.connectionProxy())
</ins><span class="cx"> , m_objectStoreSource(cursor.objectStore())
</span><span class="cx"> , m_indexSource(cursor.index())
</span><span class="cx"> , m_pendingCursor(&cursor)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> IDBRequest::IDBRequest(ScriptExecutionContext& context, IDBIndex& index, IDBTransaction& transaction)
</span><span class="cx"> : ActiveDOMObject(&context)
</span><span class="cx"> , m_transaction(&transaction)
</span><del>- , m_resourceIdentifier(transaction.serverConnection())
</del><ins>+ , m_resourceIdentifier(transaction.connectionProxy())
</ins><span class="cx"> , m_indexSource(&index)
</span><span class="cx"> , m_connectionProxy(transaction.database().connectionProxy())
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -157,6 +157,11 @@
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+IDBClient::IDBConnectionProxy& IDBTransaction::connectionProxy()
+{
+ return m_database->connectionProxy();
+}
+
</ins><span class="cx"> const String& IDBTransaction::mode() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="lines">@@ -179,12 +184,6 @@
</span><span class="cx"> return &m_database.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IDBClient::IDBConnectionToServer& IDBTransaction::serverConnection()
-{
- ASSERT(currentThread() == m_database->originThreadID());
- return m_database->serverConnection();
-}
-
</del><span class="cx"> RefPtr<DOMError> IDBTransaction::error() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> struct IDBKeyRangeData;
</span><span class="cx">
</span><span class="cx"> namespace IDBClient {
</span><ins>+class IDBConnectionProxy;
</ins><span class="cx"> class TransactionOperation;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -132,8 +133,6 @@
</span><span class="cx">
</span><span class="cx"> void abortDueToFailedRequest(DOMError&);
</span><span class="cx">
</span><del>- IDBClient::IDBConnectionToServer& serverConnection();
-
</del><span class="cx"> void activate();
</span><span class="cx"> void deactivate();
</span><span class="cx">
</span><span class="lines">@@ -142,6 +141,8 @@
</span><span class="cx"> bool isFinishedOrFinishing() const;
</span><span class="cx"> bool isFinished() const { return m_state == IndexedDB::TransactionState::Finished; }
</span><span class="cx">
</span><ins>+ IDBClient::IDBConnectionProxy& connectionProxy();
+
</ins><span class="cx"> private:
</span><span class="cx"> IDBTransaction(IDBDatabase&, const IDBTransactionInfo&, IDBOpenDBRequest*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -55,15 +55,6 @@
</span><span class="cx"> m_connectionToServer.deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: Temporarily required during bringup of IDB-in-Workers.
-// Once all IDB object reliance on the IDBConnectionToServer has been shifted to reliance on
-// IDBConnectionProxy, remove this.
-IDBConnectionToServer& IDBConnectionProxy::connectionToServer()
-{
- ASSERT(isMainThread());
- return m_connectionToServer;
-}
-
</del><span class="cx"> RefPtr<IDBOpenDBRequest> IDBConnectionProxy::openDatabase(ScriptExecutionContext& context, const IDBDatabaseIdentifier& databaseIdentifier, uint64_t version)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Handle Workers
</span><span class="lines">@@ -267,6 +258,15 @@
</span><span class="cx"> operation->completed(resultData);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBConnectionProxy::abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
+{
+ // FIXME: Handle workers
+ if (!isMainThread())
+ return;
+
+ m_connectionToServer.abortOpenAndUpgradeNeeded(databaseConnectionIdentifier, transactionIdentifier);
+}
+
</ins><span class="cx"> void IDBConnectionProxy::fireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -89,15 +89,12 @@
</span><span class="cx"> void didFinishHandlingVersionChangeTransaction(IDBTransaction&);
</span><span class="cx"> void databaseConnectionClosed(IDBDatabase&);
</span><span class="cx">
</span><ins>+ void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier);
+
</ins><span class="cx"> void completeOperation(const IDBResultData&);
</span><span class="cx">
</span><span class="cx"> uint64_t serverConnectionIdentifier() const { return m_serverConnectionIdentifier; }
</span><span class="cx">
</span><del>- // FIXME: Temporarily required during bringup of IDB-in-Workers.
- // Once all IDB object reliance on the IDBConnectionToServer has been shifted to reliance on
- // IDBConnectionProxy, remove this.
- IDBConnectionToServer& connectionToServer();
-
</del><span class="cx"> void ref();
</span><span class="cx"> void deref();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -335,6 +335,7 @@
</span><span class="cx"> void IDBConnectionToServer::abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::abortOpenAndUpgradeNeeded");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><span class="cx"> m_delegate->abortOpenAndUpgradeNeeded(databaseConnectionIdentifier, transactionIdentifier);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientTransactionOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> protected:
</span><span class="cx"> TransactionOperation(IDBTransaction& transaction)
</span><span class="cx"> : m_transaction(transaction)
</span><del>- , m_identifier(transaction.serverConnection())
</del><ins>+ , m_identifier(transaction.connectionProxy())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBCursorInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBCursorInfo.cpp (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBCursorInfo.cpp 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBCursorInfo.cpp 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -28,6 +28,7 @@
</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 "IDBTransaction.h"
</span><span class="cx"> #include "IndexedDB.h"
</span><span class="cx">
</span><span class="lines">@@ -48,7 +49,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBCursorInfo::IDBCursorInfo(IDBTransaction& transaction, uint64_t objectStoreIdentifier, const IDBKeyRangeData& range, IndexedDB::CursorDirection direction, IndexedDB::CursorType type)
</span><del>- : m_cursorIdentifier(transaction.serverConnection())
</del><ins>+ : m_cursorIdentifier(transaction.database().connectionProxy())
</ins><span class="cx"> , m_transactionIdentifier(transaction.info().identifier())
</span><span class="cx"> , m_objectStoreIdentifier(objectStoreIdentifier)
</span><span class="cx"> , m_sourceIdentifier(objectStoreIdentifier)
</span><span class="lines">@@ -60,7 +61,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBCursorInfo::IDBCursorInfo(IDBTransaction& transaction, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const IDBKeyRangeData& range, IndexedDB::CursorDirection direction, IndexedDB::CursorType type)
</span><del>- : m_cursorIdentifier(transaction.serverConnection())
</del><ins>+ : m_cursorIdentifier(transaction.database().connectionProxy())
</ins><span class="cx"> , m_transactionIdentifier(transaction.info().identifier())
</span><span class="cx"> , m_objectStoreIdentifier(objectStoreIdentifier)
</span><span class="cx"> , m_sourceIdentifier(indexIdentifier)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBRequestDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.cpp (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.cpp 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.cpp 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBRequestData::IDBRequestData(IDBClient::TransactionOperation& operation)
</span><del>- : m_serverConnectionIdentifier(operation.transaction().database().serverConnection().identifier())
</del><ins>+ : m_serverConnectionIdentifier(operation.transaction().database().connectionProxy().serverConnectionIdentifier())
</ins><span class="cx"> , m_requestIdentifier(std::make_unique<IDBResourceIdentifier>(operation.identifier()))
</span><span class="cx"> , m_transactionIdentifier(std::make_unique<IDBResourceIdentifier>(operation.transactionIdentifier()))
</span><span class="cx"> , m_objectStoreIdentifier(operation.objectStoreIdentifier())
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBResourceIdentifiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -66,8 +66,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IDBResourceIdentifier::IDBResourceIdentifier(const IDBClient::IDBConnectionToServer& connection)
- : m_idbConnectionIdentifier(connection.identifier())
</del><ins>+IDBResourceIdentifier::IDBResourceIdentifier(const IDBClient::IDBConnectionProxy& connectionProxy)
+ : m_idbConnectionIdentifier(connectionProxy.serverConnectionIdentifier())
</ins><span class="cx"> , m_resourceNumber(nextClientResourceNumber())
</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 (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx">
</span><span class="cx"> namespace IDBClient {
</span><span class="cx"> class IDBConnectionProxy;
</span><del>-class IDBConnectionToServer;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace IDBServer {
</span><span class="lines">@@ -44,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> class IDBResourceIdentifier {
</span><span class="cx"> public:
</span><del>- explicit IDBResourceIdentifier(const IDBClient::IDBConnectionToServer&);
</del><ins>+ explicit IDBResourceIdentifier(const IDBClient::IDBConnectionProxy&);
</ins><span class="cx"> IDBResourceIdentifier(const IDBClient::IDBConnectionProxy&, const IDBRequest&);
</span><span class="cx"> explicit IDBResourceIdentifier(const IDBServer::IDBConnectionToClient&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBTransactionInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -41,9 +41,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IDBTransactionInfo IDBTransactionInfo::clientTransaction(const IDBClient::IDBConnectionToServer& connection, const Vector<String>& objectStores, IndexedDB::TransactionMode mode)
</del><ins>+IDBTransactionInfo IDBTransactionInfo::clientTransaction(const IDBClient::IDBConnectionProxy& connectionProxy, const Vector<String>& objectStores, IndexedDB::TransactionMode mode)
</ins><span class="cx"> {
</span><del>- IDBTransactionInfo result((IDBResourceIdentifier(connection)));
</del><ins>+ IDBTransactionInfo result((IDBResourceIdentifier(connectionProxy)));
</ins><span class="cx"> result.m_mode = mode;
</span><span class="cx"> result.m_objectStores = objectStores;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBTransactionInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h (200494 => 200495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h 2016-05-05 23:30:21 UTC (rev 200494)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h 2016-05-05 23:54:44 UTC (rev 200495)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> namespace IDBClient {
</span><del>-class IDBConnectionToServer;
</del><ins>+class IDBConnectionProxy;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace IDBServer {
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> class IDBTransactionInfo {
</span><span class="cx"> public:
</span><del>- static IDBTransactionInfo clientTransaction(const IDBClient::IDBConnectionToServer&, const Vector<String>& objectStores, IndexedDB::TransactionMode);
</del><ins>+ static IDBTransactionInfo clientTransaction(const IDBClient::IDBConnectionProxy&, const Vector<String>& objectStores, IndexedDB::TransactionMode);
</ins><span class="cx"> static IDBTransactionInfo versionChange(const IDBServer::IDBConnectionToClient&, const IDBDatabaseInfo& originalDatabaseInfo, uint64_t newVersion);
</span><span class="cx">
</span><span class="cx"> IDBTransactionInfo(const IDBTransactionInfo&);
</span></span></pre>
</div>
</div>
</body>
</html>