<!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>[200489] 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/200489">200489</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-05-05 16:11:13 -0700 (Thu, 05 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB (Workers): Move TransactionOperation management from IDBConnectionToServer to IDBConnectionProxy.
https://bugs.webkit.org/show_bug.cgi?id=157392
Reviewed by Alex Christensen.
No new tests (No current change in behavior, will be tested as bug 149953 makes progress).
Set up TransactionOperations on the IDBConnectionProxy instead of the IDBConnectionToServer:
* Modules/indexeddb/IDBTransaction.cpp:
(WebCore::IDBTransaction::createObjectStoreOnServer):
(WebCore::IDBTransaction::createIndexOnServer):
(WebCore::IDBTransaction::openCursorOnServer):
(WebCore::IDBTransaction::iterateCursorOnServer):
(WebCore::IDBTransaction::getRecordOnServer):
(WebCore::IDBTransaction::getCountOnServer):
(WebCore::IDBTransaction::deleteRecordOnServer):
(WebCore::IDBTransaction::clearObjectStoreOnServer):
(WebCore::IDBTransaction::putOrAddOnServer):
(WebCore::IDBTransaction::deleteObjectStoreOnServer):
(WebCore::IDBTransaction::deleteIndexOnServer):
IDBConnectionProxy is now the owner of dispatched TransactionOperations:
* Modules/indexeddb/client/IDBConnectionProxy.cpp:
(WebCore::IDBClient::IDBConnectionProxy::createObjectStore):
(WebCore::IDBClient::IDBConnectionProxy::deleteObjectStore):
(WebCore::IDBClient::IDBConnectionProxy::clearObjectStore):
(WebCore::IDBClient::IDBConnectionProxy::createIndex):
(WebCore::IDBClient::IDBConnectionProxy::deleteIndex):
(WebCore::IDBClient::IDBConnectionProxy::putOrAdd):
(WebCore::IDBClient::IDBConnectionProxy::getRecord):
(WebCore::IDBClient::IDBConnectionProxy::getCount):
(WebCore::IDBClient::IDBConnectionProxy::deleteRecord):
(WebCore::IDBClient::IDBConnectionProxy::openCursor):
(WebCore::IDBClient::IDBConnectionProxy::iterateCursor):
(WebCore::IDBClient::IDBConnectionProxy::saveOperation):
(WebCore::IDBClient::IDBConnectionProxy::completeOperation):
* Modules/indexeddb/client/IDBConnectionProxy.h:
Proxy this in-and-out calls to the ConnectionProxy:
* Modules/indexeddb/client/IDBConnectionToServer.cpp:
(WebCore::IDBClient::IDBConnectionToServer::createObjectStore):
(WebCore::IDBClient::IDBConnectionToServer::didCreateObjectStore):
(WebCore::IDBClient::IDBConnectionToServer::deleteObjectStore):
(WebCore::IDBClient::IDBConnectionToServer::didDeleteObjectStore):
(WebCore::IDBClient::IDBConnectionToServer::clearObjectStore):
(WebCore::IDBClient::IDBConnectionToServer::didClearObjectStore):
(WebCore::IDBClient::IDBConnectionToServer::createIndex):
(WebCore::IDBClient::IDBConnectionToServer::didCreateIndex):
(WebCore::IDBClient::IDBConnectionToServer::deleteIndex):
(WebCore::IDBClient::IDBConnectionToServer::didDeleteIndex):
(WebCore::IDBClient::IDBConnectionToServer::putOrAdd):
(WebCore::IDBClient::IDBConnectionToServer::didPutOrAdd):
(WebCore::IDBClient::IDBConnectionToServer::getRecord):
(WebCore::IDBClient::IDBConnectionToServer::didGetRecord):
(WebCore::IDBClient::IDBConnectionToServer::getCount):
(WebCore::IDBClient::IDBConnectionToServer::didGetCount):
(WebCore::IDBClient::IDBConnectionToServer::deleteRecord):
(WebCore::IDBClient::IDBConnectionToServer::didDeleteRecord):
(WebCore::IDBClient::IDBConnectionToServer::openCursor):
(WebCore::IDBClient::IDBConnectionToServer::didOpenCursor):
(WebCore::IDBClient::IDBConnectionToServer::iterateCursor):
(WebCore::IDBClient::IDBConnectionToServer::didIterateCursor):
(WebCore::IDBClient::IDBConnectionToServer::saveOperation): Deleted.
(WebCore::IDBClient::IDBConnectionToServer::completeOperation): Deleted.
* Modules/indexeddb/client/IDBConnectionToServer.h:
- Give TransactionOperation a ThreadIdentifier member
- Privatize most public methods from TransactionOperation
- Make IDBRequestData a friend so it can get at the private methods
* Modules/indexeddb/client/TransactionOperation.h:
(WebCore::IDBClient::TransactionOperation::~TransactionOperation):
(WebCore::IDBClient::TransactionOperation::perform):
(WebCore::IDBClient::TransactionOperation::completed):
(WebCore::IDBClient::TransactionOperation::originThreadID):
(WebCore::IDBClient::TransactionOperation::transactionIdentifier):
(WebCore::IDBClient::TransactionOperation::objectStoreIdentifier):
(WebCore::IDBClient::TransactionOperation::indexIdentifier):
(WebCore::IDBClient::TransactionOperation::cursorIdentifier):
(WebCore::IDBClient::TransactionOperation::transaction):
(WebCore::IDBClient::TransactionOperation::indexRecordType):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactioncpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp</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="#trunkSourceWebCoreModulesindexeddbclientTransactionOperationh">trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200488 => 200489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-05 23:05:37 UTC (rev 200488)
+++ trunk/Source/WebCore/ChangeLog 2016-05-05 23:11:13 UTC (rev 200489)
</span><span class="lines">@@ -1,3 +1,86 @@
</span><ins>+2016-05-05 Brady Eidson <beidson@apple.com>
+
+ Modern IDB (Workers): Move TransactionOperation management from IDBConnectionToServer to IDBConnectionProxy.
+ https://bugs.webkit.org/show_bug.cgi?id=157392
+
+ Reviewed by Alex Christensen.
+
+ No new tests (No current change in behavior, will be tested as bug 149953 makes progress).
+
+ Set up TransactionOperations on the IDBConnectionProxy instead of the IDBConnectionToServer:
+ * Modules/indexeddb/IDBTransaction.cpp:
+ (WebCore::IDBTransaction::createObjectStoreOnServer):
+ (WebCore::IDBTransaction::createIndexOnServer):
+ (WebCore::IDBTransaction::openCursorOnServer):
+ (WebCore::IDBTransaction::iterateCursorOnServer):
+ (WebCore::IDBTransaction::getRecordOnServer):
+ (WebCore::IDBTransaction::getCountOnServer):
+ (WebCore::IDBTransaction::deleteRecordOnServer):
+ (WebCore::IDBTransaction::clearObjectStoreOnServer):
+ (WebCore::IDBTransaction::putOrAddOnServer):
+ (WebCore::IDBTransaction::deleteObjectStoreOnServer):
+ (WebCore::IDBTransaction::deleteIndexOnServer):
+
+ IDBConnectionProxy is now the owner of dispatched TransactionOperations:
+ * Modules/indexeddb/client/IDBConnectionProxy.cpp:
+ (WebCore::IDBClient::IDBConnectionProxy::createObjectStore):
+ (WebCore::IDBClient::IDBConnectionProxy::deleteObjectStore):
+ (WebCore::IDBClient::IDBConnectionProxy::clearObjectStore):
+ (WebCore::IDBClient::IDBConnectionProxy::createIndex):
+ (WebCore::IDBClient::IDBConnectionProxy::deleteIndex):
+ (WebCore::IDBClient::IDBConnectionProxy::putOrAdd):
+ (WebCore::IDBClient::IDBConnectionProxy::getRecord):
+ (WebCore::IDBClient::IDBConnectionProxy::getCount):
+ (WebCore::IDBClient::IDBConnectionProxy::deleteRecord):
+ (WebCore::IDBClient::IDBConnectionProxy::openCursor):
+ (WebCore::IDBClient::IDBConnectionProxy::iterateCursor):
+ (WebCore::IDBClient::IDBConnectionProxy::saveOperation):
+ (WebCore::IDBClient::IDBConnectionProxy::completeOperation):
+ * Modules/indexeddb/client/IDBConnectionProxy.h:
+
+ Proxy this in-and-out calls to the ConnectionProxy:
+ * Modules/indexeddb/client/IDBConnectionToServer.cpp:
+ (WebCore::IDBClient::IDBConnectionToServer::createObjectStore):
+ (WebCore::IDBClient::IDBConnectionToServer::didCreateObjectStore):
+ (WebCore::IDBClient::IDBConnectionToServer::deleteObjectStore):
+ (WebCore::IDBClient::IDBConnectionToServer::didDeleteObjectStore):
+ (WebCore::IDBClient::IDBConnectionToServer::clearObjectStore):
+ (WebCore::IDBClient::IDBConnectionToServer::didClearObjectStore):
+ (WebCore::IDBClient::IDBConnectionToServer::createIndex):
+ (WebCore::IDBClient::IDBConnectionToServer::didCreateIndex):
+ (WebCore::IDBClient::IDBConnectionToServer::deleteIndex):
+ (WebCore::IDBClient::IDBConnectionToServer::didDeleteIndex):
+ (WebCore::IDBClient::IDBConnectionToServer::putOrAdd):
+ (WebCore::IDBClient::IDBConnectionToServer::didPutOrAdd):
+ (WebCore::IDBClient::IDBConnectionToServer::getRecord):
+ (WebCore::IDBClient::IDBConnectionToServer::didGetRecord):
+ (WebCore::IDBClient::IDBConnectionToServer::getCount):
+ (WebCore::IDBClient::IDBConnectionToServer::didGetCount):
+ (WebCore::IDBClient::IDBConnectionToServer::deleteRecord):
+ (WebCore::IDBClient::IDBConnectionToServer::didDeleteRecord):
+ (WebCore::IDBClient::IDBConnectionToServer::openCursor):
+ (WebCore::IDBClient::IDBConnectionToServer::didOpenCursor):
+ (WebCore::IDBClient::IDBConnectionToServer::iterateCursor):
+ (WebCore::IDBClient::IDBConnectionToServer::didIterateCursor):
+ (WebCore::IDBClient::IDBConnectionToServer::saveOperation): Deleted.
+ (WebCore::IDBClient::IDBConnectionToServer::completeOperation): Deleted.
+ * Modules/indexeddb/client/IDBConnectionToServer.h:
+
+ - Give TransactionOperation a ThreadIdentifier member
+ - Privatize most public methods from TransactionOperation
+ - Make IDBRequestData a friend so it can get at the private methods
+ * Modules/indexeddb/client/TransactionOperation.h:
+ (WebCore::IDBClient::TransactionOperation::~TransactionOperation):
+ (WebCore::IDBClient::TransactionOperation::perform):
+ (WebCore::IDBClient::TransactionOperation::completed):
+ (WebCore::IDBClient::TransactionOperation::originThreadID):
+ (WebCore::IDBClient::TransactionOperation::transactionIdentifier):
+ (WebCore::IDBClient::TransactionOperation::objectStoreIdentifier):
+ (WebCore::IDBClient::TransactionOperation::indexIdentifier):
+ (WebCore::IDBClient::TransactionOperation::cursorIdentifier):
+ (WebCore::IDBClient::TransactionOperation::transaction):
+ (WebCore::IDBClient::TransactionOperation::indexRecordType):
+
</ins><span class="cx"> 2016-05-05 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not attempt to compute min/max width.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (200488 => 200489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-05-05 23:05:37 UTC (rev 200488)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-05-05 23:11:13 UTC (rev 200489)
</span><span class="lines">@@ -588,7 +588,7 @@
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx"> ASSERT(isVersionChange());
</span><span class="cx">
</span><del>- m_database->serverConnection().createObjectStore(operation, info);
</del><ins>+ m_database->connectionProxy().createObjectStore(operation, info);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::didCreateObjectStoreOnServer(const IDBResultData& resultData)
</span><span class="lines">@@ -619,7 +619,7 @@
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx"> ASSERT(isVersionChange());
</span><span class="cx">
</span><del>- m_database->serverConnection().createIndex(operation, info);
</del><ins>+ m_database->connectionProxy().createIndex(operation, info);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::didCreateIndexOnServer(const IDBResultData& resultData)
</span><span class="lines">@@ -678,7 +678,7 @@
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::openCursorOnServer");
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- m_database->serverConnection().openCursor(operation, info);
</del><ins>+ m_database->connectionProxy().openCursor(operation, info);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::didOpenCursorOnServer(IDBRequest& request, const IDBResultData& resultData)
</span><span class="lines">@@ -707,7 +707,7 @@
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::iterateCursorOnServer");
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- serverConnection().iterateCursor(operation, key, count);
</del><ins>+ m_database->connectionProxy().iterateCursor(operation, key, count);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::didIterateCursorOnServer(IDBRequest& request, const IDBResultData& resultData)
</span><span class="lines">@@ -771,7 +771,7 @@
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::getRecordOnServer");
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- serverConnection().getRecord(operation, keyRange);
</del><ins>+ m_database->connectionProxy().getRecord(operation, keyRange);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::didGetRecordOnServer(IDBRequest& request, const IDBResultData& resultData)
</span><span class="lines">@@ -838,7 +838,7 @@
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::getCountOnServer");
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- serverConnection().getCount(operation, keyRange);
</del><ins>+ m_database->connectionProxy().getCount(operation, keyRange);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::didGetCountOnServer(IDBRequest& request, const IDBResultData& resultData)
</span><span class="lines">@@ -869,7 +869,7 @@
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::deleteRecordOnServer");
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- serverConnection().deleteRecord(operation, keyRange);
</del><ins>+ m_database->connectionProxy().deleteRecord(operation, keyRange);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::didDeleteRecordOnServer(IDBRequest& request, const IDBResultData& resultData)
</span><span class="lines">@@ -902,7 +902,7 @@
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::clearObjectStoreOnServer");
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- serverConnection().clearObjectStore(operation, objectStoreIdentifier);
</del><ins>+ m_database->connectionProxy().clearObjectStore(operation, objectStoreIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::didClearObjectStoreOnServer(IDBRequest& request, const IDBResultData& resultData)
</span><span class="lines">@@ -939,7 +939,7 @@
</span><span class="cx"> ASSERT(value);
</span><span class="cx">
</span><span class="cx"> if (!value->hasBlobURLs()) {
</span><del>- serverConnection().putOrAdd(operation, key.get(), *value, overwriteMode);
</del><ins>+ m_database->connectionProxy().putOrAdd(operation, key.get(), *value, overwriteMode);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -947,7 +947,7 @@
</span><span class="cx"> RefPtr<IDBClient::TransactionOperation> operationRef(&operation);
</span><span class="cx"> value->writeBlobsToDiskForIndexedDB([protector, this, operationRef, key, value, overwriteMode](const IDBValue& idbValue) {
</span><span class="cx"> if (idbValue.data().data()) {
</span><del>- serverConnection().putOrAdd(*operationRef, key.get(), idbValue, overwriteMode);
</del><ins>+ m_database->connectionProxy().putOrAdd(*operationRef, key.get(), idbValue, overwriteMode);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -991,7 +991,7 @@
</span><span class="cx"> ASSERT(isVersionChange());
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- serverConnection().deleteObjectStore(operation, objectStoreName);
</del><ins>+ m_database->connectionProxy().deleteObjectStore(operation, objectStoreName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::didDeleteObjectStoreOnServer(const IDBResultData& resultData)
</span><span class="lines">@@ -1017,7 +1017,7 @@
</span><span class="cx"> ASSERT(isVersionChange());
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- serverConnection().deleteIndex(operation, objectStoreIdentifier, indexName);
</del><ins>+ m_database->connectionProxy().deleteIndex(operation, objectStoreIdentifier, indexName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::didDeleteIndexOnServer(const IDBResultData& resultData)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp (200488 => 200489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-05-05 23:05:37 UTC (rev 200488)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-05-05 23:11:13 UTC (rev 200489)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "IDBOpenDBRequest.h"
</span><span class="cx"> #include "IDBRequestData.h"
</span><span class="cx"> #include "IDBResultData.h"
</span><ins>+#include "SecurityOrigin.h"
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -133,6 +134,139 @@
</span><span class="cx"> request->requestCompleted(resultData);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBConnectionProxy::createObjectStore(TransactionOperation& operation, const IDBObjectStoreInfo& info)
+{
+ IDBRequestData requestData(operation);
+ saveOperation(operation);
+
+ // FIXME: Handle worker thread marshalling.
+
+ m_connectionToServer.createObjectStore(requestData, info);
+}
+
+void IDBConnectionProxy::deleteObjectStore(TransactionOperation& operation, const String& objectStoreName)
+{
+ IDBRequestData requestData(operation);
+ saveOperation(operation);
+
+ // FIXME: Handle worker thread marshalling.
+
+ m_connectionToServer.deleteObjectStore(requestData, objectStoreName);
+}
+
+void IDBConnectionProxy::clearObjectStore(TransactionOperation& operation, uint64_t objectStoreIdentifier)
+{
+ IDBRequestData requestData(operation);
+ saveOperation(operation);
+
+ // FIXME: Handle worker thread marshalling.
+
+ m_connectionToServer.clearObjectStore(requestData, objectStoreIdentifier);
+}
+
+void IDBConnectionProxy::createIndex(TransactionOperation& operation, const IDBIndexInfo& info)
+{
+ IDBRequestData requestData(operation);
+ saveOperation(operation);
+
+ // FIXME: Handle worker thread marshalling.
+
+ m_connectionToServer.createIndex(requestData, info);
+}
+
+void IDBConnectionProxy::deleteIndex(TransactionOperation& operation, uint64_t objectStoreIdentifier, const String& indexName)
+{
+ IDBRequestData requestData(operation);
+ saveOperation(operation);
+
+ // FIXME: Handle worker thread marshalling.
+
+ m_connectionToServer.deleteIndex(requestData, objectStoreIdentifier, indexName);
+}
+
+void IDBConnectionProxy::putOrAdd(TransactionOperation& operation, IDBKey* key, const IDBValue& value, const IndexedDB::ObjectStoreOverwriteMode mode)
+{
+ IDBRequestData requestData(operation);
+ saveOperation(operation);
+
+ // FIXME: Handle worker thread marshalling.
+
+ m_connectionToServer.putOrAdd(requestData, key, value, mode);
+}
+
+void IDBConnectionProxy::getRecord(TransactionOperation& operation, const IDBKeyRangeData& keyRange)
+{
+ IDBRequestData requestData(operation);
+ saveOperation(operation);
+
+ // FIXME: Handle worker thread marshalling.
+
+ m_connectionToServer.getRecord(requestData, keyRange);
+}
+
+void IDBConnectionProxy::getCount(TransactionOperation& operation, const IDBKeyRangeData& keyRange)
+{
+ IDBRequestData requestData(operation);
+ saveOperation(operation);
+
+ // FIXME: Handle worker thread marshalling.
+
+ m_connectionToServer.getCount(requestData, keyRange);
+}
+
+void IDBConnectionProxy::deleteRecord(TransactionOperation& operation, const IDBKeyRangeData& keyRange)
+{
+ IDBRequestData requestData(operation);
+ saveOperation(operation);
+
+ // FIXME: Handle worker thread marshalling.
+
+ m_connectionToServer.deleteRecord(requestData, keyRange);
+}
+
+void IDBConnectionProxy::openCursor(TransactionOperation& operation, const IDBCursorInfo& info)
+{
+ IDBRequestData requestData(operation);
+ saveOperation(operation);
+
+ // FIXME: Handle worker thread marshalling.
+
+ m_connectionToServer.openCursor(requestData, info);
+}
+
+void IDBConnectionProxy::iterateCursor(TransactionOperation& operation, const IDBKeyData& key, unsigned long count)
+{
+ IDBRequestData requestData(operation);
+ saveOperation(operation);
+
+ // FIXME: Handle worker thread marshalling.
+
+ m_connectionToServer.iterateCursor(requestData, key, count);
+}
+
+void IDBConnectionProxy::saveOperation(TransactionOperation& operation)
+{
+ Locker<Lock> locker(m_transactionOperationLock);
+
+ ASSERT(!m_activeOperations.contains(operation.identifier()));
+ m_activeOperations.set(operation.identifier(), &operation);
+}
+
+void IDBConnectionProxy::completeOperation(const IDBResultData& resultData)
+{
+ RefPtr<TransactionOperation> operation;
+ {
+ Locker<Lock> locker(m_transactionOperationLock);
+ operation = m_activeOperations.take(resultData.requestIdentifier());
+ }
+
+ ASSERT(operation);
+
+ // FIXME: Handle getting operation->completed() onto the correct thread via the IDBTransaction.
+
+ operation->completed(resultData);
+}
+
</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 (200488 => 200489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-05-05 23:05:37 UTC (rev 200488)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-05-05 23:11:13 UTC (rev 200489)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "IDBConnectionToServer.h"
</span><span class="cx"> #include "IDBResourceIdentifier.h"
</span><ins>+#include "TransactionOperation.h"
</ins><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -60,6 +61,18 @@
</span><span class="cx"> RefPtr<IDBOpenDBRequest> deleteDatabase(ScriptExecutionContext&, const IDBDatabaseIdentifier&);
</span><span class="cx"> void didDeleteDatabase(const IDBResultData&);
</span><span class="cx">
</span><ins>+ void createObjectStore(TransactionOperation&, const IDBObjectStoreInfo&);
+ void deleteObjectStore(TransactionOperation&, const String& objectStoreName);
+ void clearObjectStore(TransactionOperation&, uint64_t objectStoreIdentifier);
+ void createIndex(TransactionOperation&, const IDBIndexInfo&);
+ void deleteIndex(TransactionOperation&, uint64_t objectStoreIdentifier, const String& indexName);
+ void putOrAdd(TransactionOperation&, IDBKey*, const IDBValue&, const IndexedDB::ObjectStoreOverwriteMode);
+ void getRecord(TransactionOperation&, const IDBKeyRangeData&);
+ void getCount(TransactionOperation&, const IDBKeyRangeData&);
+ void deleteRecord(TransactionOperation&, const IDBKeyRangeData&);
+ void openCursor(TransactionOperation&, const IDBCursorInfo&);
+ void iterateCursor(TransactionOperation&, const IDBKeyData&, unsigned long count);
+
</ins><span class="cx"> void fireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion);
</span><span class="cx"> void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier);
</span><span class="cx">
</span><span class="lines">@@ -76,6 +89,8 @@
</span><span class="cx"> void didFinishHandlingVersionChangeTransaction(IDBTransaction&);
</span><span class="cx"> void databaseConnectionClosed(IDBDatabase&);
</span><span class="cx">
</span><ins>+ void completeOperation(const IDBResultData&);
+
</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">@@ -95,6 +110,8 @@
</span><span class="cx"> void completeOpenDBRequest(const IDBResultData&);
</span><span class="cx"> bool hasRecordOfTransaction(const IDBTransaction&) const;
</span><span class="cx">
</span><ins>+ void saveOperation(TransactionOperation&);
+
</ins><span class="cx"> IDBConnectionToServer& m_connectionToServer;
</span><span class="cx"> uint64_t m_serverConnectionIdentifier;
</span><span class="cx">
</span><span class="lines">@@ -108,6 +125,9 @@
</span><span class="cx"> HashMap<IDBResourceIdentifier, RefPtr<IDBTransaction>> m_committingTransactions;
</span><span class="cx"> HashMap<IDBResourceIdentifier, RefPtr<IDBTransaction>> m_abortingTransactions;
</span><span class="cx"> Lock m_transactionMapLock;
</span><ins>+
+ HashMap<IDBResourceIdentifier, RefPtr<TransactionOperation>> m_activeOperations;
+ Lock m_transactionOperationLock;
</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 (200488 => 200489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2016-05-05 23:05:37 UTC (rev 200488)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2016-05-05 23:11:13 UTC (rev 200489)
</span><span class="lines">@@ -87,169 +87,161 @@
</span><span class="cx"> m_proxy->didOpenDatabase(resultData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::createObjectStore(TransactionOperation& operation, const IDBObjectStoreInfo& info)
</del><ins>+void IDBConnectionToServer::createObjectStore(const IDBRequestData& requestData, const IDBObjectStoreInfo& info)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::createObjectStore");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- saveOperation(operation);
-
- m_delegate->createObjectStore(IDBRequestData(operation), info);
</del><ins>+ m_delegate->createObjectStore(requestData, info);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didCreateObjectStore(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didCreateObjectStore");
</span><del>- completeOperation(resultData);
</del><ins>+ m_proxy->completeOperation(resultData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::deleteObjectStore(TransactionOperation& operation, const String& objectStoreName)
</del><ins>+void IDBConnectionToServer::deleteObjectStore(const IDBRequestData& requestData, const String& objectStoreName)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::deleteObjectStore");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- saveOperation(operation);
-
- m_delegate->deleteObjectStore(IDBRequestData(operation), objectStoreName);
</del><ins>+ m_delegate->deleteObjectStore(requestData, objectStoreName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didDeleteObjectStore(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didDeleteObjectStore");
</span><del>- completeOperation(resultData);
</del><ins>+ m_proxy->completeOperation(resultData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::clearObjectStore(TransactionOperation& operation, uint64_t objectStoreIdentifier)
</del><ins>+void IDBConnectionToServer::clearObjectStore(const IDBRequestData& requestData, uint64_t objectStoreIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::clearObjectStore");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- saveOperation(operation);
-
- m_delegate->clearObjectStore(IDBRequestData(operation), objectStoreIdentifier);
</del><ins>+ m_delegate->clearObjectStore(requestData, objectStoreIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didClearObjectStore(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didClearObjectStore");
</span><del>- completeOperation(resultData);
</del><ins>+ m_proxy->completeOperation(resultData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::createIndex(TransactionOperation& operation, const IDBIndexInfo& info)
</del><ins>+void IDBConnectionToServer::createIndex(const IDBRequestData& requestData, const IDBIndexInfo& info)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::createIndex");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- saveOperation(operation);
-
- m_delegate->createIndex(IDBRequestData(operation), info);
</del><ins>+ m_delegate->createIndex(requestData, info);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didCreateIndex(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didCreateIndex");
</span><del>- completeOperation(resultData);
</del><ins>+ m_proxy->completeOperation(resultData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::deleteIndex(TransactionOperation& operation, uint64_t objectStoreIdentifier, const String& indexName)
</del><ins>+void IDBConnectionToServer::deleteIndex(const IDBRequestData& requestData, uint64_t objectStoreIdentifier, const String& indexName)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::deleteIndex");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- saveOperation(operation);
-
- m_delegate->deleteIndex(IDBRequestData(operation), objectStoreIdentifier, indexName);
</del><ins>+ m_delegate->deleteIndex(requestData, objectStoreIdentifier, indexName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didDeleteIndex(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didDeleteIndex");
</span><del>- completeOperation(resultData);
</del><ins>+ m_proxy->completeOperation(resultData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::putOrAdd(TransactionOperation& operation, IDBKey* key, const IDBValue& value, const IndexedDB::ObjectStoreOverwriteMode overwriteMode)
</del><ins>+void IDBConnectionToServer::putOrAdd(const IDBRequestData& requestData, IDBKey* key, const IDBValue& value, const IndexedDB::ObjectStoreOverwriteMode overwriteMode)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::putOrAdd");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- saveOperation(operation);
- m_delegate->putOrAdd(IDBRequestData(operation), key, value, overwriteMode);
</del><ins>+ m_delegate->putOrAdd(requestData, key, value, overwriteMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didPutOrAdd(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didPutOrAdd");
</span><del>- completeOperation(resultData);
</del><ins>+ m_proxy->completeOperation(resultData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::getRecord(TransactionOperation& operation, const IDBKeyRangeData& keyRangeData)
</del><ins>+void IDBConnectionToServer::getRecord(const IDBRequestData& requestData, const IDBKeyRangeData& keyRangeData)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::getRecord");
</span><del>-
</del><ins>+ ASSERT(isMainThread());
</ins><span class="cx"> ASSERT(!keyRangeData.isNull);
</span><span class="cx">
</span><del>- saveOperation(operation);
- m_delegate->getRecord(IDBRequestData(operation), keyRangeData);
</del><ins>+ m_delegate->getRecord(requestData, keyRangeData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didGetRecord(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didGetRecord");
</span><del>- completeOperation(resultData);
</del><ins>+ m_proxy->completeOperation(resultData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::getCount(TransactionOperation& operation, const IDBKeyRangeData& keyRangeData)
</del><ins>+void IDBConnectionToServer::getCount(const IDBRequestData& requestData, const IDBKeyRangeData& keyRangeData)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::getCount");
</span><del>-
</del><ins>+ ASSERT(isMainThread());
</ins><span class="cx"> ASSERT(!keyRangeData.isNull);
</span><span class="cx">
</span><del>- saveOperation(operation);
- m_delegate->getCount(IDBRequestData(operation), keyRangeData);
</del><ins>+ m_delegate->getCount(requestData, keyRangeData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didGetCount(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didGetCount");
</span><del>- completeOperation(resultData);
</del><ins>+ m_proxy->completeOperation(resultData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::deleteRecord(TransactionOperation& operation, const IDBKeyRangeData& keyRangeData)
</del><ins>+void IDBConnectionToServer::deleteRecord(const IDBRequestData& requestData, const IDBKeyRangeData& keyRangeData)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::deleteRecord");
</span><del>-
</del><ins>+ ASSERT(isMainThread());
</ins><span class="cx"> ASSERT(!keyRangeData.isNull);
</span><span class="cx">
</span><del>- saveOperation(operation);
- m_delegate->deleteRecord(IDBRequestData(operation), keyRangeData);
</del><ins>+ m_delegate->deleteRecord(requestData, keyRangeData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didDeleteRecord(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didDeleteRecord");
</span><del>- completeOperation(resultData);
</del><ins>+ m_proxy->completeOperation(resultData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::openCursor(TransactionOperation& operation, const IDBCursorInfo& info)
</del><ins>+void IDBConnectionToServer::openCursor(const IDBRequestData& requestData, const IDBCursorInfo& info)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::openCursor");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- saveOperation(operation);
- m_delegate->openCursor(IDBRequestData(operation), info);
</del><ins>+ m_delegate->openCursor(requestData, info);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didOpenCursor(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didOpenCursor");
</span><del>- completeOperation(resultData);
</del><ins>+ m_proxy->completeOperation(resultData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::iterateCursor(TransactionOperation& operation, const IDBKeyData& key, unsigned long count)
</del><ins>+void IDBConnectionToServer::iterateCursor(const IDBRequestData& requestData, const IDBKeyData& key, unsigned long count)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::iterateCursor");
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- saveOperation(operation);
- m_delegate->iterateCursor(IDBRequestData(operation), key, count);
</del><ins>+ m_delegate->iterateCursor(requestData, key, count);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::didIterateCursor(const IDBResultData& resultData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didIterateCursor");
</span><del>- completeOperation(resultData);
</del><ins>+ m_proxy->completeOperation(resultData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo& info)
</span><span class="lines">@@ -347,20 +339,6 @@
</span><span class="cx"> m_delegate->abortOpenAndUpgradeNeeded(databaseConnectionIdentifier, transactionIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::saveOperation(TransactionOperation& operation)
-{
- ASSERT(!m_activeOperations.contains(operation.identifier()));
- m_activeOperations.set(operation.identifier(), &operation);
-}
-
-void IDBConnectionToServer::completeOperation(const IDBResultData& resultData)
-{
- auto operation = m_activeOperations.take(resultData.requestIdentifier());
- ASSERT(operation);
-
- operation->completed(resultData);
-}
-
</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 (200488 => 200489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2016-05-05 23:05:37 UTC (rev 200488)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2016-05-05 23:11:13 UTC (rev 200489)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "IDBConnectionProxy.h"
</span><span class="cx"> #include "IDBConnectionToServerDelegate.h"
</span><span class="cx"> #include "IDBResourceIdentifier.h"
</span><del>-#include "TransactionOperation.h"
</del><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="lines">@@ -44,11 +43,10 @@
</span><span class="cx"> class IDBObjectStoreInfo;
</span><span class="cx"> class IDBResultData;
</span><span class="cx"> class IDBValue;
</span><ins>+class SecurityOrigin;
</ins><span class="cx">
</span><span class="cx"> namespace IDBClient {
</span><span class="cx">
</span><del>-class TransactionOperation;
-
</del><span class="cx"> class IDBConnectionToServer : public ThreadSafeRefCounted<IDBConnectionToServer> {
</span><span class="cx"> public:
</span><span class="cx"> WEBCORE_EXPORT static Ref<IDBConnectionToServer> create(IDBConnectionToServerDelegate&);
</span><span class="lines">@@ -63,37 +61,37 @@
</span><span class="cx"> void openDatabase(const IDBRequestData&);
</span><span class="cx"> WEBCORE_EXPORT void didOpenDatabase(const IDBResultData&);
</span><span class="cx">
</span><del>- void createObjectStore(TransactionOperation&, const IDBObjectStoreInfo&);
</del><ins>+ void createObjectStore(const IDBRequestData&, const IDBObjectStoreInfo&);
</ins><span class="cx"> WEBCORE_EXPORT void didCreateObjectStore(const IDBResultData&);
</span><span class="cx">
</span><del>- void deleteObjectStore(TransactionOperation&, const String& objectStoreName);
</del><ins>+ void deleteObjectStore(const IDBRequestData&, const String& objectStoreName);
</ins><span class="cx"> WEBCORE_EXPORT void didDeleteObjectStore(const IDBResultData&);
</span><span class="cx">
</span><del>- void clearObjectStore(TransactionOperation&, uint64_t objectStoreIdentifier);
</del><ins>+ void clearObjectStore(const IDBRequestData&, uint64_t objectStoreIdentifier);
</ins><span class="cx"> WEBCORE_EXPORT void didClearObjectStore(const IDBResultData&);
</span><span class="cx">
</span><del>- void createIndex(TransactionOperation&, const IDBIndexInfo&);
</del><ins>+ void createIndex(const IDBRequestData&, const IDBIndexInfo&);
</ins><span class="cx"> WEBCORE_EXPORT void didCreateIndex(const IDBResultData&);
</span><span class="cx">
</span><del>- void deleteIndex(TransactionOperation&, uint64_t objectStoreIdentifier, const String& indexName);
</del><ins>+ void deleteIndex(const IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName);
</ins><span class="cx"> WEBCORE_EXPORT void didDeleteIndex(const IDBResultData&);
</span><span class="cx">
</span><del>- void putOrAdd(TransactionOperation&, IDBKey*, const IDBValue&, const IndexedDB::ObjectStoreOverwriteMode);
</del><ins>+ void putOrAdd(const IDBRequestData&, IDBKey*, const IDBValue&, const IndexedDB::ObjectStoreOverwriteMode);
</ins><span class="cx"> WEBCORE_EXPORT void didPutOrAdd(const IDBResultData&);
</span><span class="cx">
</span><del>- void getRecord(TransactionOperation&, const IDBKeyRangeData&);
</del><ins>+ void getRecord(const IDBRequestData&, const IDBKeyRangeData&);
</ins><span class="cx"> WEBCORE_EXPORT void didGetRecord(const IDBResultData&);
</span><span class="cx">
</span><del>- void getCount(TransactionOperation&, const IDBKeyRangeData&);
</del><ins>+ void getCount(const IDBRequestData&, const IDBKeyRangeData&);
</ins><span class="cx"> WEBCORE_EXPORT void didGetCount(const IDBResultData&);
</span><span class="cx">
</span><del>- void deleteRecord(TransactionOperation&, const IDBKeyRangeData&);
</del><ins>+ void deleteRecord(const IDBRequestData&, const IDBKeyRangeData&);
</ins><span class="cx"> WEBCORE_EXPORT void didDeleteRecord(const IDBResultData&);
</span><span class="cx">
</span><del>- void openCursor(TransactionOperation&, const IDBCursorInfo&);
</del><ins>+ void openCursor(const IDBRequestData&, const IDBCursorInfo&);
</ins><span class="cx"> WEBCORE_EXPORT void didOpenCursor(const IDBResultData&);
</span><span class="cx">
</span><del>- void iterateCursor(TransactionOperation&, const IDBKeyData&, unsigned long count);
</del><ins>+ void iterateCursor(const IDBRequestData&, const IDBKeyData&, unsigned long count);
</ins><span class="cx"> WEBCORE_EXPORT void didIterateCursor(const IDBResultData&);
</span><span class="cx">
</span><span class="cx"> void commitTransaction(const IDBResourceIdentifier& transactionIdentifier);
</span><span class="lines">@@ -124,13 +122,8 @@
</span><span class="cx"> private:
</span><span class="cx"> IDBConnectionToServer(IDBConnectionToServerDelegate&);
</span><span class="cx">
</span><del>- void saveOperation(TransactionOperation&);
- void completeOperation(const IDBResultData&);
-
</del><span class="cx"> Ref<IDBConnectionToServerDelegate> m_delegate;
</span><span class="cx">
</span><del>- HashMap<IDBResourceIdentifier, RefPtr<TransactionOperation>> m_activeOperations;
-
</del><span class="cx"> HashMap<uint64_t, std::function<void (const Vector<String>&)>> m_getAllDatabaseNamesCallbacks;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<IDBConnectionProxy> m_proxy;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientTransactionOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h (200488 => 200489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h 2016-05-05 23:05:37 UTC (rev 200488)
+++ trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h 2016-05-05 23:11:13 UTC (rev 200489)
</span><span class="lines">@@ -29,8 +29,10 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="cx"> #include "IDBRequest.h"
</span><ins>+#include "IDBRequestData.h"
</ins><span class="cx"> #include "IDBResourceIdentifier.h"
</span><span class="cx"> #include "IDBTransaction.h"
</span><ins>+#include <wtf/Threading.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -43,9 +45,16 @@
</span><span class="cx"> namespace IDBClient {
</span><span class="cx">
</span><span class="cx"> class TransactionOperation : public ThreadSafeRefCounted<TransactionOperation> {
</span><ins>+ friend IDBRequestData::IDBRequestData(TransactionOperation&);
</ins><span class="cx"> public:
</span><ins>+ virtual ~TransactionOperation()
+ {
+ ASSERT(m_originThreadID == currentThread());
+ }
+
</ins><span class="cx"> void perform()
</span><span class="cx"> {
</span><ins>+ ASSERT(m_originThreadID == currentThread());
</ins><span class="cx"> ASSERT(m_performFunction);
</span><span class="cx"> m_performFunction();
</span><span class="cx"> m_performFunction = { };
</span><span class="lines">@@ -53,6 +62,7 @@
</span><span class="cx">
</span><span class="cx"> void completed(const IDBResultData& data)
</span><span class="cx"> {
</span><ins>+ ASSERT(m_originThreadID == currentThread());
</ins><span class="cx"> ASSERT(m_completeFunction);
</span><span class="cx"> m_completeFunction(data);
</span><span class="cx"> m_transaction->operationDidComplete(*this);
</span><span class="lines">@@ -60,13 +70,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const IDBResourceIdentifier& identifier() const { return m_identifier; }
</span><del>- IDBResourceIdentifier transactionIdentifier() const { return m_transaction->info().identifier(); }
- uint64_t objectStoreIdentifier() const { return m_objectStoreIdentifier; }
- uint64_t indexIdentifier() const { return m_indexIdentifier; }
- IDBResourceIdentifier* cursorIdentifier() const { return m_cursorIdentifier.get(); }
- IDBTransaction& transaction() { return m_transaction.get(); }
- IndexedDB::IndexRecordType indexRecordType() const { return m_indexRecordType; }
</del><span class="cx">
</span><ins>+ ThreadIdentifier originThreadID() const { return m_originThreadID; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> TransactionOperation(IDBTransaction& transaction)
</span><span class="cx"> : m_transaction(transaction)
</span><span class="lines">@@ -84,6 +90,16 @@
</span><span class="cx"> IndexedDB::IndexRecordType m_indexRecordType;
</span><span class="cx"> std::function<void ()> m_performFunction;
</span><span class="cx"> std::function<void (const IDBResultData&)> m_completeFunction;
</span><ins>+
+private:
+ IDBResourceIdentifier transactionIdentifier() const { return m_transaction->info().identifier(); }
+ uint64_t objectStoreIdentifier() const { return m_objectStoreIdentifier; }
+ uint64_t indexIdentifier() const { return m_indexIdentifier; }
+ IDBResourceIdentifier* cursorIdentifier() const { return m_cursorIdentifier.get(); }
+ IDBTransaction& transaction() { return m_transaction.get(); }
+ IndexedDB::IndexRecordType indexRecordType() const { return m_indexRecordType; }
+
+ ThreadIdentifier m_originThreadID { currentThread() };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <typename... Arguments>
</span></span></pre>
</div>
</div>
</body>
</html>