Bug 1627331 - Do not dispatch WebVR events when the display is used v…

…ia WebXR API r=kip,daoshengmu Differential Revision: https://phabricator.services.mozilla.com/D69613 --HG-- extra : moz-landing-system : lando
dothq · Apr 7, 2020 · 3f977ef · 3f977ef
1 parent 3f6630e
commit 3f977ef
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 8 deletions.
diff --git a/dom/vr/VREventObserver.cpp b/dom/vr/VREventObserver.cpp
@@ -92,31 +92,31 @@ void VREventObserver::NotifyAfterLoad() {
 }
 
 void VREventObserver::NotifyVRDisplayMounted(uint32_t aDisplayID) {
-  if (mWindow && mWindow->IsCurrentInnerWindow()) {
+  if (mWindow && mWindow->IsCurrentInnerWindow() && IsWebVR(aDisplayID)) {
     MOZ_ASSERT(nsContentUtils::IsSafeToRunScript());
     mWindow->DispatchVRDisplayActivate(aDisplayID,
                                        VRDisplayEventReason::Mounted);
   }
 }
 
 void VREventObserver::NotifyVRDisplayNavigation(uint32_t aDisplayID) {
-  if (mWindow && mWindow->IsCurrentInnerWindow()) {
+  if (mWindow && mWindow->IsCurrentInnerWindow() && IsWebVR(aDisplayID)) {
     MOZ_ASSERT(nsContentUtils::IsSafeToRunScript());
     mWindow->DispatchVRDisplayActivate(aDisplayID,
                                        VRDisplayEventReason::Navigation);
   }
 }
 
 void VREventObserver::NotifyVRDisplayRequested(uint32_t aDisplayID) {
-  if (mWindow && mWindow->IsCurrentInnerWindow()) {
+  if (mWindow && mWindow->IsCurrentInnerWindow() && IsWebVR(aDisplayID)) {
     MOZ_ASSERT(nsContentUtils::IsSafeToRunScript());
     mWindow->DispatchVRDisplayActivate(aDisplayID,
                                        VRDisplayEventReason::Requested);
   }
 }
 
 void VREventObserver::NotifyVRDisplayUnmounted(uint32_t aDisplayID) {
-  if (mWindow && mWindow->IsCurrentInnerWindow()) {
+  if (mWindow && mWindow->IsCurrentInnerWindow() && IsWebVR(aDisplayID)) {
     MOZ_ASSERT(nsContentUtils::IsSafeToRunScript());
     mWindow->DispatchVRDisplayDeactivate(aDisplayID,
                                          VRDisplayEventReason::Unmounted);
@@ -129,14 +129,14 @@ void VREventObserver::NotifyVRDisplayConnect(uint32_t aDisplayID) {
    * can assume that a newly enumerated display is not presenting WebVR
    * content.
    */
-  if (mWindow && mWindow->IsCurrentInnerWindow()) {
+  if (mWindow && mWindow->IsCurrentInnerWindow() && IsWebVR(aDisplayID)) {
     MOZ_ASSERT(nsContentUtils::IsSafeToRunScript());
     mWindow->DispatchVRDisplayConnect(aDisplayID);
   }
 }
 
 void VREventObserver::NotifyVRDisplayDisconnect(uint32_t aDisplayID) {
-  if (mWindow && mWindow->IsCurrentInnerWindow()) {
+  if (mWindow && mWindow->IsCurrentInnerWindow() && IsWebVR(aDisplayID)) {
     mWindow->NotifyActiveVRDisplaysChanged();
     MOZ_ASSERT(nsContentUtils::IsSafeToRunScript());
     mWindow->DispatchVRDisplayDisconnect(aDisplayID);
@@ -148,15 +148,15 @@ void VREventObserver::NotifyVRDisplayPresentChange(uint32_t aDisplayID) {
   // to be a 2D view.
   mIs2DView = false;
 
-  if (mWindow && mWindow->IsCurrentInnerWindow()) {
+  if (mWindow && mWindow->IsCurrentInnerWindow() && IsWebVR(aDisplayID)) {
     mWindow->NotifyActiveVRDisplaysChanged();
     MOZ_ASSERT(nsContentUtils::IsSafeToRunScript());
     mWindow->DispatchVRDisplayPresentChange(aDisplayID);
   }
 }
 
 void VREventObserver::NotifyPresentationGenerationChanged(uint32_t aDisplayID) {
-  if (mWindow && mWindow->IsCurrentInnerWindow()) {
+  if (mWindow && mWindow->IsCurrentInnerWindow() && IsWebVR(aDisplayID)) {
     MOZ_ASSERT(nsContentUtils::IsSafeToRunScript());
     mWindow->NotifyPresentationGenerationChanged(aDisplayID);
   }
@@ -171,5 +171,13 @@ void VREventObserver::NotifyDetectRuntimesCompleted() {
   }
 }
 
+bool VREventObserver::IsWebVR(uint32_t aDisplayID) const {
+  VRManagerChild* vmc = VRManagerChild::Get();
+  if (vmc) {
+    return vmc->GetVRAPIMode(aDisplayID) == gfx::VRAPIMode::WebVR;
+  }
+  return true;
+}
+
 }  // namespace dom
 }  // namespace mozilla
diff --git a/dom/vr/VREventObserver.h b/dom/vr/VREventObserver.h
@@ -42,6 +42,8 @@ class VREventObserver final : public gfx::VRManagerEventObserver {
  private:
   ~VREventObserver();
 
+  bool IsWebVR(uint32_t aDisplayID) const;
+
   RefPtr<nsGlobalWindowInner> mWindow;
   // For WebVR telemetry for tracking users who view content
   // in the 2D view.

diff --git a/gfx/vr/VRDisplayClient.cpp b/gfx/vr/VRDisplayClient.cpp
@@ -103,6 +103,10 @@ void VRDisplayClient::MakePresentationGenerationCurrent() {
   mLastPresentingGeneration = mDisplayInfo.mDisplayState.presentingGeneration;
 }
 
+gfx::VRAPIMode VRDisplayClient::GetXRAPIMode() const {
+  return mAPIMode;
+}
+
 void VRDisplayClient::SetXRAPIMode(gfx::VRAPIMode aMode) {
   mAPIMode = aMode;
 }

diff --git a/gfx/vr/VRDisplayClient.h b/gfx/vr/VRDisplayClient.h
@@ -57,6 +57,7 @@ class VRDisplayClient {
 
   bool IsPresenting();
   bool IsReferenceSpaceTypeSupported(dom::XRReferenceSpaceType aType) const;
+  gfx::VRAPIMode GetXRAPIMode() const;
   void SetXRAPIMode(gfx::VRAPIMode aMode);
 
  protected:

diff --git a/gfx/vr/ipc/VRManagerChild.cpp b/gfx/vr/ipc/VRManagerChild.cpp
@@ -586,6 +586,15 @@ void VRManagerChild::AddPromise(const uint32_t& aID, dom::Promise* aPromise) {
   mGamepadPromiseList.Put(aID, RefPtr{aPromise});
 }
 
+gfx::VRAPIMode VRManagerChild::GetVRAPIMode(uint32_t aDisplayID) const {
+  for (auto& display : mDisplays) {
+    if (display->GetDisplayInfo().GetDisplayID() == aDisplayID) {
+      return display->GetXRAPIMode();
+    }
+  }
+  return VRAPIMode::WebXR;
+}
+
 mozilla::ipc::IPCResult VRManagerChild::RecvReplyGamepadVibrateHaptic(
     const uint32_t& aPromiseID) {
   // VRManagerChild could be at other processes, but GamepadManager

diff --git a/gfx/vr/ipc/VRManagerChild.h b/gfx/vr/ipc/VRManagerChild.h
@@ -73,6 +73,7 @@ class VRManagerChild : public PVRManagerChild {
   bool EnumerateVRDisplays();
   void DetectRuntimes();
   void AddPromise(const uint32_t& aID, dom::Promise* aPromise);
+  gfx::VRAPIMode GetVRAPIMode(uint32_t aDisplayID) const;
 
   static void InitSameProcess();
   static void InitWithGPUProcess(Endpoint<PVRManagerChild>&& aEndpoint);