IDBObserver: Lifetime Management: Adding Observer

content/browser/indexed_db/indexed_db_dispatcher_host.h

 // Copyright (c) 2012 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_BROWSER_INDEXED_DB_INDEXED_DB_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DISPATCHER_HOST_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 90 matching lines @@
   // id to and from a back-end ("host") transaction id that encodes the process
   // id in the high 32 bits. The mapping is host-specific and ids are validated.
   int64_t HostTransactionId(int64_t transaction_id);
   int64_t RendererTransactionId(int64_t host_transaction_id);
 
   // These are called to decode a host transaction ID, for diagnostic purposes.
   static uint32_t TransactionIdToRendererTransactionId(
       int64_t host_transaction_id);
   static uint32_t TransactionIdToProcessId(int64_t host_transaction_id);
 
-  // These are called to map a 32-bit front-end (renderer-specific) observer
-  // id to and from a back-end ("host") observer id that encodes the process
-  // id in the high 32 bits. The mapping is host-specific and ids are validated.
-  int64_t HostObserverId(int64_t observer_id);
-  int64_t RendererObserverId(int64_t host_observer_id);
-
   std::string HoldBlobData(const IndexedDBBlobInfo& blob_info);
 
  private:
   // Friends to enable OnDestruct() delegation.
   friend class BrowserThread;
   friend class base::DeleteHelper<IndexedDBDispatcherHost>;
 
   // Used in nested classes.
   typedef std::map<std::string, std::pair<storage::BlobDataHandle*, int>>
       BlobDataHandleMap;
@@ skipping 49 matching lines @@
                              int64_t object_store_id);
     void OnCreateTransaction(
         const IndexedDBHostMsg_DatabaseCreateTransaction_Params&);
     void OnClose(int32_t ipc_database_id);
     void OnVersionChangeIgnored(int32_t ipc_database_id);
     void OnDestroyed(int32_t ipc_database_id);
 
     void OnObserve(int32_t ipc_thread_id,
                    int32_t ipc_database_id,
                    int64_t transaction_id,
-                   int64_t observer_id);
+                   int32_t observer_id);
+    void OnUnobserve(int32_t ipc_thread_id,
+                     int32_t ipc_database_id,
+                     std::vector<int32_t> remove_observers);
     void OnGet(const IndexedDBHostMsg_DatabaseGet_Params& params);
     void OnGetAll(const IndexedDBHostMsg_DatabaseGetAll_Params& params);
     // OnPutWrapper starts on the IO thread so that it can grab BlobDataHandles
     // before posting to the IDB TaskRunner for the rest of the job.
     void OnPutWrapper(const IndexedDBHostMsg_DatabasePut_Params& params);
     void OnPut(const IndexedDBHostMsg_DatabasePut_Params& params,
                std::vector<storage::BlobDataHandle*> handles);
     void OnSetIndexKeys(
         const IndexedDBHostMsg_DatabaseSetIndexKeys_Params& params);
     void OnSetIndexesReady(int32_t ipc_database_id,
@@ skipping 16 matching lines @@
                        int64_t object_store_id,
                        int64_t index_id);
 
     void OnAbort(int32_t ipc_database_id, int64_t transaction_id);
     void OnCommit(int32_t ipc_database_id, int64_t transaction_id);
     void OnGotUsageAndQuotaForCommit(int32_t ipc_database_id,
                                      int64_t transaction_id,
                                      storage::QuotaStatusCode status,
                                      int64_t usage,
                                      int64_t quota);
+    int64_t GenerateObserverId(int32_t observer_id, int32_t ipc_thread_id);

[dmurph, 2016/06/16 07:30:33]

How about calling the result ObserverAndThreadId? So
GenerateObserverAndThreadId? That would avoid confusion about which id we have.

[palakj1, 2016/06/16 17:51:41]

Done

+    std::vector<int64_t> RemoveObservers(std::vector<int32_t> remove_observers,

[dmurph, 2016/06/16 07:30:33]

We still need the ipc_thread_id here as well.

[palakj1, 2016/06/16 17:51:41]

Done

+                                         int32_t ipc_database_id);
 

[dmurph, 2016/06/16 07:30:33]

Make sure we store a vector<std::pair<int32_t, int64_t>>
in_use_database_observers, which we use on destruction to remove all of them
from the databases. Populate this in OnObserve

[palakj1, 2016/06/16 17:51:41]

done

     IndexedDBDispatcherHost* parent_;
     IDMap<IndexedDBConnection, IDMapOwnPointer> map_;
     WebIDBObjectIDToOriginMap database_origin_map_;
     TransactionIDToSizeMap transaction_size_map_;
     TransactionIDToOriginMap transaction_origin_map_;
     TransactionIDToDatabaseIDMap transaction_database_map_;
     std::vector<int64_t> observers_;
 
     // Weak pointers are used when an asynchronous quota request is made, in
     // case the dispatcher is torn down before the response returns.
@@ skipping 78 matching lines @@
   std::unique_ptr<CursorDispatcherHost> cursor_dispatcher_host_;
   // Used to set file permissions for blob storage.
   int ipc_process_id_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DISPATCHER_HOST_H_