IDBObserver: Lifetime Management: Adding Observer

content/child/indexed_db/indexed_db_dispatcher.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/indexed_db_dispatcher.h"
 
 #include <utility>
 
 #include "base/format_macros.h"
 #include "base/lazy_instance.h"
@@ skipping 12 matching lines @@
 
 using blink::WebBlobInfo;
 using blink::WebData;
 using blink::WebIDBCallbacks;
 using blink::WebIDBCursor;
 using blink::WebIDBDatabase;
 using blink::WebIDBDatabaseCallbacks;
 using blink::WebIDBDatabaseError;
 using blink::WebIDBKey;
 using blink::WebIDBMetadata;
+using blink::WebIDBObserver;
 using blink::WebIDBValue;
 using blink::WebString;
 using blink::WebVector;
 using base::ThreadLocalPointer;
 
 namespace content {
 static base::LazyInstance<ThreadLocalPointer<IndexedDBDispatcher> >::Leaky
     g_idb_dispatcher_tls = LAZY_INSTANCE_INITIALIZER;
 
 namespace {
@@ skipping 117 matching lines @@
   // If a message gets here, IndexedDBMessageFilter already determined that it
   // is an IndexedDB message.
   DCHECK(handled) << "Didn't handle a message defined at line "
                   << IPC_MESSAGE_ID_LINE(msg.type());
 }
 
 bool IndexedDBDispatcher::Send(IPC::Message* msg) {
   return thread_safe_sender_->Send(msg);
 }
 
+int32_t IndexedDBDispatcher::AddIDBObserver(int32_t ipc_database_id,
+                                            int64_t transaction_id,
+                                            WebIDBObserver* observer_ptr) {
+  std::unique_ptr<WebIDBObserver> observer(observer_ptr);

[dmurph, 2016/06/28 18:53:50]

This is weird, just pass the observer_ptr to the observers_.

nit: A slightly cleaner way to do this is have AddIDBObserver accept a
unique_ptr (and have it always be a unique ptr, like from create()), and the
release it in the .Add call.

[palakj1, 2016/06/29 23:02:40]

I had been imitating the previous styles. But, you are right. Change made.

+  int32_t observer_id = observers_.Add(observer.release());
+  Send(new IndexedDBHostMsg_DatabaseObserve(ipc_database_id, transaction_id,
+                                            observer_id));
+  return observer_id;
+}
+
+void IndexedDBDispatcher::RemoveIDBObserversFromDatabase(
+    int32_t ipc_database_id,
+    const std::vector<int32_t>& observer_ids_to_remove) {
+  for (int32_t id_to_remove : observer_ids_to_remove) {
+    observers_.Remove(id_to_remove);
+  }
+  Send(new IndexedDBHostMsg_DatabaseUnobserve(ipc_database_id,
+                                              observer_ids_to_remove));
+}
+
+void IndexedDBDispatcher::RemoveIDBObservers(
+    const std::set<int32_t>& observer_ids_to_remove) {
+  for (int32_t id : observer_ids_to_remove) {
+    WebIDBObserver* observer = observers_.Lookup(id);
+    observer->removeObserver(id);
+    observers_.Remove(id);
+  }
+}
+
 void IndexedDBDispatcher::RequestIDBCursorAdvance(
     unsigned long count,
     WebIDBCallbacks* callbacks_ptr,
     int32_t ipc_cursor_id,
     int64_t transaction_id) {
   // Reset all cursor prefetch caches except for this cursor.
   ResetCursorPrefetchCaches(transaction_id, ipc_cursor_id);
 
   std::unique_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
@@ skipping 620 matching lines @@
   typedef std::map<int32_t, WebIDBCursorImpl*>::iterator Iterator;
   for (Iterator i = cursors_.begin(); i != cursors_.end(); ++i) {
     if (i->first == ipc_exception_cursor_id ||
         i->second->transaction_id() != transaction_id)
       continue;
     i->second->ResetPrefetchCache();
   }
 }
 
 }  // namespace content