[IndexedDB] Refactoring to remove ref ptrs and host transaction ids.

content/browser/indexed_db/indexed_db_transaction_coordinator.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/indexed_db/indexed_db_transaction_coordinator.h"
 
 #include "base/logging.h"
 #include "content/browser/indexed_db/indexed_db_transaction.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBTypes.h"
 
 namespace content {
 
 IndexedDBTransactionCoordinator::IndexedDBTransactionCoordinator() {}
 
 IndexedDBTransactionCoordinator::~IndexedDBTransactionCoordinator() {
   DCHECK(queued_transactions_.empty());
   DCHECK(started_transactions_.empty());
 }
 
 void IndexedDBTransactionCoordinator::DidCreateTransaction(
-    scoped_refptr<IndexedDBTransaction> transaction) {
+    IndexedDBTransaction* transaction) {
   DCHECK(!queued_transactions_.count(transaction));
   DCHECK(!started_transactions_.count(transaction));
   DCHECK_EQ(IndexedDBTransaction::CREATED, transaction->state());
 
   queued_transactions_.insert(transaction);
   ProcessQueuedTransactions();
 }
 
 void IndexedDBTransactionCoordinator::DidFinishTransaction(
     IndexedDBTransaction* transaction) {
@@ skipping 26 matching lines @@
     DCHECK(!found);
     found = true;
   }
   return found;
 }
 #endif
 
 std::vector<const IndexedDBTransaction*>
 IndexedDBTransactionCoordinator::GetTransactions() const {
   std::vector<const IndexedDBTransaction*> result;
+  result.reserve(started_transactions_.size() + queued_transactions_.size());
 
   for (const auto& transaction : started_transactions_)
-    result.push_back(transaction.get());
+    result.push_back(transaction);

[jsbell, 2016/11/04 17:48:19]

Now that both types are raw pointers can this be result.insert(result.end(),
started_transactions_.begin(), started_transactions_.end()) ? Or does the const
prevent that?

[dmurph, 2016/11/04 22:52:25]

Done.

   for (const auto& transaction : queued_transactions_)
-    result.push_back(transaction.get());
+    result.push_back(transaction);
 
   return result;
 }
 
 void IndexedDBTransactionCoordinator::ProcessQueuedTransactions() {
   if (queued_transactions_.empty())
     return;
 
   DCHECK(!IsRunningVersionChangeTransaction());
 
   // The locked_scope set accumulates the ids of object stores in the scope of
   // running read/write transactions. Other read-write transactions with
   // stores in this set may not be started. Read-only transactions may start,
   // taking a snapshot of the database, which does not include uncommitted
   // data. ("Version change" transactions are exclusive, but handled by the
   // connection sequencing in IndexedDBDatabase.)
   std::set<int64_t> locked_scope;
   for (const auto& transaction : started_transactions_) {
     if (transaction->mode() == blink::WebIDBTransactionModeReadWrite) {
       // Started read/write transactions have exclusive access to the object
       // stores within their scopes.
       locked_scope.insert(transaction->scope().begin(),
                           transaction->scope().end());
     }
   }
 
   auto it = queued_transactions_.begin();
   while (it != queued_transactions_.end()) {
-    scoped_refptr<IndexedDBTransaction> transaction = *it;
+    IndexedDBTransaction* transaction = *it;
     ++it;
-    if (CanStartTransaction(transaction.get(), locked_scope)) {
+    if (CanStartTransaction(transaction, locked_scope)) {
       DCHECK_EQ(IndexedDBTransaction::CREATED, transaction->state());
       queued_transactions_.erase(transaction);
       started_transactions_.insert(transaction);
       transaction->Start();
       DCHECK_EQ(IndexedDBTransaction::STARTED, transaction->state());
     }
     if (transaction->mode() == blink::WebIDBTransactionModeReadWrite) {
       // Either the transaction started, so it has exclusive access to the
       // stores in its scope, or per the spec the transaction which was
       // created first must get access first, so the stores are also locked.
@@ skipping 32 matching lines @@
 
     case blink::WebIDBTransactionModeReadOnly:
     case blink::WebIDBTransactionModeReadWrite:
       return !DoSetsIntersect(transaction->scope(), locked_scope);
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace content