Bug 1426500 - Disable WebVR for macOS on Beta and Release r=daoshengmu a=gchang
☠☠ backed out by 8bb8f895a740 ☠ ☠
authorKearwood "Kip" Gilbert <kgilbert@mozilla.com>
Wed, 10 Jan 2018 16:14:21 -0800
changeset 445633 76192bc7ded10f07dd8eb314af1b268d2b0af248
parent 445632 3a94f3140a144491cde0c1805afcd13ae9922b7f
child 445634 398360c9d5c6fcc80d7ced94afe65ee7f672b0bf
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdaoshengmu, gchang
Bug 1426500 - Disable WebVR for macOS on Beta and Release r=daoshengmu a=gchang - 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
@@ -5241,17 +5241,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);
 pref("dom.vr.enabled", false);
 // 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
@@ -5292,17 +5292,17 @@ pref("dom.vr.oculus.present.timeout", 10
 pref("dom.vr.oculus.quit.timeout", 30000);
 // 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);
 // See Bug 1310663 (Linux)
 pref("dom.vr.openvr.enabled", false);
 // Pose prediction reduces latency effects by returning future predicted HMD
 // poses to callers of the WebVR API.  This currently only has an effect for
 // Oculus Rift on SDK 0.8 or greater.