Skip to content

Commit 1444ad7

Browse files
committed
Revert "Bug 1972486 - chore(webgpu)!: narrow dom.webgpu.workers.enabled to ….service-workers.enabled r=webgpu-reviewers,saschanaz,jimb" for causing mochitets failures in browser_aboutURLs.js.
This reverts commit 5b78b57.
1 parent a908201 commit 1444ad7

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

dom/webgpu/Instance.cpp

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

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

2729
#include <optional>
2830
#include <string_view>
@@ -46,12 +48,7 @@ static inline nsDependentCString ToCString(const std::string_view s) {
4648
return true;
4749
}
4850

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

5754
/*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 service workers?
5509-
- name: dom.webgpu.service-workers.enabled
5508+
# Is support for the Web GPU API enabled on DOM workers?
5509+
- name: dom.webgpu.workers.enabled
55105510
type: RelaxedAtomicBool
55115511
value: @IS_EARLY_BETA_OR_EARLIER@
55125512
mirror: always

0 commit comments

Comments
 (0)