Bug 1517878 - Make dom.vr.{openvr,occulus}.enabled=false on Android. r=kip
authorNick Alexander <nalexander@mozilla.com>
Sat, 05 Jan 2019 01:17:57 +0000
changeset 509731 1ed041abb586e1085d1493403380d2e524b15c08
parent 509730 4a1af6e7446a70f3e9b36541c317054bfab692f7
child 509732 64ae1fbfe96463284ad62bc0bbf42e9828e7e21f
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskip
bugs1517878
milestone66.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 1517878 - Make dom.vr.{openvr,occulus}.enabled=false on Android. r=kip These prefs are irrelevant on Android, so let's keep them constant across architectures. Differential Revision: https://phabricator.services.mozilla.com/D15769
modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5337,20 +5337,21 @@ pref("dom.vr.external.notdetected.timeou
 pref("dom.vr.external.quit.timeout", 10000);
 // Maximum number of milliseconds the browser will wait for content to call
 // VRDisplay.requestPresent after emitting vrdisplayactivate during VR
 // link traversal.  This prevents a long running event handler for
 // vrdisplayactivate from later calling VRDisplay.requestPresent, which would
 // result in a non-responsive browser in the VR headset.
 pref("dom.vr.navigation.timeout", 5000);
 // Oculus device
-#if defined(HAVE_64BIT_BUILD)
+#if defined(HAVE_64BIT_BUILD) && !defined(ANDROID)
 // We are only enabling WebVR by default on 64-bit builds (Bug 1384459)
 pref("dom.vr.oculus.enabled", true);
 #else
+// On Android, this pref is irrelevant.
 pref("dom.vr.oculus.enabled", false);
 #endif
 // Minimum number of milliseconds after content has stopped VR presentation
 // before the Oculus session is re-initialized to an invisible / tracking
 // only mode.  If this value is too high, users will need to wait longer
 // after stopping WebVR presentation before automatically returning to the
 // Oculus home interface.  (They can immediately return to the Oculus Home
 // interface through the Oculus HUD without waiting this duration)
@@ -5369,24 +5370,24 @@ pref("dom.vr.oculus.quit.timeout", 10000
 // begins presenting VR frames, the session will be re-initialized without
 // the flag.  This eliminates the "Firefox not responding" warnings in
 // the headset, but might not be compatible with all versions of the Oculus
 // runtime.
 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)
+#if !defined(HAVE_64BIT_BUILD) && !defined(ANDROID)
+// 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 OpenVR by default for Windows and macOS
 pref("dom.vr.openvr.enabled", true);
 #else
-// See Bug 1310663 (Linux)
+// See Bug 1310663 (Linux).  On Android, this pref is irrelevant.
 pref("dom.vr.openvr.enabled", false);
 #endif
 #ifdef RELEASE_OR_BETA
 pref("dom.vr.openvr.action_input", false);
 #else
 pref("dom.vr.openvr.action_input", true);
 #endif
 // Minimum number of milliseconds that the browser will wait before