[IndexedDB] Adding transaction and value support to observers

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"
@@ skipping 347 matching lines @@
       database_->SendObservations(std::move(connection_changes_map_));
       connection_changes_map_.clear();
     }
     {
       IDB_TRACE1(
           "IndexedDBTransaction::CommitPhaseTwo.TransactionCompleteCallbacks",
           "txn.id", id());
       callbacks_->OnComplete(*this);
     }
     if (!pending_observers_.empty() && connection_) {
+      // Observers observe all stores for a version change transaction.
+      if (mode_ == blink::WebIDBTransactionModeVersionChange) {
+        std::set<int64_t> object_stores;

[cmumford, 2017/01/09 21:31:25]

object_store_ids

[dmurph, 2017/01/10 00:17:39]

removed.

+        for (const auto& store_metadata : database_->metadata().object_stores) {
+          object_stores.insert(store_metadata.first);
+        }
+        for (auto& pending_observer : pending_observers_) {
+          pending_observer->set_object_store_ids(std::move(object_stores));

[cmumford, 2017/01/09 21:31:26]

Won't this only set the first pending observer's set of object store ID's. After
that object_stores will be empty right?

[dmurph, 2017/01/10 00:17:39]

Removed this feature as per
https://github.com/WICG/indexed-db-observers/issues/37 (oops forgot to add you
on there). But yeah, this is now impossible.

+        }
+      }
       connection_->ActivatePendingObservers(std::move(pending_observers_));
       pending_observers_.clear();
     }
 
     database_->TransactionFinished(this, true);
     // RemoveTransaction will delete |this|.
     connection_->RemoveTransaction(id_);
     return s;
   } else {
     while (!abort_task_stack_.empty())
@@ skipping 125 matching lines @@
   auto it = connection_changes_map_.find(connection_id);
   if (it == connection_changes_map_.end()) {
     it = connection_changes_map_
              .insert(std::make_pair(
                  connection_id, ::indexed_db::mojom::ObserverChanges::New()))
              .first;
   }
   it->second->observations.push_back(std::move(observation));
 }
 
-void IndexedDBTransaction::RecordObserverForLastObservation(
-    int32_t connection_id,
-    int32_t observer_id) {
+::indexed_db::mojom::ObserverChangesPtr*

[cmumford, 2017/01/09 21:31:26]

function should be const, *and* return a const ObserverChangesPtr.

[dmurph, 2017/01/10 00:17:39]

Neither can be const, as I need to modify the return value here to populate
transactions and values (in indexed_db_database).

+IndexedDBTransaction::GetPendingChangesForConnection(int32_t connection_id) {
   auto it = connection_changes_map_.find(connection_id);
-  DCHECK(it != connection_changes_map_.end());
-  it->second->observation_index_map[observer_id].push_back(
-      it->second->observations.size() - 1);
+  if (it != connection_changes_map_.end())
+    return &it->second;
+  return nullptr;
 }
 
 }  // namespace content