| 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..edbe64f3da19b86d36f41b857afac4686a78d4e2 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,34 @@ 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.connection()->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.connection()->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(
|
|
|