Commit 612a66cb authored by Kearwood Gilbert's avatar Kearwood Gilbert
Browse files

Bug 1459362 - Disable WebVR in release on macOS (Backed out changeset 1b24d52edebb) r=smaug 

MozReview-Commit-ID: BMuGwXYP750

--HG--
extra : rebase_source : 504ddec40e851c216dbb4fd0ca95756e3c895ea8
parent f62e2a94

dom/tests/mochitest/general/test_interfaces.js

+9 −9
Original line number Diff line number Diff line
@@ -1169,21 +1169,21 @@ var interfaceNamesInGlobalScope = 
// 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!
@@ -1291,7 +1291,7 @@ function createInterfaceMap(isXBLScope) { 
            (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

modules/libpref/init/all.js

+1 −1
Original line number Diff line number Diff line
@@ -5142,7 +5142,7 @@ 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);