Skip to content

Commit a364f4f

Browse files
ErichDonGublerErichDonGubler
committed
Bug 1972486 - chore(webgpu)!: narrow dom.webgpu.workers.enabled to ….service-workers.enabled r=webgpu-reviewers,saschanaz,jimb
Differential Revision: https://phabricator.services.mozilla.com/D255381
1 parent a8f6252 commit a364f4f

9 files changed

Lines changed: 21 additions & 18 deletions

File tree

‎dom/webgpu/Instance.cpp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
#include "nsString.h"
2323
#include "nsStringFwd.h"
2424

25-
#ifndef EARLY_BETA_OR_EARLIER
26-
# include "mozilla/dom/WorkerPrivate.h"
27-
#endif
25+
#include "mozilla/dom/WorkerPrivate.h"
2826

2927
#include <optional>
3028
#include <string_view>
@@ -48,7 +46,12 @@ static inline nsDependentCString ToCString(const std::string_view s) {
4846
return true;
4947
}
5048

51-
return StaticPrefs::dom_webgpu_workers_enabled();
49+
dom::WorkerPrivate* wp = dom::GetCurrentThreadWorkerPrivate();
50+
if (wp && wp->IsServiceWorker()) {
51+
return StaticPrefs::dom_webgpu_service_workers_enabled();
52+
}
53+
54+
return true;
5255
}
5356

5457
/*static*/

‎dom/webgpu/tests/mochitest/mochitest-resistfingerprinting.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ run-if = ["!release_or_beta"]
44
skip-if = ["verify"] # `test-verify` jobs don't guarantee a GPU, so skip them.
55
prefs = [
66
"dom.webgpu.enabled=true",
7-
"dom.webgpu.workers.enabled=true",
7+
"dom.webgpu.service-workers.enabled=true",
88
"privacy.fingerprintingProtection=true",
99
"privacy.fingerprintingProtection.overrides='-AllTargets,+WebGPULimits'",
1010
]

‎dom/webgpu/tests/mochitest/mochitest.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ skip-if = ["verify"]
1313

1414
prefs = [
1515
"dom.webgpu.enabled=true",
16-
"dom.webgpu.workers.enabled=true",
16+
"dom.webgpu.service-workers.enabled=true",
1717
]
1818
support-files = [
1919
"worker_wrapper.js",

‎dom/webgpu/tests/mochitest/perftest.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ run-if = ["!release_or_beta"]
44
skip-if = ["verify"] # `test-verify` jobs don't guarantee a GPU, so skip them.
55
prefs = [
66
"dom.webgpu.enabled=true",
7-
"dom.webgpu.workers.enabled=true",
7+
"dom.webgpu.service-workers.enabled=true",
88
]
99
support-files = [
1010
"worker_wrapper.js",

‎modules/libpref/init/StaticPrefList.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5509,8 +5509,8 @@
55095509
value: @IS_EARLY_BETA_OR_EARLIER@
55105510
mirror: always
55115511

5512-
# Is support for the Web GPU API enabled on DOM workers?
5513-
- name: dom.webgpu.workers.enabled
5512+
# Is support for the Web GPU API enabled on service workers?
5513+
- name: dom.webgpu.service-workers.enabled
55145514
type: RelaxedAtomicBool
55155515
value: @IS_EARLY_BETA_OR_EARLIER@
55165516
mirror: always

‎testing/web-platform/meta/webgpu/__dir__.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
prefs:
2-
if os == "mac": [dom.webgpu.enabled:true, dom.webgpu.workers.enabled:true, dom.webgpu.testing.assert-hardware-adapter:true]
3-
if os == "windows": [dom.webgpu.enabled:true, dom.webgpu.workers.enabled:true, dom.webgpu.testing.assert-hardware-adapter:true]
4-
[dom.webgpu.enabled:true, dom.webgpu.workers.enabled:true]
2+
if os == "mac": [dom.webgpu.enabled:true, dom.webgpu.service-workers.enabled:true, dom.webgpu.testing.assert-hardware-adapter:true]
3+
if os == "windows": [dom.webgpu.enabled:true, dom.webgpu.service-workers.enabled:true, dom.webgpu.testing.assert-hardware-adapter:true]
4+
[dom.webgpu.enabled:true, dom.webgpu.service-workers.enabled:true]
55
lsan-allowed: [Alloc, mozilla::net::nsServerSocket::CreateClientTransport]
66
leak-threshold: [default:51200]

‎testing/web-platform/mozilla/meta/webgpu/__dir__.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
prefs:
2-
if os == "mac": [dom.webgpu.enabled:true, dom.webgpu.workers.enabled:true, dom.webgpu.testing.assert-hardware-adapter:true, media.rvfc.enabled:true]
3-
if os == "win": [dom.webgpu.enabled:true, dom.webgpu.workers.enabled:true, dom.webgpu.testing.assert-hardware-adapter:true, media.rvfc.enabled:true]
4-
[dom.webgpu.enabled:true, dom.webgpu.workers.enabled:true, media.rvfc.enabled:true]
2+
if os == "mac": [dom.webgpu.enabled:true, dom.webgpu.service-workers.enabled:true, dom.webgpu.testing.assert-hardware-adapter:true, media.rvfc.enabled:true]
3+
if os == "win": [dom.webgpu.enabled:true, dom.webgpu.service-workers.enabled:true, dom.webgpu.testing.assert-hardware-adapter:true, media.rvfc.enabled:true]
4+
[dom.webgpu.enabled:true, dom.webgpu.service-workers.enabled:true, media.rvfc.enabled:true]
55
tags: [webgpu]
66
disabled:
77
if release_or_beta: https://mozilla-hub.atlassian.net/browse/FFXP-223

‎toolkit/components/aboutinference/content/aboutInference.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ async function refreshPage() {
606606
const ml_enable = Services.prefs.getBoolPref("browser.ml.enable");
607607
const gpu_enabled =
608608
Services.prefs.getBoolPref("dom.webgpu.enabled") &&
609-
Services.prefs.getBoolPref("dom.webgpu.workers.enabled");
609+
Services.prefs.getBoolPref("dom.webgpu.service-workers.enabled");
610610

611611
const content = document.getElementById("content");
612612
const warning = document.getElementById("warning");
@@ -624,7 +624,7 @@ async function refreshPage() {
624624
"browser.ml.enable is set to False ! Toggle it to activate local inference.";
625625
} else if (!gpu_enabled) {
626626
text =
627-
"WebGPU is not enabled, set dom.webgpu.enabled and dom.webgpu.workers.enabled to true.";
627+
"WebGPU is not enabled, set dom.webgpu.enabled and dom.webgpu.service-workers.enabled to true.";
628628
}
629629

630630
warning.setAttribute("message", text);

‎toolkit/components/aboutinference/tests/browser/head.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ async function openAboutInference({
6363
["browser.ml.enable", !disabled],
6464
["browser.ml.logLevel", "Debug"],
6565
["dom.webgpu.enabled", !disabled],
66-
["dom.webgpu.workers.enabled", !disabled],
66+
["dom.webgpu.service-workers.enabled", !disabled],
6767
...(prefs ?? []),
6868
],
6969
});

0 commit comments

Comments
 (0)