[IndexedDB] Propogating changes to observers : Renderer

content/browser/indexed_db/indexed_db_transaction.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.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
 #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"
 #include "third_party/leveldatabase/env_chromium.h"
 
 namespace content {
 
 namespace {
 
 const int64_t kInactivityTimeoutPeriodSeconds = 60;
@@ skipping 309 matching lines @@
   // released, and order is critical.
   CloseOpenCursors();
   transaction_->Reset();
 
   // Transactions must also be marked as completed before the
   // front-end is notified, as the transaction completion unblocks
   // operations like closing connections.
   database_->transaction_coordinator().DidFinishTransaction(this);
 
   if (committed) {
-    // TODO (palakj) : Send Observations to observers
-    if (!pending_observers_.empty() && connection_)
-      connection_->ActivatePendingObservers(std::move(pending_observers_));
     abort_task_stack_.clear();
     {
       IDB_TRACE1(
           "IndexedDBTransaction::CommitPhaseTwo.TransactionCompleteCallbacks",
           "txn.id", id());
       callbacks_->OnComplete(id_);
     }
+    database_->SendObservations(std::move(connection_changes_map_));

[Marijn Kruisselbrink, 2016/07/08 23:57:57]

I don't think the c++ standard technically guarantees that moving from a
std::map (or a std::vector below) clears the moved from container. So to be
perfectly safe you should probably have clear() calls both her on
connection_changes_map_ and below on pending_observers_, after you move from
them.

[palakj1, 2016/07/11 05:33:26]

Done. Should i be clearing every time I'm moving map/vector?

+    if (!pending_observers_.empty() && connection_)
+      connection_->ActivatePendingObservers(std::move(pending_observers_));
     database_->TransactionFinished(this, true);
   } else {
     while (!abort_task_stack_.empty())
       abort_task_stack_.pop().Run(NULL);
 
     IndexedDBDatabaseError error;
     if (leveldb_env::IndicatesDiskFull(s)) {
       error = IndexedDBDatabaseError(
           blink::WebIDBDatabaseExceptionQuotaError,
           "Encountered disk full while committing transaction.");
@@ skipping 81 matching lines @@
 
 void IndexedDBTransaction::CloseOpenCursors() {
   IDB_TRACE1("IndexedDBTransaction::CloseOpenCursors", "txn.id", id());
   for (auto* cursor : open_cursors_)
     cursor->Close();
   open_cursors_.clear();
 }
 
 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(
     const std::vector<int32_t>& pending_observer_ids) {
   const auto& it = std::remove_if(
       pending_observers_.begin(), pending_observers_.end(),
       [&pending_observer_ids](const std::unique_ptr<IndexedDBObserver>& o) {
         return ContainsValue(pending_observer_ids, o->id());
       });
   if (it != pending_observers_.end())
     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::RecordObserverForLastObservation(
+    int32_t observer_id,
+    int32_t connection_id) {
+  connection_changes_map_[connection_id]->RecordObserverForLastObservation(
+      observer_id);
+}
+
 }  // namespace content