<!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>[208203] 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/208203">208203</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-31 17:46:52 -0700 (Mon, 31 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Address style feedback in https://bugs.webkit.org/show_bug.cgi?id=164097
https://bugs.webkit.org/show_bug.cgi?id=164248
Unreviewed. Addressing review feedback (and then some) from Darin Adler on earlier patch.
No new tests (No behavior change).
* Modules/indexeddb/IDBTransaction.cpp:
(WebCore::IDBTransaction::commit):
(WebCore::IDBTransaction::createObjectStore):
(WebCore::IDBTransaction::renameObjectStore):
(WebCore::IDBTransaction::createIndex):
(WebCore::IDBTransaction::renameIndex):
(WebCore::IDBTransaction::requestOpenCursor):
(WebCore::IDBTransaction::doRequestOpenCursor):
(WebCore::IDBTransaction::iterateCursor):
(WebCore::IDBTransaction::requestGetAllObjectStoreRecords):
(WebCore::IDBTransaction::requestGetRecord):
(WebCore::IDBTransaction::requestGetValue):
(WebCore::IDBTransaction::requestGetKey):
(WebCore::IDBTransaction::requestIndexRecord):
(WebCore::IDBTransaction::requestCount):
(WebCore::IDBTransaction::requestDeleteRecord):
(WebCore::IDBTransaction::requestClearObjectStore):
(WebCore::IDBTransaction::requestPutOrAdd):
(WebCore::IDBTransaction::deleteObjectStore):
(WebCore::IDBTransaction::deleteIndex):
* Modules/indexeddb/client/IDBConnectionProxy.cpp:
(WebCore::IDBClient::IDBConnectionProxy::createObjectStore):
(WebCore::IDBClient::IDBConnectionProxy::renameObjectStore):
(WebCore::IDBClient::IDBConnectionProxy::renameIndex):
(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::getAllRecords):
(WebCore::IDBClient::IDBConnectionProxy::getCount):
(WebCore::IDBClient::IDBConnectionProxy::deleteRecord):
(WebCore::IDBClient::IDBConnectionProxy::openCursor):
(WebCore::IDBClient::IDBConnectionProxy::iterateCursor):
* Modules/indexeddb/server/MemoryIDBBackingStore.cpp:
(WebCore::IDBServer::MemoryIDBBackingStore::beginTransaction):
(WebCore::IDBServer::MemoryIDBBackingStore::abortTransaction):
(WebCore::IDBServer::MemoryIDBBackingStore::commitTransaction):
(WebCore::IDBServer::MemoryIDBBackingStore::createObjectStore):
(WebCore::IDBServer::MemoryIDBBackingStore::deleteObjectStore):
(WebCore::IDBServer::MemoryIDBBackingStore::renameObjectStore):
(WebCore::IDBServer::MemoryIDBBackingStore::clearObjectStore):
(WebCore::IDBServer::MemoryIDBBackingStore::createIndex):
(WebCore::IDBServer::MemoryIDBBackingStore::deleteIndex):
(WebCore::IDBServer::MemoryIDBBackingStore::renameIndex):
(WebCore::IDBServer::MemoryIDBBackingStore::keyExistsInObjectStore):
(WebCore::IDBServer::MemoryIDBBackingStore::deleteRange):
(WebCore::IDBServer::MemoryIDBBackingStore::addRecord):
(WebCore::IDBServer::MemoryIDBBackingStore::getRecord):
(WebCore::IDBServer::MemoryIDBBackingStore::getAllRecords):
(WebCore::IDBServer::MemoryIDBBackingStore::getIndexRecord):
(WebCore::IDBServer::MemoryIDBBackingStore::getCount):
(WebCore::IDBServer::MemoryIDBBackingStore::generateKeyNumber):
(WebCore::IDBServer::MemoryIDBBackingStore::openCursor):
(WebCore::IDBServer::MemoryIDBBackingStore::iterateCursor):
* Modules/indexeddb/shared/IDBResultData.cpp:
(WebCore::IDBResultData::error):
(WebCore::IDBResultData::openDatabaseSuccess):
(WebCore::IDBResultData::openDatabaseUpgradeNeeded):
(WebCore::IDBResultData::deleteDatabaseSuccess):
(WebCore::IDBResultData::putOrAddSuccess):
(WebCore::IDBResultData::getRecordSuccess):
(WebCore::IDBResultData::getAllRecordsSuccess):
(WebCore::IDBResultData::getCountSuccess):
(WebCore::IDBResultData::openCursorSuccess):
(WebCore::IDBResultData::iterateCursorSuccess):</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="#trunkSourceWebCoreModulesindexeddbserverMemoryIDBBackingStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBResultDatacpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208202 => 208203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-01 00:42:23 UTC (rev 208202)
+++ trunk/Source/WebCore/ChangeLog 2016-11-01 00:46:52 UTC (rev 208203)
</span><span class="lines">@@ -1,3 +1,83 @@
</span><ins>+2016-10-31 Brady Eidson <beidson@apple.com>
+
+ Address style feedback in https://bugs.webkit.org/show_bug.cgi?id=164097
+ https://bugs.webkit.org/show_bug.cgi?id=164248
+
+ Unreviewed. Addressing review feedback (and then some) from Darin Adler on earlier patch.
+
+ No new tests (No behavior change).
+
+ * Modules/indexeddb/IDBTransaction.cpp:
+ (WebCore::IDBTransaction::commit):
+ (WebCore::IDBTransaction::createObjectStore):
+ (WebCore::IDBTransaction::renameObjectStore):
+ (WebCore::IDBTransaction::createIndex):
+ (WebCore::IDBTransaction::renameIndex):
+ (WebCore::IDBTransaction::requestOpenCursor):
+ (WebCore::IDBTransaction::doRequestOpenCursor):
+ (WebCore::IDBTransaction::iterateCursor):
+ (WebCore::IDBTransaction::requestGetAllObjectStoreRecords):
+ (WebCore::IDBTransaction::requestGetRecord):
+ (WebCore::IDBTransaction::requestGetValue):
+ (WebCore::IDBTransaction::requestGetKey):
+ (WebCore::IDBTransaction::requestIndexRecord):
+ (WebCore::IDBTransaction::requestCount):
+ (WebCore::IDBTransaction::requestDeleteRecord):
+ (WebCore::IDBTransaction::requestClearObjectStore):
+ (WebCore::IDBTransaction::requestPutOrAdd):
+ (WebCore::IDBTransaction::deleteObjectStore):
+ (WebCore::IDBTransaction::deleteIndex):
+
+ * Modules/indexeddb/client/IDBConnectionProxy.cpp:
+ (WebCore::IDBClient::IDBConnectionProxy::createObjectStore):
+ (WebCore::IDBClient::IDBConnectionProxy::renameObjectStore):
+ (WebCore::IDBClient::IDBConnectionProxy::renameIndex):
+ (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::getAllRecords):
+ (WebCore::IDBClient::IDBConnectionProxy::getCount):
+ (WebCore::IDBClient::IDBConnectionProxy::deleteRecord):
+ (WebCore::IDBClient::IDBConnectionProxy::openCursor):
+ (WebCore::IDBClient::IDBConnectionProxy::iterateCursor):
+
+ * Modules/indexeddb/server/MemoryIDBBackingStore.cpp:
+ (WebCore::IDBServer::MemoryIDBBackingStore::beginTransaction):
+ (WebCore::IDBServer::MemoryIDBBackingStore::abortTransaction):
+ (WebCore::IDBServer::MemoryIDBBackingStore::commitTransaction):
+ (WebCore::IDBServer::MemoryIDBBackingStore::createObjectStore):
+ (WebCore::IDBServer::MemoryIDBBackingStore::deleteObjectStore):
+ (WebCore::IDBServer::MemoryIDBBackingStore::renameObjectStore):
+ (WebCore::IDBServer::MemoryIDBBackingStore::clearObjectStore):
+ (WebCore::IDBServer::MemoryIDBBackingStore::createIndex):
+ (WebCore::IDBServer::MemoryIDBBackingStore::deleteIndex):
+ (WebCore::IDBServer::MemoryIDBBackingStore::renameIndex):
+ (WebCore::IDBServer::MemoryIDBBackingStore::keyExistsInObjectStore):
+ (WebCore::IDBServer::MemoryIDBBackingStore::deleteRange):
+ (WebCore::IDBServer::MemoryIDBBackingStore::addRecord):
+ (WebCore::IDBServer::MemoryIDBBackingStore::getRecord):
+ (WebCore::IDBServer::MemoryIDBBackingStore::getAllRecords):
+ (WebCore::IDBServer::MemoryIDBBackingStore::getIndexRecord):
+ (WebCore::IDBServer::MemoryIDBBackingStore::getCount):
+ (WebCore::IDBServer::MemoryIDBBackingStore::generateKeyNumber):
+ (WebCore::IDBServer::MemoryIDBBackingStore::openCursor):
+ (WebCore::IDBServer::MemoryIDBBackingStore::iterateCursor):
+
+ * Modules/indexeddb/shared/IDBResultData.cpp:
+ (WebCore::IDBResultData::error):
+ (WebCore::IDBResultData::openDatabaseSuccess):
+ (WebCore::IDBResultData::openDatabaseUpgradeNeeded):
+ (WebCore::IDBResultData::deleteDatabaseSuccess):
+ (WebCore::IDBResultData::putOrAddSuccess):
+ (WebCore::IDBResultData::getRecordSuccess):
+ (WebCore::IDBResultData::getAllRecordsSuccess):
+ (WebCore::IDBResultData::getCountSuccess):
+ (WebCore::IDBResultData::openCursorSuccess):
+ (WebCore::IDBResultData::iterateCursorSuccess):
+
</ins><span class="cx"> 2016-10-31 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Enable custom elements by default everywhere
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (208202 => 208203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-11-01 00:42:23 UTC (rev 208202)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-11-01 00:46:52 UTC (rev 208203)
</span><span class="lines">@@ -366,8 +366,7 @@
</span><span class="cx"> transitionedToFinishing(IndexedDB::TransactionState::Committing);
</span><span class="cx"> m_database->willCommitTransaction(*this);
</span><span class="cx">
</span><del>- auto operation = IDBClient::createTransactionOperation(*this, nullptr, &IDBTransaction::commitOnServer);
- scheduleOperation(WTFMove(operation));
</del><ins>+ scheduleOperation(IDBClient::createTransactionOperation(*this, nullptr, &IDBTransaction::commitOnServer));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::commitOnServer(IDBClient::TransactionOperation& operation)
</span><span class="lines">@@ -521,8 +520,7 @@
</span><span class="cx"> Ref<IDBObjectStore> objectStore = IDBObjectStore::create(*scriptExecutionContext(), info, *this);
</span><span class="cx"> m_referencedObjectStores.set(info.name(), &objectStore.get());
</span><span class="cx">
</span><del>- auto operation = IDBClient::createTransactionOperation(*this, &IDBTransaction::didCreateObjectStoreOnServer, &IDBTransaction::createObjectStoreOnServer, info);
- scheduleOperation(WTFMove(operation));
</del><ins>+ scheduleOperation(IDBClient::createTransactionOperation(*this, &IDBTransaction::didCreateObjectStoreOnServer, &IDBTransaction::createObjectStoreOnServer, info));
</ins><span class="cx">
</span><span class="cx"> return objectStore;
</span><span class="cx"> }
</span><span class="lines">@@ -555,8 +553,7 @@
</span><span class="cx"> ASSERT(m_referencedObjectStores.get(objectStore.info().name()) == &objectStore);
</span><span class="cx">
</span><span class="cx"> uint64_t objectStoreIdentifier = objectStore.info().identifier();
</span><del>- auto operation = IDBClient::createTransactionOperation(*this, &IDBTransaction::didRenameObjectStoreOnServer, &IDBTransaction::renameObjectStoreOnServer, objectStoreIdentifier, newName);
- scheduleOperation(WTFMove(operation));
</del><ins>+ scheduleOperation(IDBClient::createTransactionOperation(*this, &IDBTransaction::didRenameObjectStoreOnServer, &IDBTransaction::renameObjectStoreOnServer, objectStoreIdentifier, newName));
</ins><span class="cx">
</span><span class="cx"> m_referencedObjectStores.set(newName, m_referencedObjectStores.take(objectStore.info().name()));
</span><span class="cx"> }
</span><span class="lines">@@ -586,8 +583,7 @@
</span><span class="cx"> if (!scriptExecutionContext())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- auto operation = IDBClient::createTransactionOperation(*this, &IDBTransaction::didCreateIndexOnServer, &IDBTransaction::createIndexOnServer, info);
- scheduleOperation(WTFMove(operation));
</del><ins>+ scheduleOperation(IDBClient::createTransactionOperation(*this, &IDBTransaction::didCreateIndexOnServer, &IDBTransaction::createIndexOnServer, info));
</ins><span class="cx">
</span><span class="cx"> return std::make_unique<IDBIndex>(*scriptExecutionContext(), info, objectStore);
</span><span class="cx"> }
</span><span class="lines">@@ -633,8 +629,7 @@
</span><span class="cx">
</span><span class="cx"> uint64_t objectStoreIdentifier = index.objectStore().info().identifier();
</span><span class="cx"> uint64_t indexIdentifier = index.info().identifier();
</span><del>- auto operation = IDBClient::createTransactionOperation(*this, &IDBTransaction::didRenameIndexOnServer, &IDBTransaction::renameIndexOnServer, objectStoreIdentifier, indexIdentifier, newName);
- scheduleOperation(WTFMove(operation));
</del><ins>+ scheduleOperation(IDBClient::createTransactionOperation(*this, &IDBTransaction::didRenameIndexOnServer, &IDBTransaction::renameIndexOnServer, objectStoreIdentifier, indexIdentifier, newName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::renameIndexOnServer(IDBClient::TransactionOperation& operation, const uint64_t& objectStoreIdentifier, const uint64_t& indexIdentifier, const String& newName)
</span><span class="lines">@@ -653,41 +648,39 @@
</span><span class="cx"> ASSERT_UNUSED(resultData, resultData.type() == IDBResultType::RenameIndexSuccess || resultData.type() == IDBResultType::Error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBRequest> IDBTransaction::requestOpenCursor(ExecState& execState, IDBObjectStore& objectStore, const IDBCursorInfo& info)
</del><ins>+Ref<IDBRequest> IDBTransaction::requestOpenCursor(ExecState& state, IDBObjectStore& objectStore, const IDBCursorInfo& info)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::requestOpenCursor");
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><span class="cx"> if (info.cursorType() == IndexedDB::CursorType::KeyOnly)
</span><del>- return doRequestOpenCursor(execState, IDBCursor::create(*this, objectStore, info));
</del><ins>+ return doRequestOpenCursor(state, IDBCursor::create(*this, objectStore, info));
</ins><span class="cx">
</span><del>- return doRequestOpenCursor(execState, IDBCursorWithValue::create(*this, objectStore, info));
</del><ins>+ return doRequestOpenCursor(state, IDBCursorWithValue::create(*this, objectStore, info));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBRequest> IDBTransaction::requestOpenCursor(ExecState& execState, IDBIndex& index, const IDBCursorInfo& info)
</del><ins>+Ref<IDBRequest> IDBTransaction::requestOpenCursor(ExecState& state, IDBIndex& index, const IDBCursorInfo& info)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::requestOpenCursor");
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><span class="cx"> if (info.cursorType() == IndexedDB::CursorType::KeyOnly)
</span><del>- return doRequestOpenCursor(execState, IDBCursor::create(*this, index, info));
</del><ins>+ return doRequestOpenCursor(state, IDBCursor::create(*this, index, info));
</ins><span class="cx">
</span><del>- return doRequestOpenCursor(execState, IDBCursorWithValue::create(*this, index, info));
</del><ins>+ return doRequestOpenCursor(state, IDBCursorWithValue::create(*this, index, info));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBRequest> IDBTransaction::doRequestOpenCursor(ExecState& execState, Ref<IDBCursor>&& cursor)
</del><ins>+Ref<IDBRequest> IDBTransaction::doRequestOpenCursor(ExecState& state, Ref<IDBCursor>&& cursor)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isActive());
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- RELEASE_ASSERT(scriptExecutionContext());
- ASSERT_UNUSED(execState, scriptExecutionContext() == scriptExecutionContextFromExecState(&execState));
</del><ins>+ ASSERT_UNUSED(state, scriptExecutionContext() == scriptExecutionContextFromExecState(&state));
</ins><span class="cx">
</span><del>- Ref<IDBRequest> request = IDBRequest::create(*scriptExecutionContext(), cursor.get(), *this);
</del><ins>+ auto request = IDBRequest::create(*scriptExecutionContext(), cursor.get(), *this);
</ins><span class="cx"> addRequest(request.get());
</span><span class="cx">
</span><del>- auto operation = IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didOpenCursorOnServer, &IDBTransaction::openCursorOnServer, cursor->info());
- scheduleOperation(WTFMove(operation));
</del><ins>+ scheduleOperation(IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didOpenCursorOnServer, &IDBTransaction::openCursorOnServer, cursor->info()));
</ins><span class="cx">
</span><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="lines">@@ -717,8 +710,7 @@
</span><span class="cx">
</span><span class="cx"> addRequest(*cursor.request());
</span><span class="cx">
</span><del>- auto operation = IDBClient::createTransactionOperation(*this, *cursor.request(), &IDBTransaction::didIterateCursorOnServer, &IDBTransaction::iterateCursorOnServer, key, count);
- scheduleOperation(WTFMove(operation));
</del><ins>+ scheduleOperation(IDBClient::createTransactionOperation(*this, *cursor.request(), &IDBTransaction::didIterateCursorOnServer, &IDBTransaction::iterateCursorOnServer, key, count));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::iterateCursorOnServer(IDBClient::TransactionOperation& operation, const IDBKeyData& key, const unsigned long& count)
</span><span class="lines">@@ -745,13 +737,12 @@
</span><span class="cx">
</span><span class="cx"> ASSERT_UNUSED(state, scriptExecutionContext() == scriptExecutionContextFromExecState(&state));
</span><span class="cx">
</span><del>- Ref<IDBRequest> request = IDBRequest::create(*scriptExecutionContext(), objectStore, *this);
</del><ins>+ auto request = IDBRequest::create(*scriptExecutionContext(), objectStore, *this);
</ins><span class="cx"> addRequest(request.get());
</span><span class="cx">
</span><span class="cx"> IDBGetAllRecordsData getAllRecordsData { keyRangeData, getAllType, count, objectStore.info().identifier(), 0 };
</span><span class="cx">
</span><del>- auto operation = IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didGetAllRecordsOnServer, &IDBTransaction::getAllRecordsOnServer, getAllRecordsData);
- scheduleOperation(WTFMove(operation));
</del><ins>+ scheduleOperation(IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didGetAllRecordsOnServer, &IDBTransaction::getAllRecordsOnServer, getAllRecordsData));
</ins><span class="cx">
</span><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="lines">@@ -789,7 +780,7 @@
</span><span class="cx"> request.requestCompleted(resultData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBRequest> IDBTransaction::requestGetRecord(ExecState& execState, IDBObjectStore& objectStore, const IDBGetRecordData& getRecordData)
</del><ins>+Ref<IDBRequest> IDBTransaction::requestGetRecord(ExecState& state, IDBObjectStore& objectStore, const IDBGetRecordData& getRecordData)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::requestGetRecord");
</span><span class="cx"> ASSERT(isActive());
</span><span class="lines">@@ -796,35 +787,33 @@
</span><span class="cx"> ASSERT(!getRecordData.keyRangeData.isNull);
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- RELEASE_ASSERT(scriptExecutionContext());
- ASSERT_UNUSED(execState, scriptExecutionContext() == scriptExecutionContextFromExecState(&execState));
</del><ins>+ ASSERT_UNUSED(state, scriptExecutionContext() == scriptExecutionContextFromExecState(&state));
</ins><span class="cx">
</span><del>- Ref<IDBRequest> request = IDBRequest::create(*scriptExecutionContext(), objectStore, *this);
</del><ins>+ auto request = IDBRequest::create(*scriptExecutionContext(), objectStore, *this);
</ins><span class="cx"> addRequest(request.get());
</span><span class="cx">
</span><del>- auto operation = IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didGetRecordOnServer, &IDBTransaction::getRecordOnServer, getRecordData);
- scheduleOperation(WTFMove(operation));
</del><ins>+ scheduleOperation(IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didGetRecordOnServer, &IDBTransaction::getRecordOnServer, getRecordData));
</ins><span class="cx">
</span><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBRequest> IDBTransaction::requestGetValue(ExecState& execState, IDBIndex& index, const IDBKeyRangeData& range)
</del><ins>+Ref<IDBRequest> IDBTransaction::requestGetValue(ExecState& state, IDBIndex& index, const IDBKeyRangeData& range)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::requestGetValue");
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- return requestIndexRecord(execState, index, IndexedDB::IndexRecordType::Value, range);
</del><ins>+ return requestIndexRecord(state, index, IndexedDB::IndexRecordType::Value, range);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBRequest> IDBTransaction::requestGetKey(ExecState& execState, IDBIndex& index, const IDBKeyRangeData& range)
</del><ins>+Ref<IDBRequest> IDBTransaction::requestGetKey(ExecState& state, IDBIndex& index, const IDBKeyRangeData& range)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::requestGetValue");
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- return requestIndexRecord(execState, index, IndexedDB::IndexRecordType::Key, range);
</del><ins>+ return requestIndexRecord(state, index, IndexedDB::IndexRecordType::Key, range);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBRequest> IDBTransaction::requestIndexRecord(ExecState& execState, IDBIndex& index, IndexedDB::IndexRecordType type, const IDBKeyRangeData& range)
</del><ins>+Ref<IDBRequest> IDBTransaction::requestIndexRecord(ExecState& state, IDBIndex& index, IndexedDB::IndexRecordType type, const IDBKeyRangeData& range)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::requestGetValue");
</span><span class="cx"> ASSERT(isActive());
</span><span class="lines">@@ -831,15 +820,13 @@
</span><span class="cx"> ASSERT(!range.isNull);
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- RELEASE_ASSERT(scriptExecutionContext());
- ASSERT_UNUSED(execState, scriptExecutionContext() == scriptExecutionContextFromExecState(&execState));
</del><ins>+ ASSERT_UNUSED(state, scriptExecutionContext() == scriptExecutionContextFromExecState(&state));
</ins><span class="cx">
</span><del>- Ref<IDBRequest> request = IDBRequest::createGet(*scriptExecutionContext(), index, type, *this);
</del><ins>+ auto request = IDBRequest::createGet(*scriptExecutionContext(), index, type, *this);
</ins><span class="cx"> addRequest(request.get());
</span><span class="cx">
</span><span class="cx"> IDBGetRecordData getRecordData = { range };
</span><del>- auto operation = IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didGetRecordOnServer, &IDBTransaction::getRecordOnServer, getRecordData);
- scheduleOperation(WTFMove(operation));
</del><ins>+ scheduleOperation(IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didGetRecordOnServer, &IDBTransaction::getRecordOnServer, getRecordData));
</ins><span class="cx">
</span><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="lines">@@ -881,7 +868,7 @@
</span><span class="cx"> request.requestCompleted(resultData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBRequest> IDBTransaction::requestCount(ExecState& execState, IDBObjectStore& objectStore, const IDBKeyRangeData& range)
</del><ins>+Ref<IDBRequest> IDBTransaction::requestCount(ExecState& state, IDBObjectStore& objectStore, const IDBKeyRangeData& range)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::requestCount (IDBObjectStore)");
</span><span class="cx"> ASSERT(isActive());
</span><span class="lines">@@ -888,10 +875,9 @@
</span><span class="cx"> ASSERT(!range.isNull);
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- RELEASE_ASSERT(scriptExecutionContext());
- ASSERT_UNUSED(execState, scriptExecutionContext() == scriptExecutionContextFromExecState(&execState));
</del><ins>+ ASSERT_UNUSED(state, scriptExecutionContext() == scriptExecutionContextFromExecState(&state));
</ins><span class="cx">
</span><del>- Ref<IDBRequest> request = IDBRequest::create(*scriptExecutionContext(), objectStore, *this);
</del><ins>+ auto request = IDBRequest::create(*scriptExecutionContext(), objectStore, *this);
</ins><span class="cx"> addRequest(request.get());
</span><span class="cx">
</span><span class="cx"> scheduleOperation(IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didGetCountOnServer, &IDBTransaction::getCountOnServer, range));
</span><span class="lines">@@ -899,7 +885,7 @@
</span><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBRequest> IDBTransaction::requestCount(ExecState& execState, IDBIndex& index, const IDBKeyRangeData& range)
</del><ins>+Ref<IDBRequest> IDBTransaction::requestCount(ExecState& state, IDBIndex& index, const IDBKeyRangeData& range)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::requestCount (IDBIndex)");
</span><span class="cx"> ASSERT(isActive());
</span><span class="lines">@@ -906,10 +892,9 @@
</span><span class="cx"> ASSERT(!range.isNull);
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- RELEASE_ASSERT(scriptExecutionContext());
- ASSERT_UNUSED(execState, scriptExecutionContext() == scriptExecutionContextFromExecState(&execState));
</del><ins>+ ASSERT_UNUSED(state, scriptExecutionContext() == scriptExecutionContextFromExecState(&state));
</ins><span class="cx">
</span><del>- Ref<IDBRequest> request = IDBRequest::createCount(*scriptExecutionContext(), index, *this);
</del><ins>+ auto request = IDBRequest::createCount(*scriptExecutionContext(), index, *this);
</ins><span class="cx"> addRequest(request.get());
</span><span class="cx">
</span><span class="cx"> scheduleOperation(IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didGetCountOnServer, &IDBTransaction::getCountOnServer, range));
</span><span class="lines">@@ -934,7 +919,7 @@
</span><span class="cx"> request.requestCompleted(resultData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBRequest> IDBTransaction::requestDeleteRecord(ExecState& execState, IDBObjectStore& objectStore, const IDBKeyRangeData& range)
</del><ins>+Ref<IDBRequest> IDBTransaction::requestDeleteRecord(ExecState& state, IDBObjectStore& objectStore, const IDBKeyRangeData& range)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::requestDeleteRecord");
</span><span class="cx"> ASSERT(isActive());
</span><span class="lines">@@ -941,10 +926,9 @@
</span><span class="cx"> ASSERT(!range.isNull);
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- RELEASE_ASSERT(scriptExecutionContext());
- ASSERT_UNUSED(execState, scriptExecutionContext() == scriptExecutionContextFromExecState(&execState));
</del><ins>+ ASSERT_UNUSED(state, scriptExecutionContext() == scriptExecutionContextFromExecState(&state));
</ins><span class="cx">
</span><del>- Ref<IDBRequest> request = IDBRequest::create(*scriptExecutionContext(), objectStore, *this);
</del><ins>+ auto request = IDBRequest::create(*scriptExecutionContext(), objectStore, *this);
</ins><span class="cx"> addRequest(request.get());
</span><span class="cx">
</span><span class="cx"> scheduleOperation(IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didDeleteRecordOnServer, &IDBTransaction::deleteRecordOnServer, range));
</span><span class="lines">@@ -968,21 +952,19 @@
</span><span class="cx"> request.requestCompleted(resultData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBRequest> IDBTransaction::requestClearObjectStore(ExecState& execState, IDBObjectStore& objectStore)
</del><ins>+Ref<IDBRequest> IDBTransaction::requestClearObjectStore(ExecState& state, IDBObjectStore& objectStore)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::requestClearObjectStore");
</span><span class="cx"> ASSERT(isActive());
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- RELEASE_ASSERT(scriptExecutionContext());
- ASSERT_UNUSED(execState, scriptExecutionContext() == scriptExecutionContextFromExecState(&execState));
</del><ins>+ ASSERT_UNUSED(state, scriptExecutionContext() == scriptExecutionContextFromExecState(&state));
</ins><span class="cx">
</span><del>- Ref<IDBRequest> request = IDBRequest::create(*scriptExecutionContext(), objectStore, *this);
</del><ins>+ auto request = IDBRequest::create(*scriptExecutionContext(), objectStore, *this);
</ins><span class="cx"> addRequest(request.get());
</span><span class="cx">
</span><span class="cx"> uint64_t objectStoreIdentifier = objectStore.info().identifier();
</span><del>- auto operation = IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didClearObjectStoreOnServer, &IDBTransaction::clearObjectStoreOnServer, objectStoreIdentifier);
- scheduleOperation(WTFMove(operation));
</del><ins>+ scheduleOperation(IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didClearObjectStoreOnServer, &IDBTransaction::clearObjectStoreOnServer, objectStoreIdentifier));
</ins><span class="cx">
</span><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="lines">@@ -1004,7 +986,7 @@
</span><span class="cx"> request.requestCompleted(resultData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<IDBRequest> IDBTransaction::requestPutOrAdd(ExecState& execState, IDBObjectStore& objectStore, IDBKey* key, SerializedScriptValue& value, IndexedDB::ObjectStoreOverwriteMode overwriteMode)
</del><ins>+Ref<IDBRequest> IDBTransaction::requestPutOrAdd(ExecState& state, IDBObjectStore& objectStore, IDBKey* key, SerializedScriptValue& value, IndexedDB::ObjectStoreOverwriteMode overwriteMode)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::requestPutOrAdd");
</span><span class="cx"> ASSERT(isActive());
</span><span class="lines">@@ -1012,14 +994,12 @@
</span><span class="cx"> ASSERT(objectStore.info().autoIncrement() || key);
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx">
</span><del>- RELEASE_ASSERT(scriptExecutionContext());
- ASSERT_UNUSED(execState, scriptExecutionContext() == scriptExecutionContextFromExecState(&execState));
</del><ins>+ ASSERT_UNUSED(state, scriptExecutionContext() == scriptExecutionContextFromExecState(&state));
</ins><span class="cx">
</span><del>- Ref<IDBRequest> request = IDBRequest::create(*scriptExecutionContext(), objectStore, *this);
</del><ins>+ auto request = IDBRequest::create(*scriptExecutionContext(), objectStore, *this);
</ins><span class="cx"> addRequest(request.get());
</span><span class="cx">
</span><del>- auto operation = IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didPutOrAddOnServer, &IDBTransaction::putOrAddOnServer, key, &value, overwriteMode);
- scheduleOperation(WTFMove(operation));
</del><ins>+ scheduleOperation(IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didPutOrAddOnServer, &IDBTransaction::putOrAddOnServer, key, &value, overwriteMode));
</ins><span class="cx">
</span><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="lines">@@ -1093,8 +1073,7 @@
</span><span class="cx"> if (auto objectStore = m_referencedObjectStores.take(objectStoreName))
</span><span class="cx"> objectStore->markAsDeleted();
</span><span class="cx">
</span><del>- auto operation = IDBClient::createTransactionOperation(*this, &IDBTransaction::didDeleteObjectStoreOnServer, &IDBTransaction::deleteObjectStoreOnServer, objectStoreName);
- scheduleOperation(WTFMove(operation));
</del><ins>+ scheduleOperation(IDBClient::createTransactionOperation(*this, &IDBTransaction::didDeleteObjectStoreOnServer, &IDBTransaction::deleteObjectStoreOnServer, objectStoreName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::deleteObjectStoreOnServer(IDBClient::TransactionOperation& operation, const String& objectStoreName)
</span><span class="lines">@@ -1119,8 +1098,7 @@
</span><span class="cx"> ASSERT(currentThread() == m_database->originThreadID());
</span><span class="cx"> ASSERT(isVersionChange());
</span><span class="cx">
</span><del>- auto operation = IDBClient::createTransactionOperation(*this, &IDBTransaction::didDeleteIndexOnServer, &IDBTransaction::deleteIndexOnServer, objectStoreIdentifier, indexName);
- scheduleOperation(WTFMove(operation));
</del><ins>+ scheduleOperation(IDBClient::createTransactionOperation(*this, &IDBTransaction::didDeleteIndexOnServer, &IDBTransaction::deleteIndexOnServer, objectStoreIdentifier, indexName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBTransaction::deleteIndexOnServer(IDBClient::TransactionOperation& operation, const uint64_t& objectStoreIdentifier, const String& indexName)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp (208202 => 208203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-11-01 00:42:23 UTC (rev 208202)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-11-01 00:46:52 UTC (rev 208203)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::createObjectStore(TransactionOperation& operation, const IDBObjectStoreInfo& info)
</span><span class="cx"> {
</span><del>- const IDBRequestData requestData(operation);
</del><ins>+ const IDBRequestData requestData { operation };
</ins><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::createObjectStore, requestData, info);
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::renameObjectStore(TransactionOperation& operation, uint64_t objectStoreIdentifier, const String& newName)
</span><span class="cx"> {
</span><del>- const IDBRequestData requestData(operation);
</del><ins>+ const IDBRequestData requestData { operation };
</ins><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::renameObjectStore, requestData, objectStoreIdentifier, newName);
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::renameIndex(TransactionOperation& operation, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const String& newName)
</span><span class="cx"> {
</span><del>- const IDBRequestData requestData(operation);
</del><ins>+ const IDBRequestData requestData { operation };
</ins><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::renameIndex, requestData, objectStoreIdentifier, indexIdentifier, newName);
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::deleteObjectStore(TransactionOperation& operation, const String& objectStoreName)
</span><span class="cx"> {
</span><del>- const IDBRequestData requestData(operation);
</del><ins>+ const IDBRequestData requestData { operation };
</ins><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::deleteObjectStore, requestData, objectStoreName);
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::clearObjectStore(TransactionOperation& operation, uint64_t objectStoreIdentifier)
</span><span class="cx"> {
</span><del>- const IDBRequestData requestData(operation);
</del><ins>+ const IDBRequestData requestData { operation };
</ins><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::clearObjectStore, requestData, objectStoreIdentifier);
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::createIndex(TransactionOperation& operation, const IDBIndexInfo& info)
</span><span class="cx"> {
</span><del>- const IDBRequestData requestData(operation);
</del><ins>+ const IDBRequestData requestData { operation };
</ins><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::createIndex, requestData, info);
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::deleteIndex(TransactionOperation& operation, uint64_t objectStoreIdentifier, const String& indexName)
</span><span class="cx"> {
</span><del>- const IDBRequestData requestData(operation);
</del><ins>+ const IDBRequestData requestData { operation };
</ins><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::deleteIndex, requestData, WTFMove(objectStoreIdentifier), indexName);
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::putOrAdd(TransactionOperation& operation, IDBKeyData&& keyData, const IDBValue& value, const IndexedDB::ObjectStoreOverwriteMode mode)
</span><span class="cx"> {
</span><del>- const IDBRequestData requestData(operation);
</del><ins>+ const IDBRequestData requestData { operation };
</ins><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::putOrAdd, requestData, keyData, value, mode);
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::getRecord(TransactionOperation& operation, const IDBGetRecordData& getRecordData)
</span><span class="cx"> {
</span><del>- const IDBRequestData requestData(operation);
</del><ins>+ const IDBRequestData requestData { operation };
</ins><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::getRecord, requestData, getRecordData);
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::getAllRecords(TransactionOperation& operation, const IDBGetAllRecordsData& getAllRecordsData)
</span><span class="cx"> {
</span><del>- const IDBRequestData requestData(operation);
</del><ins>+ const IDBRequestData requestData { operation };
</ins><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::getAllRecords, requestData, getAllRecordsData);
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::getCount(TransactionOperation& operation, const IDBKeyRangeData& keyRange)
</span><span class="cx"> {
</span><del>- const IDBRequestData requestData(operation);
</del><ins>+ const IDBRequestData requestData { operation };
</ins><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::getCount, requestData, keyRange);
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::deleteRecord(TransactionOperation& operation, const IDBKeyRangeData& keyRange)
</span><span class="cx"> {
</span><del>- const IDBRequestData requestData(operation);
</del><ins>+ const IDBRequestData requestData { operation };
</ins><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::deleteRecord, requestData, keyRange);
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::openCursor(TransactionOperation& operation, const IDBCursorInfo& info)
</span><span class="cx"> {
</span><del>- const IDBRequestData requestData(operation);
</del><ins>+ const IDBRequestData requestData { operation };
</ins><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::openCursor, requestData, info);
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::iterateCursor(TransactionOperation& operation, const IDBKeyData& key, unsigned long count)
</span><span class="cx"> {
</span><del>- const IDBRequestData requestData(operation);
</del><ins>+ const IDBRequestData requestData { operation };
</ins><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::iterateCursor, requestData, key, count);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp (208202 => 208203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp 2016-11-01 00:42:23 UTC (rev 208202)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.cpp 2016-11-01 00:46:52 UTC (rev 208203)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> LOG(IndexedDB, "MemoryIDBBackingStore::beginTransaction");
</span><span class="cx">
</span><span class="cx"> if (m_transactions.contains(info.identifier()))
</span><del>- return IDBError(IDBDatabaseException::InvalidStateError, "Backing store asked to create transaction it already has a record of");
</del><ins>+ return { IDBDatabaseException::InvalidStateError, "Backing store asked to create transaction it already has a record of" };
</ins><span class="cx">
</span><span class="cx"> auto transaction = MemoryBackingStoreTransaction::create(*this, info);
</span><span class="cx">
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> m_transactions.set(info.identifier(), WTFMove(transaction));
</span><span class="cx">
</span><del>- return IDBError();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError MemoryIDBBackingStore::abortTransaction(const IDBResourceIdentifier& transactionIdentifier)
</span><span class="lines">@@ -106,11 +106,11 @@
</span><span class="cx">
</span><span class="cx"> auto transaction = m_transactions.take(transactionIdentifier);
</span><span class="cx"> if (!transaction)
</span><del>- return IDBError(IDBDatabaseException::InvalidStateError, "Backing store asked to abort transaction it didn't have record of");
</del><ins>+ return { IDBDatabaseException::InvalidStateError, "Backing store asked to abort transaction it didn't have record of" };
</ins><span class="cx">
</span><span class="cx"> transaction->abort();
</span><span class="cx">
</span><del>- return IDBError();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError MemoryIDBBackingStore::commitTransaction(const IDBResourceIdentifier& transactionIdentifier)
</span><span class="lines">@@ -119,11 +119,11 @@
</span><span class="cx">
</span><span class="cx"> auto transaction = m_transactions.take(transactionIdentifier);
</span><span class="cx"> if (!transaction)
</span><del>- return IDBError(IDBDatabaseException::InvalidStateError, "Backing store asked to commit transaction it didn't have record of");
</del><ins>+ return { IDBDatabaseException::InvalidStateError, "Backing store asked to commit transaction it didn't have record of" };
</ins><span class="cx">
</span><span class="cx"> transaction->commit();
</span><span class="cx">
</span><del>- return IDBError();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError MemoryIDBBackingStore::createObjectStore(const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo& info)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_databaseInfo);
</span><span class="cx"> if (m_databaseInfo->hasObjectStore(info.name()))
</span><del>- return IDBError(IDBDatabaseException::ConstraintError);
</del><ins>+ return { IDBDatabaseException::ConstraintError };
</ins><span class="cx">
</span><span class="cx"> ASSERT(!m_objectStoresByIdentifier.contains(info.identifier()));
</span><span class="cx"> auto objectStore = MemoryObjectStore::create(info);
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> rawTransaction->addNewObjectStore(objectStore.get());
</span><span class="cx"> registerObjectStore(WTFMove(objectStore));
</span><span class="cx">
</span><del>- return IDBError();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError MemoryIDBBackingStore::deleteObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_databaseInfo);
</span><span class="cx"> if (!m_databaseInfo->infoForExistingObjectStore(objectStoreIdentifier))
</span><del>- return IDBError(IDBDatabaseException::ConstraintError);
</del><ins>+ return { IDBDatabaseException::ConstraintError };
</ins><span class="cx">
</span><span class="cx"> auto transaction = m_transactions.get(transactionIdentifier);
</span><span class="cx"> ASSERT(transaction);
</span><span class="lines">@@ -164,12 +164,12 @@
</span><span class="cx"> auto objectStore = takeObjectStoreByIdentifier(objectStoreIdentifier);
</span><span class="cx"> ASSERT(objectStore);
</span><span class="cx"> if (!objectStore)
</span><del>- return IDBError(IDBDatabaseException::ConstraintError);
</del><ins>+ return { IDBDatabaseException::ConstraintError };
</ins><span class="cx">
</span><span class="cx"> m_databaseInfo->deleteObjectStore(objectStore->info().name());
</span><span class="cx"> transaction->objectStoreDeleted(*objectStore);
</span><span class="cx">
</span><del>- return IDBError();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError MemoryIDBBackingStore::renameObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const String& newName)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_databaseInfo);
</span><span class="cx"> if (!m_databaseInfo->infoForExistingObjectStore(objectStoreIdentifier))
</span><del>- return IDBError(IDBDatabaseException::ConstraintError);
</del><ins>+ return { IDBDatabaseException::ConstraintError };
</ins><span class="cx">
</span><span class="cx"> auto transaction = m_transactions.get(transactionIdentifier);
</span><span class="cx"> ASSERT(transaction);
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> auto objectStore = m_objectStoresByIdentifier.get(objectStoreIdentifier);
</span><span class="cx"> ASSERT(objectStore);
</span><span class="cx"> if (!objectStore)
</span><del>- return IDBError(IDBDatabaseException::ConstraintError);
</del><ins>+ return { IDBDatabaseException::ConstraintError };
</ins><span class="cx">
</span><span class="cx"> String oldName = objectStore->info().name();
</span><span class="cx"> objectStore->rename(newName);
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx">
</span><span class="cx"> m_databaseInfo->renameObjectStore(objectStoreIdentifier, newName);
</span><span class="cx">
</span><del>- return IDBError();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError MemoryIDBBackingStore::clearObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier)
</span><span class="lines">@@ -212,11 +212,11 @@
</span><span class="cx">
</span><span class="cx"> auto objectStore = m_objectStoresByIdentifier.get(objectStoreIdentifier);
</span><span class="cx"> if (!objectStore)
</span><del>- return IDBError(IDBDatabaseException::ConstraintError);
</del><ins>+ return { IDBDatabaseException::ConstraintError };
</ins><span class="cx">
</span><span class="cx"> objectStore->clear();
</span><span class="cx">
</span><del>- return IDBError();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError MemoryIDBBackingStore::createIndex(const IDBResourceIdentifier& transactionIdentifier, const IDBIndexInfo& info)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx">
</span><span class="cx"> auto* objectStore = m_objectStoresByIdentifier.get(info.objectStoreIdentifier());
</span><span class="cx"> if (!objectStore)
</span><del>- return IDBError(IDBDatabaseException::ConstraintError);
</del><ins>+ return { IDBDatabaseException::ConstraintError };
</ins><span class="cx">
</span><span class="cx"> return objectStore->createIndex(*rawTransaction, info);
</span><span class="cx"> }
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx">
</span><span class="cx"> auto* objectStore = m_objectStoresByIdentifier.get(objectStoreIdentifier);
</span><span class="cx"> if (!objectStore)
</span><del>- return IDBError(IDBDatabaseException::ConstraintError);
</del><ins>+ return { IDBDatabaseException::ConstraintError };
</ins><span class="cx">
</span><span class="cx"> return objectStore->deleteIndex(*rawTransaction, indexIdentifier);
</span><span class="cx"> }
</span><span class="lines">@@ -256,11 +256,11 @@
</span><span class="cx"> ASSERT(m_databaseInfo);
</span><span class="cx"> auto* objectStoreInfo = m_databaseInfo->infoForExistingObjectStore(objectStoreIdentifier);
</span><span class="cx"> if (!objectStoreInfo)
</span><del>- return IDBError(IDBDatabaseException::ConstraintError);
</del><ins>+ return { IDBDatabaseException::ConstraintError };
</ins><span class="cx">
</span><span class="cx"> auto* indexInfo = objectStoreInfo->infoForExistingIndex(indexIdentifier);
</span><span class="cx"> if (!indexInfo)
</span><del>- return IDBError(IDBDatabaseException::ConstraintError);
</del><ins>+ return { IDBDatabaseException::ConstraintError };
</ins><span class="cx">
</span><span class="cx"> auto transaction = m_transactions.get(transactionIdentifier);
</span><span class="cx"> ASSERT(transaction);
</span><span class="lines">@@ -269,12 +269,12 @@
</span><span class="cx"> auto objectStore = m_objectStoresByIdentifier.get(objectStoreIdentifier);
</span><span class="cx"> ASSERT(objectStore);
</span><span class="cx"> if (!objectStore)
</span><del>- return IDBError(IDBDatabaseException::ConstraintError);
</del><ins>+ return { IDBDatabaseException::ConstraintError };
</ins><span class="cx">
</span><span class="cx"> auto* index = objectStore->indexForIdentifier(indexIdentifier);
</span><span class="cx"> ASSERT(index);
</span><span class="cx"> if (!index)
</span><del>- return IDBError(IDBDatabaseException::ConstraintError);
</del><ins>+ return { IDBDatabaseException::ConstraintError };
</ins><span class="cx">
</span><span class="cx"> String oldName = index->info().name();
</span><span class="cx"> objectStore->renameIndex(*index, newName);
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx">
</span><span class="cx"> indexInfo->rename(newName);
</span><span class="cx">
</span><del>- return IDBError();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MemoryIDBBackingStore::removeObjectStoreForVersionChangeAbort(MemoryObjectStore& objectStore)
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> RELEASE_ASSERT(objectStore);
</span><span class="cx">
</span><span class="cx"> keyExists = objectStore->containsRecord(keyData);
</span><del>- return IDBError();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError MemoryIDBBackingStore::deleteRange(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyRangeData& range)
</span><span class="lines">@@ -322,14 +322,14 @@
</span><span class="cx"> ASSERT(objectStoreIdentifier);
</span><span class="cx">
</span><span class="cx"> if (!m_transactions.contains(transactionIdentifier))
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found to delete from"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found to delete from") };
</ins><span class="cx">
</span><span class="cx"> MemoryObjectStore* objectStore = m_objectStoresByIdentifier.get(objectStoreIdentifier);
</span><span class="cx"> if (!objectStore)
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found") };
</ins><span class="cx">
</span><span class="cx"> objectStore->deleteRange(range);
</span><del>- return IDBError();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError MemoryIDBBackingStore::addRecord(const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo& objectStoreInfo, const IDBKeyData& keyData, const IDBValue& value)
</span><span class="lines">@@ -340,11 +340,11 @@
</span><span class="cx">
</span><span class="cx"> auto transaction = m_transactions.get(transactionIdentifier);
</span><span class="cx"> if (!transaction)
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found to put record"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found to put record") };
</ins><span class="cx">
</span><span class="cx"> MemoryObjectStore* objectStore = m_objectStoresByIdentifier.get(objectStoreInfo.identifier());
</span><span class="cx"> if (!objectStore)
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found to put record"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found to put record") };
</ins><span class="cx">
</span><span class="cx"> return objectStore->addRecord(*transaction, keyData, value);
</span><span class="cx"> }
</span><span class="lines">@@ -356,14 +356,14 @@
</span><span class="cx"> ASSERT(objectStoreIdentifier);
</span><span class="cx">
</span><span class="cx"> if (!m_transactions.contains(transactionIdentifier))
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found to get record"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found to get record") };
</ins><span class="cx">
</span><span class="cx"> MemoryObjectStore* objectStore = m_objectStoresByIdentifier.get(objectStoreIdentifier);
</span><span class="cx"> if (!objectStore)
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found") };
</ins><span class="cx">
</span><span class="cx"> outValue = objectStore->valueForKeyRange(range);
</span><del>- return IDBError();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError MemoryIDBBackingStore::getAllRecords(const IDBResourceIdentifier& transactionIdentifier, const IDBGetAllRecordsData& getAllRecordsData, IDBGetAllResult& result)
</span><span class="lines">@@ -373,11 +373,11 @@
</span><span class="cx"> ASSERT(getAllRecordsData.objectStoreIdentifier);
</span><span class="cx">
</span><span class="cx"> if (!m_transactions.contains(transactionIdentifier))
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found to get all records"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found to get all records") };
</ins><span class="cx">
</span><span class="cx"> MemoryObjectStore* objectStore = m_objectStoresByIdentifier.get(getAllRecordsData.objectStoreIdentifier);
</span><span class="cx"> if (!objectStore)
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found") };
</ins><span class="cx">
</span><span class="cx"> objectStore->getAllRecords(getAllRecordsData.keyRangeData, getAllRecordsData.count, getAllRecordsData.getAllType, result);
</span><span class="cx"> return { };
</span><span class="lines">@@ -390,14 +390,14 @@
</span><span class="cx"> ASSERT(objectStoreIdentifier);
</span><span class="cx">
</span><span class="cx"> if (!m_transactions.contains(transactionIdentifier))
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found to get record"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found to get record") };
</ins><span class="cx">
</span><span class="cx"> MemoryObjectStore* objectStore = m_objectStoresByIdentifier.get(objectStoreIdentifier);
</span><span class="cx"> if (!objectStore)
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found") };
</ins><span class="cx">
</span><span class="cx"> outValue = objectStore->indexValueForKeyRange(indexIdentifier, recordType, range);
</span><del>- return IDBError();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError MemoryIDBBackingStore::getCount(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const IDBKeyRangeData& range, uint64_t& outCount)
</span><span class="lines">@@ -407,15 +407,15 @@
</span><span class="cx"> ASSERT(objectStoreIdentifier);
</span><span class="cx">
</span><span class="cx"> if (!m_transactions.contains(transactionIdentifier))
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found to get count"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found to get count") };
</ins><span class="cx">
</span><span class="cx"> MemoryObjectStore* objectStore = m_objectStoresByIdentifier.get(objectStoreIdentifier);
</span><span class="cx"> if (!objectStore)
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found") };
</ins><span class="cx">
</span><span class="cx"> outCount = objectStore->countForKeyRange(indexIdentifier, range);
</span><span class="cx">
</span><del>- return IDBError();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError MemoryIDBBackingStore::generateKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t& keyNumber)
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx">
</span><span class="cx"> objectStore->setKeyGeneratorValue(keyNumber + 1);
</span><span class="cx">
</span><del>- return IDBError();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError MemoryIDBBackingStore::revertGeneratedKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t keyNumber)
</span><span class="lines">@@ -483,17 +483,17 @@
</span><span class="cx"> ASSERT(!MemoryCursor::cursorForIdentifier(info.identifier()));
</span><span class="cx">
</span><span class="cx"> if (!m_transactions.contains(transactionIdentifier))
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found in which to open a cursor"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found in which to open a cursor") };
</ins><span class="cx">
</span><span class="cx"> switch (info.cursorSource()) {
</span><span class="cx"> case IndexedDB::CursorSource::ObjectStore: {
</span><span class="cx"> auto* objectStore = m_objectStoresByIdentifier.get(info.sourceIdentifier());
</span><span class="cx"> if (!objectStore)
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found") };
</ins><span class="cx">
</span><span class="cx"> MemoryCursor* cursor = objectStore->maybeOpenCursor(info);
</span><span class="cx"> if (!cursor)
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("Could not create object store cursor in backing store"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Could not create object store cursor in backing store") };
</ins><span class="cx">
</span><span class="cx"> cursor->currentData(outData);
</span><span class="cx"> break;
</span><span class="lines">@@ -501,15 +501,15 @@
</span><span class="cx"> case IndexedDB::CursorSource::Index:
</span><span class="cx"> auto* objectStore = m_objectStoresByIdentifier.get(info.objectStoreIdentifier());
</span><span class="cx"> if (!objectStore)
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store object store found") };
</ins><span class="cx">
</span><span class="cx"> auto* index = objectStore->indexForIdentifier(info.sourceIdentifier());
</span><span class="cx"> if (!index)
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store index found"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store index found") };
</ins><span class="cx">
</span><span class="cx"> MemoryCursor* cursor = index->maybeOpenCursor(info);
</span><span class="cx"> if (!cursor)
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("Could not create index cursor in backing store"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Could not create index cursor in backing store") };
</ins><span class="cx">
</span><span class="cx"> cursor->currentData(outData);
</span><span class="cx"> break;
</span><span class="lines">@@ -523,11 +523,11 @@
</span><span class="cx"> LOG(IndexedDB, "MemoryIDBBackingStore::iterateCursor");
</span><span class="cx">
</span><span class="cx"> if (!m_transactions.contains(transactionIdentifier))
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found in which to iterate cursor"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store transaction found in which to iterate cursor") };
</ins><span class="cx">
</span><span class="cx"> auto* cursor = MemoryCursor::cursorForIdentifier(cursorIdentifier);
</span><span class="cx"> if (!cursor)
</span><del>- return IDBError(IDBDatabaseException::UnknownError, ASCIILiteral("No backing store cursor found in which to iterate cursor"));
</del><ins>+ return { IDBDatabaseException::UnknownError, ASCIILiteral("No backing store cursor found in which to iterate cursor") };
</ins><span class="cx">
</span><span class="cx"> cursor->iterate(key, count, outData);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBResultDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp (208202 => 208203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp 2016-11-01 00:42:23 UTC (rev 208202)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp 2016-11-01 00:46:52 UTC (rev 208203)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> IDBResultData IDBResultData::error(const IDBResourceIdentifier& requestIdentifier, const IDBError& error)
</span><span class="cx"> {
</span><del>- IDBResultData result(requestIdentifier);
</del><ins>+ IDBResultData result { requestIdentifier };
</ins><span class="cx"> result.m_type = IDBResultType::Error;
</span><span class="cx"> result.m_error = error;
</span><span class="cx"> return result;
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> IDBResultData IDBResultData::openDatabaseSuccess(const IDBResourceIdentifier& requestIdentifier, IDBServer::UniqueIDBDatabaseConnection& connection)
</span><span class="cx"> {
</span><del>- IDBResultData result(requestIdentifier);
</del><ins>+ IDBResultData result { requestIdentifier };
</ins><span class="cx"> result.m_type = IDBResultType::OpenDatabaseSuccess;
</span><span class="cx"> result.m_databaseConnectionIdentifier = connection.identifier();
</span><span class="cx"> result.m_databaseInfo = std::make_unique<IDBDatabaseInfo>(connection.database().info());
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> IDBResultData IDBResultData::openDatabaseUpgradeNeeded(const IDBResourceIdentifier& requestIdentifier, IDBServer::UniqueIDBDatabaseTransaction& transaction)
</span><span class="cx"> {
</span><del>- IDBResultData result(requestIdentifier);
</del><ins>+ IDBResultData result { requestIdentifier };
</ins><span class="cx"> result.m_type = IDBResultType::OpenDatabaseUpgradeNeeded;
</span><span class="cx"> result.m_databaseConnectionIdentifier = transaction.databaseConnection().identifier();
</span><span class="cx"> result.m_databaseInfo = std::make_unique<IDBDatabaseInfo>(transaction.databaseConnection().database().info());
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx">
</span><span class="cx"> IDBResultData IDBResultData::deleteDatabaseSuccess(const IDBResourceIdentifier& requestIdentifier, const IDBDatabaseInfo& info)
</span><span class="cx"> {
</span><del>- IDBResultData result(IDBResultType::DeleteDatabaseSuccess, requestIdentifier);
</del><ins>+ IDBResultData result {IDBResultType::DeleteDatabaseSuccess, requestIdentifier };
</ins><span class="cx"> result.m_databaseInfo = std::make_unique<IDBDatabaseInfo>(info);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx">
</span><span class="cx"> IDBResultData IDBResultData::putOrAddSuccess(const IDBResourceIdentifier& requestIdentifier, const IDBKeyData& resultKey)
</span><span class="cx"> {
</span><del>- IDBResultData result(IDBResultType::PutOrAddSuccess, requestIdentifier);
</del><ins>+ IDBResultData result { IDBResultType::PutOrAddSuccess, requestIdentifier };
</ins><span class="cx"> result.m_resultKey = std::make_unique<IDBKeyData>(resultKey);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx">
</span><span class="cx"> IDBResultData IDBResultData::getRecordSuccess(const IDBResourceIdentifier& requestIdentifier, const IDBGetResult& getResult)
</span><span class="cx"> {
</span><del>- IDBResultData result(IDBResultType::GetRecordSuccess, requestIdentifier);
</del><ins>+ IDBResultData result { IDBResultType::GetRecordSuccess, requestIdentifier };
</ins><span class="cx"> result.m_getResult = std::make_unique<IDBGetResult>(getResult);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx">
</span><span class="cx"> IDBResultData IDBResultData::getAllRecordsSuccess(const IDBResourceIdentifier& requestIdentifier, const IDBGetAllResult& getAllResult)
</span><span class="cx"> {
</span><del>- IDBResultData result(IDBResultType::GetAllRecordsSuccess, requestIdentifier);
</del><ins>+ IDBResultData result { IDBResultType::GetAllRecordsSuccess, requestIdentifier };
</ins><span class="cx"> result.m_getAllResult = std::make_unique<IDBGetAllResult>(getAllResult);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> IDBResultData IDBResultData::getCountSuccess(const IDBResourceIdentifier& requestIdentifier, uint64_t count)
</span><span class="cx"> {
</span><del>- IDBResultData result(IDBResultType::GetRecordSuccess, requestIdentifier);
</del><ins>+ IDBResultData result { IDBResultType::GetRecordSuccess, requestIdentifier };
</ins><span class="cx"> result.m_resultInteger = count;
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx">
</span><span class="cx"> IDBResultData IDBResultData::openCursorSuccess(const IDBResourceIdentifier& requestIdentifier, const IDBGetResult& getResult)
</span><span class="cx"> {
</span><del>- IDBResultData result(IDBResultType::OpenCursorSuccess, requestIdentifier);
</del><ins>+ IDBResultData result { IDBResultType::OpenCursorSuccess, requestIdentifier };
</ins><span class="cx"> result.m_getResult = std::make_unique<IDBGetResult>(getResult);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx">
</span><span class="cx"> IDBResultData IDBResultData::iterateCursorSuccess(const IDBResourceIdentifier& requestIdentifier, const IDBGetResult& getResult)
</span><span class="cx"> {
</span><del>- IDBResultData result(IDBResultType::IterateCursorSuccess, requestIdentifier);
</del><ins>+ IDBResultData result { IDBResultType::IterateCursorSuccess, requestIdentifier };
</ins><span class="cx"> result.m_getResult = std::make_unique<IDBGetResult>(getResult);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>