IDBObserver: Lifetime Management: Adding Observer

content/child/indexed_db/webidbdatabase_impl.cc

 // Copyright 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/child/indexed_db/webidbdatabase_impl.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
 #include "content/child/indexed_db/indexed_db_key_builders.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/worker_thread_registry.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
 #include "third_party/WebKit/public/platform/WebBlobInfo.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBKeyPath.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBMetadata.h"
+#include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBObserver.h"
 
 using blink::WebBlobInfo;
 using blink::WebIDBCallbacks;
 using blink::WebIDBCursor;
 using blink::WebIDBDatabase;
 using blink::WebIDBDatabaseCallbacks;
 using blink::WebIDBMetadata;
 using blink::WebIDBKey;
 using blink::WebIDBKeyPath;
 using blink::WebIDBKeyRange;
+using blink::WebIDBObserver;
 using blink::WebString;
 using blink::WebVector;
 
 namespace content {
 
 WebIDBDatabaseImpl::WebIDBDatabaseImpl(int32_t ipc_database_id,
                                        int32_t ipc_database_callbacks_id,
                                        ThreadSafeSender* thread_safe_sender)
     : ipc_database_id_(ipc_database_id),
       ipc_database_callbacks_id_(ipc_database_callbacks_id),
@@ skipping 41 matching lines @@
     blink::WebIDBTransactionMode mode) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   dispatcher->RequestIDBDatabaseCreateTransaction(
       ipc_database_id_, transaction_id, callbacks, object_store_ids, mode);
 }
 
 void WebIDBDatabaseImpl::close() {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RemoveIDBObservers(observer_ids_);
   dispatcher->RequestIDBDatabaseClose(ipc_database_id_,
                                       ipc_database_callbacks_id_);
 }
 
 void WebIDBDatabaseImpl::versionChangeIgnored() {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   dispatcher->NotifyIDBDatabaseVersionChangeIgnored(ipc_database_id_);
 }
 
+int32_t WebIDBDatabaseImpl::addObserver(blink::WebIDBObserver* observer_ptr,
+                                        long long transaction_id) {
+  IndexedDBDispatcher* dispatcher =
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  std::unique_ptr<WebIDBObserver> observer(observer_ptr);
+
+  int32_t observer_id = dispatcher->AddIDBObserver(
+      ipc_database_id_, transaction_id, observer.release());
+  observer_ids_.insert(observer_id);
+  return observer_id;
+}
+
+bool WebIDBDatabaseImpl::removeObserverId(int32_t id) {
+  return observer_ids_.erase(id);
+}
+
+void WebIDBDatabaseImpl::removeObservers(

[dmurph, 2016/06/27 21:20:51]

Don't we also need to remove the observers from our observer_ids_ set?

[palakj1, 2016/06/27 23:13:08]

That is done while checking whether an observer id belongs to the database in
the removeObserverId function.

+    const std::vector<int32_t>& observer_ids_to_remove) {
+  IndexedDBDispatcher* dispatcher =
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RemoveIDBObserversFromDatabase(ipc_database_id_,
+                                             observer_ids_to_remove);
+}
+
 void WebIDBDatabaseImpl::get(long long transaction_id,
                              long long object_store_id,
                              long long index_id,
                              const WebIDBKeyRange& key_range,
                              bool key_only,
                              WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   dispatcher->RequestIDBDatabaseGet(ipc_database_id_,
                                     transaction_id,
@@ skipping 178 matching lines @@
 
 void WebIDBDatabaseImpl::ackReceivedBlobs(const WebVector<WebString>& uuids) {
   DCHECK(uuids.size());
   std::vector<std::string> param(uuids.size());
   for (size_t i = 0; i < uuids.size(); ++i)
     param[i] = uuids[i].latin1().data();
   thread_safe_sender_->Send(new IndexedDBHostMsg_AckReceivedBlobs(param));
 }
 
 }  // namespace content