Supress ExternalVR frames when Application is paused (#3054)

MozillaReality · Mar 26, 2020 · 088db73 · 088db73
1 parent e083e4b
commit 088db73
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/app/src/main/cpp/BrowserWorld.cpp b/app/src/main/cpp/BrowserWorld.cpp
@@ -748,13 +748,15 @@ void
 BrowserWorld::Pause() {
   ASSERT_ON_RENDER_THREAD();
   m.paused = true;
+  m.externalVR->OnPause();
   m.monitor->Pause();
 }
 
 void
 BrowserWorld::Resume() {
   ASSERT_ON_RENDER_THREAD();
   m.paused = false;
+  m.externalVR->OnResume();
   m.monitor->Resume();
 }
 

diff --git a/app/src/main/cpp/ExternalVR.cpp b/app/src/main/cpp/ExternalVR.cpp
@@ -461,7 +461,7 @@ ExternalVR::WaitFrameResult() {
       // VRB_LOG("RequestFrame BREAK %llu",  m.browser.layerState[0].layer_stereo_immersive.frameId);
       break;
     }
-    if (m.firstPresentingFrame) {
+    if (m.firstPresentingFrame || m.waitingForExit) {
       return true; // Do not block to show loading screen until the first frame arrives.
     }
     // VRB_LOG("RequestFrame ABOUT TO WAIT FOR FRAME %llu %llu",m.browser.layerState[0].layer_stereo_immersive.frameId, m.lastFrameId);
@@ -519,6 +519,28 @@ ExternalVR::SetHapticState(ControllerContainerPtr aControllerContainer) const {
   }
 }
 
+void
+ExternalVR::OnPause() {
+  if (m.system.displayState.presentingGeneration == 0) {
+    // Do not call PushSystemState() until correctly initialized.
+    // Fixes WebXR Display not found error due to some superfluous pause/resume life cycle events.
+    return;
+  }
+  m.system.displayState.isConnected = false;
+  PushSystemState();
+}
+
+void
+ExternalVR::OnResume() {
+  if (m.system.displayState.presentingGeneration == 0) {
+    // Do not call PushSystemState() until correctly initialized.
+    // Fixes WebXR Display not found error due to some superfluous pause/resume life cycle events.
+    return;
+  }
+  m.system.displayState.isConnected = true;
+  PushSystemState();
+}
+
 void
 ExternalVR::StopPresenting() {
   m.system.displayState.presentingGeneration++;

diff --git a/app/src/main/cpp/ExternalVR.h b/app/src/main/cpp/ExternalVR.h
@@ -63,6 +63,8 @@ class ExternalVR : public ImmersiveDisplay {
   void SetHapticState(ControllerContainerPtr aControllerContainer) const;
   void StopPresenting();
   void SetSourceBrowser(VRBrowserType aBrowser);
+  void OnPause();
+  void OnResume();
   ExternalVR();
   ~ExternalVR() = default;
 protected: