IDBObserver: Lifetime Management: Adding Observer

content/child/indexed_db/indexed_db_dispatcher.h

 // 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.
 
 #ifndef CONTENT_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 #define CONTENT_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 57 matching lines @@
   void WillStopCurrentWorkerThread() override;
 
   static blink::WebIDBMetadata ConvertMetadata(
       const IndexedDBDatabaseMetadata& idb_metadata);
 
   void OnMessageReceived(const IPC::Message& msg);
 
   // This method is virtual so it can be overridden in unit tests.
   virtual bool Send(IPC::Message* msg);
 
-  void AddIDBObserver(int32_t ipc_database_id,
-                      int64_t transaction_id,
-                      blink::IDBObserver* observer);
+  int32_t AddIDBObserver(int32_t ipc_database_id,
+                         int64_t transaction_id,
+                         blink::IDBObserver* observer);
+  std::vector<int32_t> RemoveIDBObserver(int32_t ipc_database_id,
+                                         blink::IDBObserver* observer);
 
   void RequestIDBFactoryGetDatabaseNames(blink::WebIDBCallbacks* callbacks,
                                          const url::Origin& origin);
 
   void RequestIDBFactoryOpen(const base::string16& name,
                              int64_t version,
                              int64_t transaction_id,
                              blink::WebIDBCallbacks* callbacks,
                              blink::WebIDBDatabaseCallbacks* database_callbacks,
                              const url::Origin& origin);
@@ skipping 158 matching lines @@
   void OnForcedClose(int32_t ipc_thread_id, int32_t ipc_database_id);
   void OnVersionChange(int32_t ipc_thread_id,
                        int32_t ipc_database_id,
                        int64_t old_version,
                        int64_t new_version);
 
   // Reset cursor prefetch caches for all cursors except exception_cursor_id.
   void ResetCursorPrefetchCaches(int64_t transaction_id,
                                  int32_t ipc_exception_cursor_id);
 
-  // int64_t nextObserverId() {
-  //   // Only keep a 32-bit counter to allow ports to use the other 32
-  //   // bits of the id.
-  //   // overflow??
-  //   static int currentObserverId = 0;
-  //   return atomicIncrement(&currentObserverId);
-  // }
-
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
 
   // Maximum size (in bytes) of value/key pair allowed for put requests. Any
   // requests larger than this size will be rejected.
   // Used by unit tests to exercise behavior without allocating huge chunks
   // of memory.
   size_t max_put_value_size_ = kMaxIDBMessageSizeInBytes;
-  int maxObserverId = 0;
   // 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_;
 
   // 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
   // when it is created.
   std::map<int32_t, int64_t> cursor_transaction_ids_;
 
   // Map from cursor id to WebIDBCursorImpl.
   std::map<int32_t, WebIDBCursorImpl*> cursors_;
-
   std::map<int32_t, WebIDBDatabaseImpl*> databases_;
-  std::map<int64_t, blink::IDBObserver*> observers_;
+  std::map<int32_t, blink::IDBObserver*> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_