IDBObserver: Lifetime Management: Adding Observer

content/browser/indexed_db/indexed_db_transaction.h

Index: content/browser/indexed_db/indexed_db_transaction.h
diff --git a/content/browser/indexed_db/indexed_db_transaction.h b/content/browser/indexed_db/indexed_db_transaction.h
index ae1863b151f161ab6fc82e3ca1b575171d784568..6b29210d0bd9c6818e7222a5c22d288f9fbb3ccb 100644
--- a/content/browser/indexed_db/indexed_db_transaction.h
+++ b/content/browser/indexed_db/indexed_db_transaction.h
@@ -18,6 +18,7 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
+#include "content/browser/indexed_db/indexed_db_connection.h"
 #include "content/browser/indexed_db/indexed_db_database.h"
 #include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBTypes.h"
@@ -27,6 +28,7 @@ namespace content {
 class BlobWriteCallbackImpl;
 class IndexedDBCursor;
 class IndexedDBDatabaseCallbacks;
+class IndexedDBObserver;
 
 class CONTENT_EXPORT IndexedDBTransaction
     : public NON_EXPORTED_BASE(base::RefCounted<IndexedDBTransaction>) {
@@ -63,13 +65,18 @@ class CONTENT_EXPORT IndexedDBTransaction
     pending_preemptive_events_--;
     DCHECK_GE(pending_preemptive_events_, 0);
   }
+  void AddPendingObserver(int32_t observer_id);
+  // Removes |pending_observer_ids| from |pending_observers_| if it is present.
+  void RemovePendingObservers(const std::vector<int32_t>& pending_observer_ids);
+
   IndexedDBBackingStore::Transaction* BackingStoreTransaction() {
     return transaction_.get();
   }
   int64_t id() const { return id_; }
 
   IndexedDBDatabase* database() const { return database_.get(); }
-  IndexedDBDatabaseCallbacks* connection() const { return callbacks_.get(); }
+  IndexedDBDatabaseCallbacks* callbacks() const { return callbacks_.get(); }
+  IndexedDBConnection* connection() const { return connection_.get(); }
 
   State state() const { return state_; }
   bool IsTimeoutTimerRunning() const { return timeout_timer_.IsRunning(); }
@@ -88,10 +95,9 @@ class CONTENT_EXPORT IndexedDBTransaction
   // IndexedDBClassFactory.
   IndexedDBTransaction(
       int64_t id,
-      scoped_refptr<IndexedDBDatabaseCallbacks> callbacks,
+      base::WeakPtr<IndexedDBConnection> connection,
       const std::set<int64_t>& object_store_ids,
       blink::WebIDBTransactionMode mode,
-      IndexedDBDatabase* db,
       IndexedDBBackingStore::Transaction* backing_store_transaction);
   virtual ~IndexedDBTransaction();
 
@@ -111,6 +117,7 @@ class CONTENT_EXPORT IndexedDBTransaction
   FRIEND_TEST_ALL_PREFIXES(IndexedDBTransactionTestMode,
                            ScheduleNormalTask);
   FRIEND_TEST_ALL_PREFIXES(IndexedDBTransactionTest, Timeout);
+  FRIEND_TEST_ALL_PREFIXES(IndexedDBTransactionTest, IndexedDBObserver);
 
   void RunTasksIfStarted();
 
@@ -130,9 +137,15 @@ class CONTENT_EXPORT IndexedDBTransaction
   bool used_;
   State state_;
   bool commit_pending_;
+  base::WeakPtr<IndexedDBConnection> connection_;
+  // TODO(palakj): Eliminate callbacks_ and database_ as we already have

[dmurph, 2016/06/30 18:06:07]

nit: remove this todo, as we still want to have refptrs to increment the
refcount. This probably won't effect the database, but definitely the callbacks.

[palakj1, 2016/07/02 00:48:13]

Done.

+  // connection_.
   scoped_refptr<IndexedDBDatabaseCallbacks> callbacks_;
   scoped_refptr<IndexedDBDatabase> database_;
 
+  // These observers do not listen to changes until they are activated.
+  std::vector<std::unique_ptr<IndexedDBObserver>> pending_observers_;
+
   class TaskQueue {
    public:
     TaskQueue();