Chromium Code Reviews| Index: content/browser/indexed_db/indexed_db_transaction.cc |
| diff --git a/content/browser/indexed_db/indexed_db_transaction.cc b/content/browser/indexed_db/indexed_db_transaction.cc |
| index 5de620da9bdbddf97f98f36f3b4703c6f583b6e2..9d96fba867ee2c259b5e6003fb5de873bf56d296 100644 |
| --- a/content/browser/indexed_db/indexed_db_transaction.cc |
| +++ b/content/browser/indexed_db/indexed_db_transaction.cc |
| @@ -16,7 +16,9 @@ |
| #include "content/browser/indexed_db/indexed_db_cursor.h" |
| #include "content/browser/indexed_db/indexed_db_database.h" |
| #include "content/browser/indexed_db/indexed_db_database_callbacks.h" |
| +#include "content/browser/indexed_db/indexed_db_observation.h" |
| #include "content/browser/indexed_db/indexed_db_observer.h" |
| +#include "content/browser/indexed_db/indexed_db_observer_changes.h" |
| #include "content/browser/indexed_db/indexed_db_tracing.h" |
| #include "content/browser/indexed_db/indexed_db_transaction_coordinator.h" |
| #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseException.h" |
| @@ -356,6 +358,7 @@ leveldb::Status IndexedDBTransaction::CommitPhaseTwo() { |
| "txn.id", id()); |
| callbacks_->OnComplete(id_); |
| } |
| + database_->SendObservations(std::move(connection_changes_map_)); |
|
dmurph
2016/07/08 18:40:44
Activate pending observers after this.
palakj1
2016/07/08 22:17:54
Sorry. Moving the orders.
|
| database_->TransactionFinished(this, true); |
| } else { |
| while (!abort_task_stack_.empty()) |
| @@ -457,7 +460,7 @@ void IndexedDBTransaction::CloseOpenCursors() { |
| void IndexedDBTransaction::AddPendingObserver(int32_t observer_id) { |
| pending_observers_.push_back( |
| - base::WrapUnique(new IndexedDBObserver(observer_id))); |
| + base::WrapUnique(new IndexedDBObserver(observer_id, object_store_ids_))); |
| } |
| void IndexedDBTransaction::RemovePendingObservers( |
| @@ -471,4 +474,16 @@ void IndexedDBTransaction::RemovePendingObservers( |
| pending_observers_.erase(it, pending_observers_.end()); |
| } |
| +void IndexedDBTransaction::AddObservation( |
| + int32_t connection_id, |
| + std::unique_ptr<IndexedDBObservation> observation) { |
| + connection_changes_map_[connection_id]->AddObservation( |
| + std::move(observation)); |
| +} |
| + |
| +void IndexedDBTransaction::AddObservationIndex(int32_t observer_id, |
| + int32_t connection_id) { |
| + connection_changes_map_[connection_id]->AddObservationIndex(observer_id); |
| +} |
| + |
| } // namespace content |