Bug 1426500 - Disable WebVR for macOS on Beta and Release r=daoshengmu
authorKearwood "Kip" Gilbert <kgilbert@mozilla.com>
Wed, 10 Jan 2018 16:14:21 -0800
changeset 398676 78533a254124a2686d70f6fd39323f954a1f06bf
parent 398675 770bbacbc16bdcb1c62d402e68d57767e626be0c
child 398677 baa4d5ed8cfd97483e3d53e734883d1333b27589
push id57873
push userkgilbert@mozilla.com
push dateThu, 11 Jan 2018 06:32:32 +0000
treeherderautoland@78533a254124 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdaoshengmu
bugs1426500
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1426500 - Disable WebVR for macOS on Beta and Release r=daoshengmu - WebVR will continue to be enabled on macOS for Nightly and Dev Edition MozReview-Commit-ID: LpEX13yZVbb
modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5231,17 +5231,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
@@ -5289,17 +5289,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.