[IndexedDB] Adding transaction and value support to observers

content/child/indexed_db/indexed_db_database_callbacks_impl.cc

 // Copyright 2016 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/child/indexed_db/indexed_db_database_callbacks_impl.h"
 
+#include <unordered_map>
+#include <utility>
+
 #include "base/threading/thread_task_runner_handle.h"
+#include "content/child/indexed_db/indexed_db_callbacks_impl.h"
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
 #include "content/child/indexed_db/indexed_db_key_builders.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseCallbacks.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseError.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBObservation.h"
 
 using blink::WebIDBDatabaseCallbacks;
 
 namespace content {
 
@@ skipping 16 matching lines @@
 
 void BuildObservationsAndNotify(WebIDBDatabaseCallbacks* callbacks,
                                 indexed_db::mojom::ObserverChangesPtr changes) {
   std::vector<blink::WebIDBObservation> web_observations;
   for (const auto& observation : changes->observations) {
     blink::WebIDBObservation web_observation;
     web_observation.objectStoreId = observation->object_store_id;
     web_observation.type = observation->type;
     web_observation.keyRange =
         WebIDBKeyRangeBuilder::Build(observation->key_range);
-    // TODO(palakj): Assign value to web_observation.
+    if (observation->value) {
+      IndexedDBCallbacksImpl::ConvertValue(observation->value,
+                                           &web_observation.value);
+    }
     web_observations.push_back(std::move(web_observation));
   }
-  callbacks->onChanges(changes->observation_index_map, web_observations);
+  std::unordered_map<int32_t, std::pair<int64_t, std::vector<int64_t>>>
+      observer_transactions;

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

Is observer_transactions ever set?

[cmumford, 2017/01/09 21:33:02]

Nevermind (doh!) I see it.

+
+  for (const auto& transaction_pair : changes->transaction_map) {
+    std::pair<int64_t, std::vector<int64_t>>& obs_txn =
+        observer_transactions[transaction_pair.first];
+    obs_txn.first = transaction_pair.second->id;
+    for (int64_t scope : transaction_pair.second->scope) {
+      obs_txn.second.push_back(scope);
+    }
+  }
+
+  callbacks->onChanges(changes->observation_index_map, web_observations,
+                       observer_transactions);
 }
 
 }  // namespace
 
 IndexedDBDatabaseCallbacksImpl::IndexedDBDatabaseCallbacksImpl(
     std::unique_ptr<WebIDBDatabaseCallbacks> callbacks)
     : callback_runner_(base::ThreadTaskRunnerHandle::Get()),
       callbacks_(callbacks.release()) {
   IndexedDBDispatcher::ThreadSpecificInstance()
       ->RegisterMojoOwnedDatabaseCallbacks(callbacks_);
@@ skipping 35 matching lines @@
 }
 
 void IndexedDBDatabaseCallbacksImpl::Changes(
     indexed_db::mojom::ObserverChangesPtr changes) {
   callback_runner_->PostTask(FROM_HERE, base::Bind(&BuildObservationsAndNotify,
                                                    base::Unretained(callbacks_),
                                                    base::Passed(&changes)));
 }
 
 }  // namespace content