IndexedDB: Remove observer transactions from frontend

These transactions are no longer supported in the backend and we've planned to remove them from the frontend for some time. This CL updates OnChanges() to no longer create this type of transaction and removes the corresponding codepaths from IDBTransaction. Bug: 717812 Change-Id: I5bd807d11411ad18cab2737025647fc00230dae8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1526802 Commit-Queue: Chase Phillips <[email protected]> Reviewed-by: Daniel Murphy <[email protected]> Cr-Commit-Position: refs/heads/master@{#642199}
feiyue1206 · Mar 19, 2019 · 1b0da98 · 1b0da98
1 parent 872a179
commit 1b0da98
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 47 deletions.
diff --git a/third_party/blink/renderer/modules/indexeddb/idb_database.cc b/third_party/blink/renderer/modules/indexeddb/idb_database.cc
@@ -197,7 +197,6 @@ void IDBDatabase::OnChanges(
     if (observer_lookup_result != observers_.end()) {
       IDBObserver* observer = observer_lookup_result->value;
 
-      IDBTransaction* transaction = nullptr;
       auto transactions_lookup_result = transactions.find(map_entry.first);
       if (transactions_lookup_result != transactions.end()) {
         const std::pair<int64_t, Vector<int64_t>>& obs_txn =
@@ -206,16 +205,11 @@ void IDBDatabase::OnChanges(
         for (int64_t store_id : obs_txn.second) {
           stores.insert(metadata_.object_stores.at(store_id)->name);
         }
-
-        transaction = IDBTransaction::CreateObserver(
-            GetExecutionContext(), obs_txn.first, stores, this);
       }
 
       observer->Callback()->InvokeAndReportException(
-          observer, IDBObserverChanges::Create(this, transaction, observations,
+          observer, IDBObserverChanges::Create(this, nullptr, observations,
                                                map_entry.second));
-      if (transaction)
-        transaction->SetActive(false);
     }
   }
 }

diff --git a/third_party/blink/renderer/modules/indexeddb/idb_transaction.cc b/third_party/blink/renderer/modules/indexeddb/idb_transaction.cc
@@ -46,18 +46,6 @@
 
 namespace blink {
 
-IDBTransaction* IDBTransaction::CreateObserver(
-    ExecutionContext* execution_context,
-    int64_t id,
-    const HashSet<String>& scope,
-    IDBDatabase* db) {
-  DCHECK(!scope.IsEmpty()) << "Observer transactions must operate on a "
-                              "well-defined set of stores";
-  IDBTransaction* transaction =
-      MakeGarbageCollected<IDBTransaction>(execution_context, id, scope, db);
-  return transaction;
-}
-
 IDBTransaction* IDBTransaction::CreateNonVersionChange(
     ScriptState* script_state,
     int64_t id,
@@ -81,24 +69,6 @@ IDBTransaction* IDBTransaction::CreateVersionChange(
                                               open_db_request, old_metadata);
 }
 
-IDBTransaction::IDBTransaction(ExecutionContext* execution_context,
-                               int64_t id,
-                               const HashSet<String>& scope,
-                               IDBDatabase* db)
-    : ContextLifecycleObserver(execution_context),
-      id_(id),
-      database_(db),
-      mode_(mojom::IDBTransactionMode::ReadOnly),
-      scope_(scope),
-      state_(kActive),
-      event_queue_(
-          EventQueue::Create(execution_context, TaskType::kDatabaseAccess)) {
-  DCHECK(database_);
-  DCHECK(!scope_.IsEmpty()) << "Observer transactions must operate "
-                               "on a well-defined set of stores";
-  database_->TransactionCreated(this);
-}
-
 IDBTransaction::IDBTransaction(ScriptState* script_state,
                                int64_t id,
                                const HashSet<String>& scope,

diff --git a/third_party/blink/renderer/modules/indexeddb/idb_transaction.h b/third_party/blink/renderer/modules/indexeddb/idb_transaction.h
@@ -67,11 +67,6 @@ class MODULES_EXPORT IDBTransaction final
   DEFINE_WRAPPERTYPEINFO();
 
  public:
-  static IDBTransaction* CreateObserver(ExecutionContext*,
-                                        int64_t,
-                                        const HashSet<String>& scope,
-                                        IDBDatabase*);
-
   static IDBTransaction* CreateNonVersionChange(ScriptState*,
                                                 int64_t,
                                                 const HashSet<String>& scope,
@@ -84,11 +79,6 @@ class MODULES_EXPORT IDBTransaction final
       IDBOpenDBRequest*,
       const IDBDatabaseMetadata& old_metadata);
 
-  // For observer transactions.
-  IDBTransaction(ExecutionContext*,
-                 int64_t,
-                 const HashSet<String>& scope,
-                 IDBDatabase*);
   // For non-upgrade transactions.
   IDBTransaction(ScriptState*,
                  int64_t,