Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Unified Diff: content/browser/indexed_db/indexed_db_database_callbacks.cc

Issue 2472213003: [IndexedDB] Refactoring to remove ref ptrs and host transaction ids. (Closed)
Patch Set: updated unittests Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/indexed_db/indexed_db_database_callbacks.cc
diff --git a/content/browser/indexed_db/indexed_db_database_callbacks.cc b/content/browser/indexed_db/indexed_db_database_callbacks.cc
index d9aa90af00b717db771ab452b0f5fd32797e6c62..2fbb57f95b5dd2bdfe8d9184163606ac1efa7de9 100644
--- a/content/browser/indexed_db/indexed_db_database_callbacks.cc
+++ b/content/browser/indexed_db/indexed_db_database_callbacks.cc
@@ -8,6 +8,7 @@
#include "content/browser/indexed_db/indexed_db_database_error.h"
#include "content/browser/indexed_db/indexed_db_dispatcher_host.h"
#include "content/browser/indexed_db/indexed_db_observer_changes.h"
+#include "content/browser/indexed_db/indexed_db_transaction.h"
#include "content/common/indexed_db/indexed_db_messages.h"
using ::indexed_db::mojom::DatabaseCallbacksAssociatedPtrInfo;
@@ -70,33 +71,33 @@ void IndexedDBDatabaseCallbacks::OnVersionChange(int64_t old_version,
base::Unretained(io_helper_.get()), old_version, new_version));
}
-void IndexedDBDatabaseCallbacks::OnAbort(int64_t host_transaction_id,
- const IndexedDBDatabaseError& error) {
+void IndexedDBDatabaseCallbacks::OnAbort(
+ const IndexedDBTransaction& transaction,
+ const IndexedDBDatabaseError& error) {
DCHECK(thread_checker_.CalledOnValidThread());
if (!dispatcher_host_)
return;
- dispatcher_host_->FinishTransaction(host_transaction_id, false);
+ dispatcher_host_->FinishTransaction(transaction.origin(), false);
DCHECK(io_helper_);
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
base::Bind(&IOThreadHelper::SendAbort, base::Unretained(io_helper_.get()),
- dispatcher_host_->RendererTransactionId(host_transaction_id),
- error));
+ transaction.id(), error));
}
-void IndexedDBDatabaseCallbacks::OnComplete(int64_t host_transaction_id) {
+void IndexedDBDatabaseCallbacks::OnComplete(
+ const IndexedDBTransaction& transaction) {
DCHECK(thread_checker_.CalledOnValidThread());
if (!dispatcher_host_)
return;
- dispatcher_host_->FinishTransaction(host_transaction_id, true);
+ dispatcher_host_->FinishTransaction(transaction.origin(), true);
DCHECK(io_helper_);
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
base::Bind(&IOThreadHelper::SendComplete,
- base::Unretained(io_helper_.get()),
- dispatcher_host_->RendererTransactionId(host_transaction_id)));
+ base::Unretained(io_helper_.get()), transaction.id()));
}
void IndexedDBDatabaseCallbacks::OnDatabaseChange(

Powered by Google App Engine
This is Rietveld 408576698