Skip to content

Commit 5b78b57

Browse files
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 d9687e5 commit 5b78b57

2 files changed

Lines changed: 9 additions & 6 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*/

modules/libpref/init/StaticPrefList.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5505,8 +5505,8 @@
55055505
value: @IS_EARLY_BETA_OR_EARLIER@
55065506
mirror: always
55075507

5508-
# Is support for the Web GPU API enabled on DOM workers?
5509-
- name: dom.webgpu.workers.enabled
5508+
# Is support for the Web GPU API enabled on service workers?
5509+
- name: dom.webgpu.service-workers.enabled
55105510
type: RelaxedAtomicBool
55115511
value: @IS_EARLY_BETA_OR_EARLIER@
55125512
mirror: always

0 commit comments

Comments
 (0)