Bug 1766691 - Add a pref per origin trial. r=k88hudson

This will allow more fine-grained control on a per-trial basis. Differential Revision: https://phabricator.services.mozilla.com/D144874
iaxat · Apr 29, 2022 · d81fe6c · d81fe6c
1 parent 4c8c858
commit d81fe6c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/dom/origin-trials/OriginTrials.cpp b/dom/origin-trials/OriginTrials.cpp
@@ -169,12 +169,33 @@ OriginTrials OriginTrials::FromWindow(const nsGlobalWindowInner* aWindow) {
   return doc->Trials();
 }
 
+static int32_t PrefState(OriginTrial aTrial) {
+  switch (aTrial) {
+    case OriginTrial::TestTrial:
+      return StaticPrefs::dom_origin_trials_test_trial_state();
+    case OriginTrial::MAX:
+      MOZ_ASSERT_UNREACHABLE("Unknown trial!");
+      break;
+  }
+  return 0;
+}
+
 bool OriginTrials::IsEnabled(JSContext* aCx, JSObject* aObject,
                              OriginTrial aTrial) {
   if (nsContentUtils::ThreadsafeIsSystemCaller(aCx)) {
     return true;
   }
   LOG("OriginTrials::IsEnabled(%d)\n", int(aTrial));
+
+  switch (PrefState(aTrial)) {
+    case 1:
+      return true;
+    case 2:
+      return false;
+    default:
+      break;
+  }
+
   nsIGlobalObject* global = xpc::CurrentNativeGlobal(aCx);
   MOZ_ASSERT(global);
   return global && global->Trials().IsEnabled(aTrial);

diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
@@ -2855,6 +2855,13 @@
   value: false
   mirror: always
 
+# Origin trial state for "TestTrial".
+# 0: normal, 1: always-enabled, 2: always-disabled
+- name: dom.origin-trials.test-trial.state
+  type: RelaxedAtomicInt32
+  value: 0
+  mirror: always
+
 # Is support for Window.paintWorklet enabled?
 - name: dom.paintWorklet.enabled
   type: bool