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

content/browser/indexed_db/database_impl.cc

 // Copyright 2016 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/database_impl.h"
 
 #include "content/browser/bad_message.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/indexed_db/indexed_db_connection.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/indexed_db/indexed_db_dispatcher_host.h"
+#include "content/browser/indexed_db/indexed_db_transaction.h"
 #include "content/browser/indexed_db/indexed_db_value.h"
 #include "storage/browser/blob/blob_storage_context.h"
 #include "storage/browser/quota/quota_manager_proxy.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseException.h"
 
 using std::swap;
 
 namespace content {
 
 namespace {
@@ skipping 424 matching lines @@
 
 void DatabaseImpl::IDBThreadHelper::CreateObjectStore(
     int64_t transaction_id,
     int64_t object_store_id,
     const base::string16& name,
     const IndexedDBKeyPath& key_path,
     bool auto_increment) {
   if (!connection_->IsConnected())
     return;
 
-  connection_->database()->CreateObjectStore(
-      dispatcher_host_->HostTransactionId(transaction_id), object_store_id,
-      name, key_path, auto_increment);
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
+  connection_->database()->CreateObjectStore(transaction, object_store_id, name,
+                                             key_path, auto_increment);
 }
 
 void DatabaseImpl::IDBThreadHelper::DeleteObjectStore(int64_t transaction_id,
                                                       int64_t object_store_id) {
   if (!connection_->IsConnected())
     return;
 
-  connection_->database()->DeleteObjectStore(
-      dispatcher_host_->HostTransactionId(transaction_id), object_store_id);
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
+  connection_->database()->DeleteObjectStore(transaction, object_store_id);
 }
 
 void DatabaseImpl::IDBThreadHelper::RenameObjectStore(
     int64_t transaction_id,
     int64_t object_store_id,
     const base::string16& new_name) {
   if (!connection_->IsConnected())
     return;
 
-  connection_->database()->RenameObjectStore(
-      dispatcher_host_->HostTransactionId(transaction_id), object_store_id,
-      new_name);
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
+  connection_->database()->RenameObjectStore(transaction, object_store_id,
+                                             new_name);
 }
 
 void DatabaseImpl::IDBThreadHelper::CreateTransaction(
     int64_t transaction_id,
     const std::vector<int64_t>& object_store_ids,
     blink::WebIDBTransactionMode mode) {
   if (!connection_->IsConnected())
     return;
 
-  int64_t host_transaction_id =
-      dispatcher_host_->HostTransactionId(transaction_id);
-  if (!dispatcher_host_->RegisterTransactionId(host_transaction_id, origin_)) {
-    DLOG(ERROR) << "Duplicate host_transaction_id.";

[jsbell, 2016/11/30 21:30:13]

Can you add the extra logging details into the DCHECK in
IndexedDBConnection::CreateTransaction ?

[dmurph, 2016/11/30 23:13:06]

Done.

-    return;
-  }
-
-  connection_->database()->CreateTransaction(
-      host_transaction_id, connection_.get(), object_store_ids, mode);
+  connection_->database()->CreateTransaction(transaction_id, connection_.get(),
+                                             object_store_ids, mode);
 }
 
 void DatabaseImpl::IDBThreadHelper::Close() {
   if (!connection_->IsConnected())
     return;
 
   connection_->Close();
 }
 
 void DatabaseImpl::IDBThreadHelper::VersionChangeIgnored() {
   if (!connection_->IsConnected())
     return;
 
   connection_->VersionChangeIgnored();
 }
 
 void DatabaseImpl::IDBThreadHelper::AddObserver(int64_t transaction_id,
                                                 int32_t observer_id,
                                                 bool include_transaction,
                                                 bool no_records,
                                                 bool values,
                                                 uint16_t operation_types) {
   if (!connection_->IsConnected())
     return;
 
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
   IndexedDBObserver::Options options(include_transaction, no_records, values,
                                      operation_types);
-  connection_->database()->AddPendingObserver(
-      dispatcher_host_->HostTransactionId(transaction_id), observer_id,
-      options);
+  connection_->database()->AddPendingObserver(transaction, observer_id,
+                                              options);
 }
 
 void DatabaseImpl::IDBThreadHelper::RemoveObservers(
     const std::vector<int32_t>& observers) {
   if (!connection_->IsConnected())
     return;
 
   connection_->RemoveObservers(observers);
 }
 
 void DatabaseImpl::IDBThreadHelper::Get(
     int64_t transaction_id,
     int64_t object_store_id,
     int64_t index_id,
     const IndexedDBKeyRange& key_range,
     bool key_only,
     scoped_refptr<IndexedDBCallbacks> callbacks) {
   if (!connection_->IsConnected())
     return;
 
-  connection_->database()->Get(
-      dispatcher_host_->HostTransactionId(transaction_id), object_store_id,
-      index_id, base::MakeUnique<IndexedDBKeyRange>(key_range), key_only,
-      callbacks);
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
+  connection_->database()->Get(transaction, object_store_id, index_id,
+                               base::MakeUnique<IndexedDBKeyRange>(key_range),
+                               key_only, callbacks);
 }
 
 void DatabaseImpl::IDBThreadHelper::GetAll(
     int64_t transaction_id,
     int64_t object_store_id,
     int64_t index_id,
     const IndexedDBKeyRange& key_range,
     bool key_only,
     int64_t max_count,
     scoped_refptr<IndexedDBCallbacks> callbacks) {
   if (!connection_->IsConnected())
     return;
 
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
   connection_->database()->GetAll(
-      dispatcher_host_->HostTransactionId(transaction_id), object_store_id,
-      index_id, base::MakeUnique<IndexedDBKeyRange>(key_range), key_only,
-      max_count, std::move(callbacks));
+      transaction, object_store_id, index_id,
+      base::MakeUnique<IndexedDBKeyRange>(key_range), key_only, max_count,
+      std::move(callbacks));
 }
 
 void DatabaseImpl::IDBThreadHelper::Put(
     int64_t transaction_id,
     int64_t object_store_id,
     ::indexed_db::mojom::ValuePtr mojo_value,
     std::vector<std::unique_ptr<storage::BlobDataHandle>> handles,
     std::vector<IndexedDBBlobInfo> blob_info,
     const IndexedDBKey& key,
     blink::WebIDBPutMode mode,
     const std::vector<IndexedDBIndexKeys>& index_keys,
     scoped_refptr<IndexedDBCallbacks> callbacks) {
   if (!connection_->IsConnected())
     return;
 
-  int64_t host_transaction_id =
-      dispatcher_host_->HostTransactionId(transaction_id);
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
   uint64_t commit_size = mojo_value->bits.size();
   IndexedDBValue value;
   swap(value.bits, mojo_value->bits);
   swap(value.blob_info, blob_info);
-  connection_->database()->Put(host_transaction_id, object_store_id, &value,
-                               &handles, base::MakeUnique<IndexedDBKey>(key),
-                               mode, std::move(callbacks), index_keys);
+  connection_->database()->Put(transaction, object_store_id, &value, &handles,
+                               base::MakeUnique<IndexedDBKey>(key), mode,
+                               std::move(callbacks), index_keys);
 
   // Size can't be big enough to overflow because it represents the
   // actual bytes passed through IPC.
-  dispatcher_host_->AddToTransaction(host_transaction_id, commit_size);
+  transaction->set_size(transaction->size() + commit_size);
 }
 
 void DatabaseImpl::IDBThreadHelper::SetIndexKeys(
     int64_t transaction_id,
     int64_t object_store_id,
     const IndexedDBKey& primary_key,
     const std::vector<IndexedDBIndexKeys>& index_keys) {
   if (!connection_->IsConnected())
     return;
 
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
   connection_->database()->SetIndexKeys(
-      dispatcher_host_->HostTransactionId(transaction_id), object_store_id,
-      base::MakeUnique<IndexedDBKey>(primary_key), index_keys);
+      transaction, object_store_id, base::MakeUnique<IndexedDBKey>(primary_key),
+      index_keys);
 }
 
 void DatabaseImpl::IDBThreadHelper::SetIndexesReady(
     int64_t transaction_id,
     int64_t object_store_id,
     const std::vector<int64_t>& index_ids) {
   if (!connection_->IsConnected())
     return;
 
-  connection_->database()->SetIndexesReady(
-      dispatcher_host_->HostTransactionId(transaction_id), object_store_id,
-      index_ids);
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
+  connection_->database()->SetIndexesReady(transaction, object_store_id,
+                                           index_ids);
 }
 
 void DatabaseImpl::IDBThreadHelper::OpenCursor(
     int64_t transaction_id,
     int64_t object_store_id,
     int64_t index_id,
     const IndexedDBKeyRange& key_range,
     blink::WebIDBCursorDirection direction,
     bool key_only,
     blink::WebIDBTaskType task_type,
     scoped_refptr<IndexedDBCallbacks> callbacks) {
   if (!connection_->IsConnected())
     return;
 
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
   connection_->database()->OpenCursor(
-      dispatcher_host_->HostTransactionId(transaction_id), object_store_id,
-      index_id, base::MakeUnique<IndexedDBKeyRange>(key_range), direction,
-      key_only, task_type, std::move(callbacks));
+      transaction, object_store_id, index_id,
+      base::MakeUnique<IndexedDBKeyRange>(key_range), direction, key_only,
+      task_type, std::move(callbacks));
 }
 
 void DatabaseImpl::IDBThreadHelper::Count(
     int64_t transaction_id,
     int64_t object_store_id,
     int64_t index_id,
     const IndexedDBKeyRange& key_range,
     scoped_refptr<IndexedDBCallbacks> callbacks) {
   if (!connection_->IsConnected())
     return;
 
-  connection_->database()->Count(
-      dispatcher_host_->HostTransactionId(transaction_id), object_store_id,
-      index_id, base::MakeUnique<IndexedDBKeyRange>(key_range),
-      std::move(callbacks));
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
+  connection_->database()->Count(transaction, object_store_id, index_id,
+                                 base::MakeUnique<IndexedDBKeyRange>(key_range),
+                                 std::move(callbacks));
 }
 
 void DatabaseImpl::IDBThreadHelper::DeleteRange(
     int64_t transaction_id,
     int64_t object_store_id,
     const IndexedDBKeyRange& key_range,
     scoped_refptr<IndexedDBCallbacks> callbacks) {
   if (!connection_->IsConnected())
     return;
 
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
   connection_->database()->DeleteRange(
-      dispatcher_host_->HostTransactionId(transaction_id), object_store_id,
+      transaction, object_store_id,
       base::MakeUnique<IndexedDBKeyRange>(key_range), std::move(callbacks));
 }
 
 void DatabaseImpl::IDBThreadHelper::Clear(
     int64_t transaction_id,
     int64_t object_store_id,
     scoped_refptr<IndexedDBCallbacks> callbacks) {
   if (!connection_->IsConnected())
     return;
 
-  connection_->database()->Clear(
-      dispatcher_host_->HostTransactionId(transaction_id), object_store_id,
-      callbacks);
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
+  connection_->database()->Clear(transaction, object_store_id, callbacks);
 }
 
 void DatabaseImpl::IDBThreadHelper::CreateIndex(
     int64_t transaction_id,
     int64_t object_store_id,
     int64_t index_id,
     const base::string16& name,
     const IndexedDBKeyPath& key_path,
     bool unique,
     bool multi_entry) {
   if (!connection_->IsConnected())
     return;
 
-  connection_->database()->CreateIndex(
-      dispatcher_host_->HostTransactionId(transaction_id), object_store_id,
-      index_id, name, key_path, unique, multi_entry);
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
+  connection_->database()->CreateIndex(transaction, object_store_id, index_id,
+                                       name, key_path, unique, multi_entry);
 }
 
 void DatabaseImpl::IDBThreadHelper::DeleteIndex(int64_t transaction_id,
                                                 int64_t object_store_id,
                                                 int64_t index_id) {
   if (!connection_->IsConnected())
     return;
 
-  connection_->database()->DeleteIndex(
-      dispatcher_host_->HostTransactionId(transaction_id), object_store_id,
-      index_id);
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
+  connection_->database()->DeleteIndex(transaction, object_store_id, index_id);
 }
 
 void DatabaseImpl::IDBThreadHelper::RenameIndex(
     int64_t transaction_id,
     int64_t object_store_id,
     int64_t index_id,
     const base::string16& new_name) {
   if (!connection_->IsConnected())
     return;
 
-  connection_->database()->RenameIndex(
-      dispatcher_host_->HostTransactionId(transaction_id), object_store_id,
-      index_id, new_name);
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
+  connection_->database()->RenameIndex(transaction, object_store_id, index_id,
+                                       new_name);
 }
 
 void DatabaseImpl::IDBThreadHelper::Abort(int64_t transaction_id) {
   if (!connection_->IsConnected())
     return;
 
-  connection_->database()->Abort(
-      dispatcher_host_->HostTransactionId(transaction_id));
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
+    return;
+
+  connection_->AbortTransaction(transaction);
 }
 
 void DatabaseImpl::IDBThreadHelper::Commit(int64_t transaction_id) {
   if (!connection_->IsConnected())
     return;
 
-  int64_t host_transaction_id =
-      dispatcher_host_->HostTransactionId(transaction_id);
-  // May have been aborted by back end before front-end could request commit.
-  int64_t transaction_size;
-  if (!dispatcher_host_->GetTransactionSize(host_transaction_id,
-                                            &transaction_size))
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
     return;
 
   // Always allow empty or delete-only transactions.
-  if (transaction_size == 0) {
-    connection_->database()->Commit(host_transaction_id);
+  if (transaction->size() == 0) {
+    connection_->database()->Commit(transaction);
     return;
   }
 
   dispatcher_host_->context()->quota_manager_proxy()->GetUsageAndQuota(
       dispatcher_host_->context()->TaskRunner(), origin_.GetURL(),
       storage::kStorageTypeTemporary,
       base::Bind(&IDBThreadHelper::OnGotUsageAndQuotaForCommit,
                  weak_factory_.GetWeakPtr(), transaction_id));
 }
 
 void DatabaseImpl::IDBThreadHelper::OnGotUsageAndQuotaForCommit(
     int64_t transaction_id,
     storage::QuotaStatusCode status,
     int64_t usage,
     int64_t quota) {
   // May have disconnected while quota check was pending.
   if (!connection_->IsConnected())
     return;
 
-  int64_t host_transaction_id =
-      dispatcher_host_->HostTransactionId(transaction_id);
-  // May have aborted while quota check was pending.
-  int64_t transaction_size;
-  if (!dispatcher_host_->GetTransactionSize(host_transaction_id,
-                                            &transaction_size))
+  IndexedDBTransaction* transaction =
+      connection_->GetTransaction(transaction_id);
+  if (!transaction)
     return;
 
-  if (status == storage::kQuotaStatusOk && usage + transaction_size <= quota) {
-    connection_->database()->Commit(host_transaction_id);
+  if (status == storage::kQuotaStatusOk &&
+      usage + transaction->size() <= quota) {
+    connection_->database()->Commit(transaction);
   } else {
-    connection_->database()->Abort(
-        host_transaction_id,
+    connection_->AbortTransaction(
+        transaction,
         IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionQuotaError));
   }
 }
 
 }  // namespace content