Expose IDBTransacation durability enum

Per discussion at TPAC, this value that was previously only a parameter
on IDBDatabase.transaction is now visible on the IDBTransaction itself.

This experimental option is behind the
RuntimeEnabledFeatures::IDBRelaxedDurabilityEnabled flag.

Bug: 965883
Change-Id: Iace6607b0b28702de3e9bd397f9942e9457f1cad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1818462Reviewed-by: Joshua Bell <jsbell@chromium.org>
Reviewed-by: Victor Costan <pwnall@chromium.org>
Commit-Queue: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699862}

third_party/blink/renderer/modules/indexeddb/idb_database.cc

@@ -37,6 +37,7 @@
 #include "third_party/blink/renderer/bindings/modules/v8/v8_idb_observer_callback.h"
 #include "third_party/blink/renderer/core/dom/events/event_queue.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
+#include "third_party/blink/renderer/modules/indexed_db_names.h"
 #include "third_party/blink/renderer/modules/indexeddb/idb_any.h"
 #include "third_party/blink/renderer/modules/indexeddb/idb_event_dispatcher.h"
 #include "third_party/blink/renderer/modules/indexeddb/idb_index.h"
@@ -433,9 +434,9 @@ IDBTransaction* IDBDatabase::transaction(
       mojom::IDBTransactionDurability::Default;
   if (options) {
     DCHECK(RuntimeEnabledFeatures::IDBRelaxedDurabilityEnabled());
-    if (options->durability() == "relaxed") {
+    if (options->durability() == indexed_db_names::kRelaxed) {
       durability = mojom::IDBTransactionDurability::Relaxed;
-    } else if (options->durability() == "strict") {
+    } else if (options->durability() == indexed_db_names::kStrict) {
       durability = mojom::IDBTransactionDurability::Strict;
     }
   }
@@ -446,7 +447,7 @@ IDBTransaction* IDBDatabase::transaction(
 
   return IDBTransaction::CreateNonVersionChange(
       script_state, std::move(transaction_backend), transaction_id, scope, mode,
-      this);
+      durability, this);
 }
 
 void IDBDatabase::ForceClose() {

third_party/blink/renderer/modules/indexeddb/idb_request_test.cc

@@ -197,7 +197,8 @@ class IDBRequestTest : public testing::Test {
     HashSet<String> transaction_scope = {"store"};
     transaction_ = IDBTransaction::CreateNonVersionChange(
         scope.GetScriptState(), std::move(transaction_backend), kTransactionId,
-        transaction_scope, mojom::IDBTransactionMode::ReadOnly, db_.Get());
+        transaction_scope, mojom::IDBTransactionMode::ReadOnly,
+        mojom::IDBTransactionDurability::Relaxed, db_.Get());
 
     IDBKeyPath store_key_path("primaryKey");
     scoped_refptr<IDBObjectStoreMetadata> store_metadata = base::AdoptRef(

third_party/blink/renderer/modules/indexeddb/idb_transaction.cc

@@ -52,12 +52,14 @@ IDBTransaction* IDBTransaction::CreateNonVersionChange(
     int64_t id,
     const HashSet<String>& scope,
     mojom::IDBTransactionMode mode,
+    mojom::IDBTransactionDurability durability,
     IDBDatabase* db) {
   DCHECK_NE(mode, mojom::IDBTransactionMode::VersionChange);
   DCHECK(!scope.IsEmpty()) << "Non-version transactions should operate on a "
                               "well-defined set of stores";
-  return MakeGarbageCollected<IDBTransaction>(
-      script_state, std::move(transaction_backend), id, scope, mode, db);
+  return MakeGarbageCollected<IDBTransaction>(script_state,
+                                              std::move(transaction_backend),
+                                              id, scope, mode, durability, db);
 }
 
 IDBTransaction* IDBTransaction::CreateVersionChange(
@@ -78,12 +80,14 @@ IDBTransaction::IDBTransaction(
     int64_t id,
     const HashSet<String>& scope,
     mojom::IDBTransactionMode mode,
+    mojom::IDBTransactionDurability durability,
     IDBDatabase* db)
     : ContextLifecycleObserver(ExecutionContext::From(script_state)),
       transaction_backend_(std::move(transaction_backend)),
       id_(id),
       database_(db),
       mode_(mode),
+      durability_(durability),
       scope_(scope),
       event_queue_(
           MakeGarbageCollected<EventQueue>(ExecutionContext::From(script_state),
@@ -122,6 +126,7 @@ IDBTransaction::IDBTransaction(
       database_(db),
       open_db_request_(open_db_request),
       mode_(mojom::IDBTransactionMode::VersionChange),
+      durability_(mojom::IDBTransactionDurability::Default),
       state_(kInactive),
       old_database_metadata_(old_metadata),
       event_queue_(
@@ -495,6 +500,21 @@ const String& IDBTransaction::mode() const {
   return indexed_db_names::kReadonly;
 }
 
+const String& IDBTransaction::durability() const {
+  switch (durability_) {
+    case mojom::IDBTransactionDurability::Default:
+      return indexed_db_names::kDefault;
+
+    case mojom::IDBTransactionDurability::Strict:
+      return indexed_db_names::kStrict;
+
+    case mojom::IDBTransactionDurability::Relaxed:
+      return indexed_db_names::kRelaxed;
+  }
+
+  NOTREACHED();
+}
+
 DOMStringList* IDBTransaction::objectStoreNames() const {
   if (IsVersionChange())
     return database_->objectStoreNames();

third_party/blink/renderer/modules/indexeddb/idb_transaction.h

@@ -75,6 +75,7 @@ class MODULES_EXPORT IDBTransaction final
       int64_t transaction_id,
       const HashSet<String>& scope,
       mojom::IDBTransactionMode,
+      mojom::IDBTransactionDurability,
       IDBDatabase* database);
   static IDBTransaction* CreateVersionChange(
       ExecutionContext*,
@@ -90,6 +91,7 @@ class MODULES_EXPORT IDBTransaction final
                  int64_t,
                  const HashSet<String>& scope,
                  mojom::IDBTransactionMode,
+                 mojom::IDBTransactionDurability,
                  IDBDatabase*);
   // For upgrade transactions.
   IDBTransaction(ExecutionContext*,
@@ -122,6 +124,7 @@ class MODULES_EXPORT IDBTransaction final
 
   // Implement the IDBTransaction IDL
   const String& mode() const;
+  const String& durability() const;
   DOMStringList* objectStoreNames() const;
   IDBDatabase* db() const { return database_.Get(); }
   DOMException* error() const { return error_; }
@@ -213,6 +216,7 @@ class MODULES_EXPORT IDBTransaction final
   Member<IDBDatabase> database_;
   Member<IDBOpenDBRequest> open_db_request_;
   const mojom::IDBTransactionMode mode_;
+  const mojom::IDBTransactionDurability durability_;
 
   // The names of the object stores that make up this transaction's scope.
   //

third_party/blink/renderer/modules/indexeddb/idb_transaction.idl

@@ -42,6 +42,7 @@ enum IDBTransactionMode {
     // Properties
     readonly attribute DOMStringList objectStoreNames;
     readonly attribute IDBTransactionMode mode;
+    [RuntimeEnabled=IDBRelaxedDurability] readonly attribute IDBTransactionDurability durability;
     [SameObject] readonly attribute IDBDatabase db;
     readonly attribute DOMException error;
 

third_party/blink/renderer/modules/indexeddb/idb_transaction_test.cc

@@ -98,7 +98,8 @@ class IDBTransactionTest : public testing::Test {
     HashSet<String> transaction_scope = {"store"};
     transaction_ = IDBTransaction::CreateNonVersionChange(
         scope.GetScriptState(), std::move(transaction_backend), kTransactionId,
-        transaction_scope, mojom::IDBTransactionMode::ReadOnly, db_.Get());
+        transaction_scope, mojom::IDBTransactionMode::ReadOnly,
+        mojom::IDBTransactionDurability::Relaxed, db_.Get());
 
     IDBKeyPath store_key_path("primaryKey");
     scoped_refptr<IDBObjectStoreMetadata> store_metadata = base::AdoptRef(

third_party/blink/renderer/modules/indexeddb/indexed_db_names.json5

@@ -32,5 +32,11 @@
     "put",
     "delete",
     "clear",
+
+    // The IDBTransactionDurability enum is still being standardized.
+    // https://chromestatus.com/feature/5730701489995776
+    "default",
+    "relaxed",
+    "strict",
   ],
 }

third_party/blink/web_tests/external/wpt/IndexedDB/transaction-relaxed-durability.tentative.any.js

@@ -3,18 +3,18 @@
 
 /**
  * This file contains the webplatform smoke tests for the optional
- * relaxedDurability parameter of the IndexedDB transaction API.
+ * durability parameter of the IndexedDB transaction API.
  *
  * @author enne@chromium.org
  */
 
 // Smoke test optional parameter on IndexedDB.transaction.
 let cases = [
-  undefined,
-  {},
-  {durability: "default"},
-  {durability: "relaxed"},
-  {durability: "strict"},
+  { options: undefined, expected: 'default' },
+  { options: {}, expected: 'default' },
+  { options: { durability: 'default'}, expected: 'default' },
+  { options: { durability: 'relaxed'}, expected: 'relaxed' },
+  { options: { durability: 'strict'}, expected: 'strict' },
 ];
 
 for (let i = 0; i < cases.length; ++i) {
@@ -22,11 +22,13 @@ for (let i = 0; i < cases.length; ++i) {
     const db = await createDatabase(testCase, db => {
       createBooksStore(testCase, db);
     });
-    const txn = db.transaction(['books'], 'readwrite', cases[i]);
+    const txn = db.transaction(['books'], 'readwrite', cases[i].options);
     const objectStore = txn.objectStore('books');
     objectStore.put({isbn: 'one', title: 'title1'});
     await promiseForTransaction(testCase, txn);
 
+    assert_equals(txn.durability, cases[i].expected);
+
     const txn2 = db.transaction(['books'], 'readonly');
     const objectStore2 = txn2.objectStore('books');
     const getTitle1 = objectStore2.get('one');
@@ -38,3 +40,14 @@ for (let i = 0; i < cases.length; ++i) {
     db.close();
   }, 'Committed data can be read back out: case ' + i);
 }
+
+promise_test(async testCase => {
+  const db = await createDatabase(testCase, db => {
+    createBooksStore(testCase, db);
+  });
+
+  assert_throws(new TypeError(), function() {
+      db.transaction(['books'], 'readwrite', { durability: 'invalid' });
+  });
+  db.close();
+}, 'Invalid durability option throws a TypeError');

third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt

@@ -736,6 +736,7 @@ interface IDBRequest : EventTarget
 interface IDBTransaction : EventTarget
     attribute @@toStringTag
     getter db
+    getter durability
     getter error
     getter mode
     getter objectStoreNames

third_party/blink/web_tests/webexposed/global-interface-listing-dedicated-worker-expected.txt

@@ -678,6 +678,7 @@ Starting worker: resources/global-interface-listing-worker.js
 [Worker] interface IDBTransaction : EventTarget
 [Worker]     attribute @@toStringTag
 [Worker]     getter db
+[Worker]     getter durability
 [Worker]     getter error
 [Worker]     getter mode
 [Worker]     getter objectStoreNames

third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt

@@ -4407,6 +4407,7 @@ interface IDBRequest : EventTarget
 interface IDBTransaction : EventTarget
     attribute @@toStringTag
     getter db
+    getter durability
     getter error
     getter mode
     getter objectStoreNames

third_party/blink/web_tests/webexposed/global-interface-listing-shared-worker-expected.txt

@@ -673,6 +673,7 @@ Starting worker: resources/global-interface-listing-worker.js
 [Worker] interface IDBTransaction : EventTarget
 [Worker]     attribute @@toStringTag
 [Worker]     getter db
+[Worker]     getter durability
 [Worker]     getter error
 [Worker]     getter mode
 [Worker]     getter objectStoreNames