From afcb3962b4a14c301b795aeb4ef9d31d5f6450d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 21 Oct 2022 19:00:57 +0000
Subject: [PATCH] Bug 1796819 - Remove OffscreenCanvas origin trial / domain
 allowlist. r=aosmond

We've shipped this, a single pref should be enough.

Differential Revision: https://phabricator.services.mozilla.com/D159947
---
 dom/canvas/CanvasUtils.cpp                    | 34 -------------------
 dom/canvas/OffscreenCanvas.cpp                |  6 +---
 dom/origin-trials/OriginTrials.cpp            |  2 --
 dom/origin-trials/ffi/lib.rs                  |  4 +--
 .../tests/mochitest/test_meta_simple.html     |  5 ---
 dom/webidl/HTMLCanvasElement.webidl           |  2 +-
 dom/webidl/OffscreenCanvas.webidl             |  3 +-
 .../OffscreenCanvasRenderingContext2D.webidl  |  3 +-
 modules/libpref/init/StaticPrefList.yaml      | 19 -----------
 9 files changed, 5 insertions(+), 73 deletions(-)

diff --git a/dom/canvas/CanvasUtils.cpp b/dom/canvas/CanvasUtils.cpp
index 37fef582ecb2..0ded590c0b94 100644
--- a/dom/canvas/CanvasUtils.cpp
+++ b/dom/canvas/CanvasUtils.cpp
@@ -341,40 +341,6 @@ bool HasDrawWindowPrivilege(JSContext* aCx, JSObject* /* unused */) {
                                              nsGkAtoms::all_urlsPermission);
 }
 
-bool IsOffscreenCanvasEnabled(JSContext* aCx, JSObject* aObj) {
-  if (StaticPrefs::gfx_offscreencanvas_enabled()) {
-    return true;
-  }
-
-  if (OriginTrials::IsEnabled(aCx, aObj, OriginTrial::OffscreenCanvas)) {
-    return true;
-  }
-
-  if (!StaticPrefs::gfx_offscreencanvas_domain_enabled()) {
-    return false;
-  }
-
-  if (!NS_IsMainThread()) {
-    dom::WorkerPrivate* workerPrivate = dom::GetWorkerPrivateFromContext(aCx);
-    if (workerPrivate->UsesSystemPrincipal() ||
-        workerPrivate->OriginNoSuffix() == u"resource://pdf.js"_ns) {
-      return true;
-    }
-
-    const auto prefLock = StaticPrefs::gfx_offscreencanvas_domain_allowlist();
-    return nsContentUtils::IsURIInList(workerPrivate->GetBaseURI(), *prefLock);
-  }
-
-  nsIPrincipal* principal = nsContentUtils::SubjectPrincipal(aCx);
-  if (principal->IsSystemPrincipal() || nsContentUtils::IsPDFJS(principal)) {
-    return true;
-  }
-
-  nsCOMPtr<nsIURI> uri = principal->GetURI();
-  const auto prefLock = StaticPrefs::gfx_offscreencanvas_domain_allowlist();
-  return nsContentUtils::IsURIInList(uri, *prefLock);
-}
-
 bool CheckWriteOnlySecurity(bool aCORSUsed, nsIPrincipal* aPrincipal,
                             bool aHadCrossOriginRedirects) {
   if (!aPrincipal) {
diff --git a/dom/canvas/OffscreenCanvas.cpp b/dom/canvas/OffscreenCanvas.cpp
index 4c1cb538f761..870fd0048ab4 100644
--- a/dom/canvas/OffscreenCanvas.cpp
+++ b/dom/canvas/OffscreenCanvas.cpp
@@ -446,11 +446,7 @@ already_AddRefed<OffscreenCanvas> OffscreenCanvas::CreateFromCloneData(
 /* static */
 bool OffscreenCanvas::PrefEnabledOnWorkerThread(JSContext* aCx,
                                                 JSObject* aObj) {
-  if (NS_IsMainThread()) {
-    return true;
-  }
-
-  return CanvasUtils::IsOffscreenCanvasEnabled(aCx, aObj);
+  return NS_IsMainThread() || StaticPrefs::gfx_offscreencanvas_enabled();
 }
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(OffscreenCanvas, DOMEventTargetHelper,
diff --git a/dom/origin-trials/OriginTrials.cpp b/dom/origin-trials/OriginTrials.cpp
index e9c4eaddcbd8..9f9e6b44fee0 100644
--- a/dom/origin-trials/OriginTrials.cpp
+++ b/dom/origin-trials/OriginTrials.cpp
@@ -210,8 +210,6 @@ static int32_t PrefState(OriginTrial aTrial) {
   switch (aTrial) {
     case OriginTrial::TestTrial:
       return StaticPrefs::dom_origin_trials_test_trial_state();
-    case OriginTrial::OffscreenCanvas:
-      return StaticPrefs::dom_origin_trials_offscreen_canvas_state();
     case OriginTrial::CoepCredentialless:
       return StaticPrefs::dom_origin_trials_coep_credentialless_state();
     case OriginTrial::MAX:
diff --git a/dom/origin-trials/ffi/lib.rs b/dom/origin-trials/ffi/lib.rs
index f850fe52458d..1745c9e790a6 100644
--- a/dom/origin-trials/ffi/lib.rs
+++ b/dom/origin-trials/ffi/lib.rs
@@ -9,8 +9,7 @@ use std::ffi::c_void;
 pub enum OriginTrial {
     // NOTE(emilio): 0 is reserved for WebIDL usage.
     TestTrial = 1,
-    OffscreenCanvas = 2,
-    CoepCredentialless = 3,
+    CoepCredentialless = 2,
 
     MAX,
 }
@@ -19,7 +18,6 @@ impl OriginTrial {
     fn from_str(s: &str) -> Option<Self> {
         Some(match s {
             "TestTrial" => Self::TestTrial,
-            "OffscreenCanvas" => Self::OffscreenCanvas,
             "CoepCredentialless" => Self::CoepCredentialless,
             _ => return None,
         })
diff --git a/dom/origin-trials/tests/mochitest/test_meta_simple.html b/dom/origin-trials/tests/mochitest/test_meta_simple.html
index 9afd4a645c16..8b853a8774f3 100644
--- a/dom/origin-trials/tests/mochitest/test_meta_simple.html
+++ b/dom/origin-trials/tests/mochitest/test_meta_simple.html
@@ -1,17 +1,12 @@
 <!doctype html>
 <!-- Created with: mktoken --origin 'https://example.com' --feature TestTrial --expiry 'Wed, 01 Jan 3000 01:00:00 +0100' --sign test-keys/test-ecdsa.pkcs8 -->
 <meta http-equiv="origin-trial" content="AyGdETIKWLLqe+chG57f74gZcjYSfbdYAapEq7DA49E6CmaYaPmaoXh/4tAe5XJJJdwwpFVal7hz/irC+Wvp1HgAAABLeyJvcmlnaW4iOiJodHRwczovL2V4YW1wbGUuY29tIiwiZmVhdHVyZSI6IlRlc3RUcmlhbCIsImV4cGlyeSI6MzI1MDM2ODAwMDB9">
-<!-- Created with: mktoken --origin 'https://example.com' --feature OffscreenCanvas --expiry 'Wed, 01 Jan 3000 01:00:00 +0100' --sign test-keys/test-ecdsa.pkcs8 -->
-<meta http-equiv="origin-trial" content="Ay92n3CdO5VIYbmQB7t7r7e4c34nT1k9zbX5ON2JthrXaOFxLn5NieN7ITlKhPbmPSLA4qoS+TBdshqEUwmVaIwAAABReyJvcmlnaW4iOiJodHRwczovL2V4YW1wbGUuY29tIiwiZmVhdHVyZSI6Ik9mZnNjcmVlbkNhbnZhcyIsImV4cGlyeSI6MzI1MDM2ODAwMDB9">
 <!-- Created with: mktoken --origin 'https://example.com' --feature CoepCredentialless --expiry 'Wed, 01 Jan 3000 01:00:00 +0100' --sign test-keys/test-ecdsa.pkcs8 -->
 <meta http-equiv="origin-trial" content="Az+DK2Kczk8Xz1cAlD+TkvPZmuM2uJZ2CFefbp2hLuCU9FbUqxWTyQ2tEYr50r0syKELcOZLAPaABw8aYTLHn5YAAABUeyJvcmlnaW4iOiJodHRwczovL2V4YW1wbGUuY29tIiwiZmVhdHVyZSI6IkNvZXBDcmVkZW50aWFsbGVzcyIsImV4cGlyeSI6MzI1MDM2ODAwMDB9">
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <script src="common.js"></script>
 <script>
   assertTestTrialActive(true);
-  add_task(function() {
-    ok(!!self.OffscreenCanvas, "OffscreenCanvas trial works.");
-  });
   add_task(function() {
     ok(!!SpecialPowers.DOMWindowUtils.isCoepCredentialless(), "CoepCredentialless trial works.");
   });
diff --git a/dom/webidl/HTMLCanvasElement.webidl b/dom/webidl/HTMLCanvasElement.webidl
index 78f48d20e18f..3de8401cb8c0 100644
--- a/dom/webidl/HTMLCanvasElement.webidl
+++ b/dom/webidl/HTMLCanvasElement.webidl
@@ -49,7 +49,7 @@ partial interface HTMLCanvasElement {
 // For OffscreenCanvas
 // Reference: https://wiki.whatwg.org/wiki/OffscreenCanvas
 partial interface HTMLCanvasElement {
-  [Func="CanvasUtils::IsOffscreenCanvasEnabled", Throws]
+  [Pref="gfx.offscreencanvas.enabled", Throws]
   OffscreenCanvas transferControlToOffscreen();
 };
 
diff --git a/dom/webidl/OffscreenCanvas.webidl b/dom/webidl/OffscreenCanvas.webidl
index bac005138029..7db8afb8cacc 100644
--- a/dom/webidl/OffscreenCanvas.webidl
+++ b/dom/webidl/OffscreenCanvas.webidl
@@ -16,8 +16,7 @@ dictionary ImageEncodeOptions {
 
 enum OffscreenRenderingContextId { "2d", "bitmaprenderer", "webgl", "webgl2", "webgpu" };
 
-[Exposed=(Window,Worker),
- Func="CanvasUtils::IsOffscreenCanvasEnabled"]
+[Exposed=(Window,Worker), Pref="gfx.offscreencanvas.enabled"]
 interface OffscreenCanvas : EventTarget {
   constructor([EnforceRange] unsigned long width, [EnforceRange] unsigned long height);
 
diff --git a/dom/webidl/OffscreenCanvasRenderingContext2D.webidl b/dom/webidl/OffscreenCanvasRenderingContext2D.webidl
index 29b87a993f50..55f296a672e6 100644
--- a/dom/webidl/OffscreenCanvasRenderingContext2D.webidl
+++ b/dom/webidl/OffscreenCanvasRenderingContext2D.webidl
@@ -7,8 +7,7 @@
  * https://html.spec.whatwg.org/#the-offscreen-2d-rendering-context
  */
 
-[Exposed=(Window,Worker),
- Func="CanvasUtils::IsOffscreenCanvasEnabled"]
+[Exposed=(Window,Worker), Pref="gfx.offscreencanvas.enabled"]
 interface OffscreenCanvasRenderingContext2D {
   [Throws]
   undefined commit();
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index e9ca2157a7c4..c03778bf9038 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -3073,13 +3073,6 @@
   value: 0
   mirror: always
 
-# Origin trial state for OffscreenCanvas.
-# 0: normal, 1: always-enabled, 2: always-disabled
-- name: dom.origin-trials.offscreen-canvas.state
-  type: RelaxedAtomicInt32
-  value: 0
-  mirror: always
-
 # Origin trial state for COEP: Credentialless.
 # 0: normal, 1: always-enabled, 2: always-disabled
 - name: dom.origin-trials.coep-credentialless.state
@@ -5979,18 +5972,6 @@
   value: true
   mirror: always
 
-# Enable OffscreenCanvas based on the domain allowlist.
-- name: gfx.offscreencanvas.domain-enabled
-  type: RelaxedAtomicBool
-  value: true
-  mirror: always
-
-# Domains included in the allowlist.
-- name: gfx.offscreencanvas.domain-allowlist
-  type: DataMutexString
-  value: "*.zoom.us,zoom.us"
-  mirror: always
-
 - name: gfx.omta.background-color
   type: bool
   value: true