Bug 1426500 - Disable WebVR for macOS on Beta and Release
- WebVR will continue to be enabled on macOS for Nightly
and Dev Edition
MozReview-Commit-ID: LpEX13yZVbb
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5224,17 +5224,17 @@ pref("jsloader.shareGlobal", true);
// event loop to become idle before actually taking the screenshot.
pref("dom.browserElement.maxScreenshotDelayMS", 2000);
// Whether we should show the placeholder when the element is focused but empty.
pref("dom.placeholder.show_on_focus", true);
// WebVR is enabled by default in beta and release for Windows and for all
// platforms in nightly and aurora.
-#if defined(XP_WIN) || defined(XP_MACOSX) || !defined(RELEASE_OR_BETA)
+#if defined(XP_WIN) || !defined(RELEASE_OR_BETA)
pref("dom.vr.enabled", true);
#else
pref("dom.vr.enabled", false);
#endif
// It is often desirable to automatically start vr presentation when
// a user puts on the VR headset. This is done by emitting the
// Window.vrdisplayactivate event when the headset's sensors detect it
// being worn. This can result in WebVR content taking over the headset
@@ -5282,17 +5282,17 @@ pref("dom.vr.oculus.quit.timeout", 10000
pref("dom.vr.oculus.invisible.enabled", true);
// OSVR device
pref("dom.vr.osvr.enabled", false);
// OpenVR device
#if !defined(HAVE_64BIT_BUILD)
// We are only enabling WebVR by default on 64-bit builds (Bug 1384459)
pref("dom.vr.openvr.enabled", false);
#elif defined(XP_WIN) || defined(XP_MACOSX)
-// We enable WebVR by default for Windows and macOS
+// We enable OpenVR by default for Windows and macOS
pref("dom.vr.openvr.enabled", true);
#else
// See Bug 1310663 (Linux)
pref("dom.vr.openvr.enabled", false);
#endif
// Minimum number of milliseconds that the browser will wait before
// attempting to poll again for connected VR controllers. The browser
// will not attempt to poll for VR controllers until it needs to use them.