IDBObserver: Lifetime Management: Adding Observer

content/child/indexed_db/indexed_db_dispatcher.h

Index: content/child/indexed_db/indexed_db_dispatcher.h
diff --git a/content/child/indexed_db/indexed_db_dispatcher.h b/content/child/indexed_db/indexed_db_dispatcher.h
index 9e5068db7b6f12e14a3ef48bc722d0bcdf3e2093..0e0469cb57df142cc67be42dca08996ffd9e7059 100644
--- a/content/child/indexed_db/indexed_db_dispatcher.h
+++ b/content/child/indexed_db/indexed_db_dispatcher.h
@@ -24,6 +24,7 @@
 #include "third_party/WebKit/public/platform/WebBlobInfo.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBCallbacks.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseCallbacks.h"
+#include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBObserver.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBTypes.h"
 #include "url/origin.h"
 
@@ -74,6 +75,20 @@ class CONTENT_EXPORT IndexedDBDispatcher : public WorkerThread::Observer {
   // This method is virtual so it can be overridden in unit tests.
   virtual bool Send(IPC::Message* msg);
 
+  int32_t AddIDBObserver(int32_t ipc_database_id,
+                         int64_t transaction_id,
+                         blink::WebIDBObserver* observer);
+
+  /* The |observer_ids_to_remove| are observing the |ipc_database_id|.

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

Can you change this to all single-line comments to match the rest of the file?

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

Done.

+  We remove our references to these observer object, and send an IPC to remove
+  the observers in the backend. */
+  void RemoveIDBObserversFromDatabase(
+      int32_t ipc_database_id,
+      const std::vector<int32_t>& observer_ids_to_remove);
+
+  // Removes observers from our local map observers_ . No IPC message generated.
+  void RemoveIDBObservers(const std::set<int32_t>& observer_ids_to_remove);
+
   void RequestIDBFactoryGetDatabaseNames(blink::WebIDBCallbacks* callbacks,
                                          const url::Origin& origin);
 
@@ -258,12 +273,12 @@ class CONTENT_EXPORT IndexedDBDispatcher : public WorkerThread::Observer {
   // Used by unit tests to exercise behavior without allocating huge chunks
   // of memory.
   size_t max_put_value_size_ = kMaxIDBMessageSizeInBytes;
-

[Marijn Kruisselbrink, 2016/06/28 18:58:31]

nit: don't remove empty line

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

Done.

   // Careful! WebIDBCallbacks wraps non-threadsafe data types. It must be
   // destroyed and used on the same thread it was created on.
   IDMap<blink::WebIDBCallbacks, IDMapOwnPointer> pending_callbacks_;
   IDMap<blink::WebIDBDatabaseCallbacks, IDMapOwnPointer>
       pending_database_callbacks_;
+  IDMap<blink::WebIDBObserver, IDMapOwnPointer> observers_;
 
   // Maps the ipc_callback_id from an open cursor request to the request's
   // transaction_id. Used to assign the transaction_id to the WebIDBCursorImpl
@@ -272,7 +287,6 @@ class CONTENT_EXPORT IndexedDBDispatcher : public WorkerThread::Observer {
 
   // Map from cursor id to WebIDBCursorImpl.
   std::map<int32_t, WebIDBCursorImpl*> cursors_;
-

[Marijn Kruisselbrink, 2016/06/28 18:58:31]

nit: don't remove empty line

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

Done.

   std::map<int32_t, WebIDBDatabaseImpl*> databases_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBDispatcher);