--- a/dom/tests/mochitest/general/test_interfaces.js
+++ b/dom/tests/mochitest/general/test_interfaces.js
@@ -1164,31 +1164,31 @@ var interfaceNamesInGlobalScope =
{name: "UserProximityEvent", insecureContext: true, disabled: isEarlyBetaOrEarlier},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "ValidityState", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "VideoPlaybackQuality", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "VideoStreamTrack", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
- {name: "VRDisplay", insecureContext: true, releaseNonWindowsAndMac: false},
+ {name: "VRDisplay", insecureContext: true, releaseNonWindows: false},
// IMPORTANT: Do not change this list without review from a DOM peer!
- {name: "VRDisplayCapabilities", insecureContext: true, releaseNonWindowsAndMac: false},
+ {name: "VRDisplayCapabilities", insecureContext: true, releaseNonWindows: false},
// IMPORTANT: Do not change this list without review from a DOM peer!
- {name: "VRDisplayEvent", insecureContext: true, releaseNonWindowsAndMac: false},
+ {name: "VRDisplayEvent", insecureContext: true, releaseNonWindows: false},
// IMPORTANT: Do not change this list without review from a DOM peer!
- {name: "VREyeParameters", insecureContext: true, releaseNonWindowsAndMac: false},
+ {name: "VREyeParameters", insecureContext: true, releaseNonWindows: false},
// IMPORTANT: Do not change this list without review from a DOM peer!
- {name: "VRFieldOfView", insecureContext: true, releaseNonWindowsAndMac: false},
+ {name: "VRFieldOfView", insecureContext: true, releaseNonWindows: false},
// IMPORTANT: Do not change this list without review from a DOM peer!
- {name: "VRFrameData", insecureContext: true, releaseNonWindowsAndMac: false},
+ {name: "VRFrameData", insecureContext: true, releaseNonWindows: false},
// IMPORTANT: Do not change this list without review from a DOM peer!
- {name: "VRPose", insecureContext: true, releaseNonWindowsAndMac: false},
+ {name: "VRPose", insecureContext: true, releaseNonWindows: false},
// IMPORTANT: Do not change this list without review from a DOM peer!
- {name: "VRStageParameters", insecureContext: true, releaseNonWindowsAndMac: false},
+ {name: "VRStageParameters", insecureContext: true, releaseNonWindows: false},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "VTTCue", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "VTTRegion", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "WaveShaperNode", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "WebAuthnAssertion", insecureContext: true, disabled: true},
@@ -1286,17 +1286,17 @@ function createInterfaceMap(isXBLScope)
(entry.nightlyAndroid === !(isAndroid && isNightly) && isAndroid) ||
(entry.xbl === !isXBLScope) ||
(entry.desktop === !isDesktop) ||
(entry.windows === !isWindows) ||
(entry.mac === !isMac) ||
(entry.linux === !isLinux) ||
(entry.android === !isAndroid && !entry.nightlyAndroid) ||
(entry.release === !isRelease) ||
- (entry.releaseNonWindowsAndMac === !(isRelease && !isWindows && !isMac)) ||
+ (entry.releaseNonWindows === !(isRelease && !isWindows)) ||
// The insecureContext test is very purposefully converting
// entry.insecureContext to boolean, so undefined will convert to
// false. That way entries without an insecureContext annotation
// will get treated as "insecureContext: false", which means exposed
// only in secure contexts.
(isInsecureContext && !Boolean(entry.insecureContext)) ||
entry.disabled) {
interfaceMap[entry.name] = false;
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5133,17 +5133,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