Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 14:52:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1758549, part 2 - Guard a few more entry points into VRManager. r=jgilbert

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D140785
This commit is contained in:
Andrew McCreight 2022-03-12 15:30:37 +00:00
parent a9eb9ba571
commit 3f169d905a
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/vr/VRManager.cpp
View File

@ -858,6 +858,9 @@ void VRManager::DispatchRuntimeCapabilitiesUpdate() {
}
void VRManager::StopAllHaptics() {
if (mState != VRManagerState::Active) {
return;
}
for (size_t i = 0; i < mozilla::ArrayLength(mBrowserState.hapticState); i++) {
ClearHapticSlot(i);
}
@ -1015,6 +1018,10 @@ bool VRManager::RunPuppet(const nsTArray<uint64_t>& aBuffer,
}
void VRManager::ResetPuppet(VRManagerParent* aManagerParent) {
if (!StaticPrefs::dom_vr_puppet_enabled()) {
return;
}
mManagerParentsWaitingForPuppetReset.Insert(aManagerParent);
if (mManagerParentRunningPuppet != nullptr) {
Unused << mManagerParentRunningPuppet
@ -1516,6 +1523,10 @@ void VRManager::CancelCurrentSubmitTask() {
NS_IMETHODIMP
VRManager::Observe(nsISupports* subject, const char* topic,
const char16_t* data) {
if (!StaticPrefs::dom_vr_enabled() && !StaticPrefs::dom_vr_webxr_enabled()) {
return NS_OK;
}
if (!strcmp(topic, "application-background")) {
// StopTasks() is called later in the timer thread based on this flag to
// avoid threading issues.