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/Source/modules/indexeddb/IDBObserver.h"
 
+using blink::IDBObserver;
 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());
+  // TODO(palakj): Can pass observers_id along with RequestIDBDatabaseClose.

[dmurph, 2016/06/22 01:09:50]

Yes, you could do that also.

[palakj1, 2016/06/23 20:56:30]

Would you prefer that over the current implementation? I feel this is a little
cleaner, but requires an extra call.

+  if (!observers_id_.empty()) {
+    dispatcher->ClearIDBObserver(observers_id_);
+    observers_id_.clear();  // Do I need to do this?

[dmurph, 2016/06/22 01:09:50]

sure.

+  }
   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_);
 }
 
+void WebIDBDatabaseImpl::observe(WebIDBObserver* observer,
+                                 long long transaction_id) {
+  IndexedDBDispatcher* dispatcher =
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  int32_t observer_id =
+      dispatcher->AddIDBObserver(ipc_database_id_, transaction_id, observer);
+  observers_id_.push_back(observer_id);
+}
+
+void WebIDBDatabaseImpl::unobserve(blink::WebIDBObserver* observer) {
+  IndexedDBDispatcher* dispatcher =
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  std::vector<int32_t> observersToRemove =

[dmurph, 2016/06/22 01:09:50]

no camelCase.

[palakj1, 2016/06/23 20:56:30]

Changed.

+      dispatcher->RemoveIDBObservers(ipc_database_id_, observer, observers_id_);
+
+  for (uint32_t i = 0; i < observersToRemove.size(); i++) {
+    std::vector<int>::iterator position = std::find(

[dmurph, 2016/06/22 01:09:50]

I think using observer_ids_.find would be simpler.

+        observers_id_.begin(), observers_id_.end(), observersToRemove[i]);
+    observers_id_.erase(position);
+  }
+}
+
 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