Disable vr

Eclipse-Community · Oct 6, 2023 · a6cc149 · a6cc149
1 parent 244b268
commit a6cc149
Show file tree

Hide file tree

Showing 56 changed files with 376 additions and 150 deletions.
diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
@@ -10199,12 +10199,14 @@ bool Document::CanSavePresentation(nsIRequest* aNewRequest,
       ret = false;
     }
 #endif
+#ifdef MOZ_VR
     if (globalWindow->HasUsedVR()) {
       MOZ_LOG(gPageCacheLog, mozilla::LogLevel::Verbose,
               ("Save of %s blocked due to having used VR", uri.get()));
       aBFCacheCombo |= BFCacheStatus::HAS_USED_VR;
       ret = false;
     }
+#endif
   }
 
   return ret;

diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp
@@ -138,7 +138,9 @@
 #include "mozilla/dom/KeyframeEffect.h"
 #include "mozilla/dom/MouseEventBinding.h"
 #include "mozilla/dom/WindowBinding.h"
-#include "mozilla/dom/VRDisplay.h"
+#ifdef MOZ_VR
+#  include "mozilla/dom/VRDisplay.h"
+#endif
 #include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/Preferences.h"
 #include "nsComputedDOMStyle.h"

diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
@@ -45,9 +45,11 @@
 #include "mozilla/dom/StorageManager.h"
 #include "mozilla/dom/TCPSocket.h"
 #include "mozilla/dom/URLSearchParams.h"
-#include "mozilla/dom/VRDisplay.h"
-#include "mozilla/dom/VRDisplayEvent.h"
-#include "mozilla/dom/VRServiceTest.h"
+#ifdef MOZ_VR
+#  include "mozilla/dom/VRDisplay.h"
+#  include "mozilla/dom/VRDisplayEvent.h"
+#  include "mozilla/dom/VRServiceTest.h"
+#endif
 #include "mozilla/dom/workerinternals/RuntimeService.h"
 #include "mozilla/Hal.h"
 #include "mozilla/ClearOnShutdown.h"
@@ -159,8 +161,10 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Navigator)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMediaKeySystemAccessManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPresentation)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGamepadServiceTest)
+#ifdef MOZ_VR
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mVRGetDisplaysPromises)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mVRServiceTest)
+#endif
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(Navigator)
@@ -216,12 +220,14 @@ void Navigator::Invalidate() {
     mGamepadServiceTest = nullptr;
   }
 
+#ifdef MOZ_VR
   mVRGetDisplaysPromises.Clear();
 
   if (mVRServiceTest) {
     mVRServiceTest->Shutdown();
     mVRServiceTest = nullptr;
   }
+#endif
 
   mMediaCapabilities = nullptr;
 
@@ -1325,6 +1331,7 @@ GamepadServiceTest* Navigator::RequestGamepadServiceTest() {
   return mGamepadServiceTest;
 }
 
+#ifdef MOZ_VR
 already_AddRefed<Promise> Navigator::GetVRDisplays(ErrorResult& aRv) {
   if (!mWindow || !mWindow->GetDocShell() || !mWindow->GetExtantDoc()) {
     aRv.Throw(NS_ERROR_UNEXPECTED);
@@ -1431,6 +1438,7 @@ void Navigator::RequestVRPresentation(VRDisplay& aDisplay) {
   win->DispatchVRDisplayActivate(aDisplay.DisplayId(),
                                  VRDisplayEventReason::Requested);
 }
+#endif  // MOZ_VR
 
 already_AddRefed<Promise> Navigator::RequestMIDIAccess(
     const MIDIOptions& aOptions, ErrorResult& aRv) {

diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h
@@ -75,8 +75,10 @@ class Connection;
 
 class Presentation;
 class LegacyMozTCPSocket;
+#ifdef MOZ_VR
 class VRDisplay;
 class VRServiceTest;
+#endif
 class StorageManager;
 class MediaCapabilities;
 
@@ -172,12 +174,14 @@ class Navigator final : public nsISupports, public nsWrapperCache {
 
   void GetGamepads(nsTArray<RefPtr<Gamepad>>& aGamepads, ErrorResult& aRv);
   GamepadServiceTest* RequestGamepadServiceTest();
+#ifdef MOZ_VR
   already_AddRefed<Promise> GetVRDisplays(ErrorResult& aRv);
   void GetActiveVRDisplays(nsTArray<RefPtr<VRDisplay>>& aDisplays) const;
   VRServiceTest* RequestVRServiceTest();
   bool IsWebVRContentDetected() const;
   bool IsWebVRContentPresenting() const;
   void RequestVRPresentation(VRDisplay& aDisplay);
+#endif
   already_AddRefed<Promise> RequestMIDIAccess(const MIDIOptions& aOptions,
                                               ErrorResult& aRv);
 
@@ -238,9 +242,11 @@ class Navigator final : public nsISupports, public nsWrapperCache {
  private:
   RefPtr<MediaKeySystemAccessManager> mMediaKeySystemAccessManager;
 
+#ifdef MOZ_VR
  public:
   void NotifyVRDisplaysUpdated();
   void NotifyActiveVRDisplaysChanged();
+#endif
 
  private:
   virtual ~Navigator();
@@ -270,8 +276,10 @@ class Navigator final : public nsISupports, public nsWrapperCache {
   nsCOMPtr<nsPIDOMWindowInner> mWindow;
   RefPtr<Presentation> mPresentation;
   RefPtr<GamepadServiceTest> mGamepadServiceTest;
+#ifdef MOZ_VR
   nsTArray<RefPtr<Promise>> mVRGetDisplaysPromises;
   RefPtr<VRServiceTest> mVRServiceTest;
+#endif
   nsTArray<uint32_t> mRequestedVibrationPattern;
   RefPtr<StorageManager> mStorageManager;
   RefPtr<dom::MediaCapabilities> mMediaCapabilities;

diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp
@@ -183,11 +183,13 @@
 #include "mozilla/dom/Gamepad.h"
 #include "mozilla/dom/GamepadManager.h"
 
-#include "gfxVR.h"
-#include "mozilla/dom/VRDisplay.h"
-#include "mozilla/dom/VRDisplayEvent.h"
-#include "mozilla/dom/VRDisplayEventBinding.h"
-#include "mozilla/dom/VREventObserver.h"
+#ifdef MOZ_VR
+#  include "gfxVR.h"
+#  include "mozilla/dom/VRDisplay.h"
+#  include "mozilla/dom/VRDisplayEvent.h"
+#  include "mozilla/dom/VRDisplayEventBinding.h"
+#  include "mozilla/dom/VREventObserver.h"
+#endif
 
 #include "nsRefreshDriver.h"
 #include "Layers.h"
@@ -833,9 +835,11 @@ nsGlobalWindowInner::nsGlobalWindowInner(nsGlobalWindowOuter* aOuterWindow)
       mFocusByKeyOccurred(false),
       mDidFireDocElemInserted(false),
       mHasGamepad(false),
-      mHasVREvents(false),
       mHintedWasLoading(false),
+#ifdef MOZ_VR
+      mHasVREvents(false),
       mHasVRDisplayActivateEvents(false),
+#endif
       mHasSeenGamepadInput(false),
       mSuspendDepth(0),
       mFreezeDepth(0),
@@ -1147,10 +1151,12 @@ void nsGlobalWindowInner::FreeInnerObjects() {
   DisableGamepadUpdates();
   mHasGamepad = false;
   mGamepads.Clear();
+#ifdef MOZ_VR
   DisableVRUpdates();
   mHasVREvents = false;
   mHasVRDisplayActivateEvents = false;
   mVRDisplays.Clear();
+#endif
 
   // This breaks a cycle between the window and the ClientSource object.
   mClientSource.reset();
@@ -1345,7 +1351,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsGlobalWindowInner)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGamepads)
 
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCacheStorage)
+#ifdef MOZ_VR
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mVRDisplays)
+#endif
 
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDebuggerNotificationManager)
 
@@ -1447,7 +1455,9 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsGlobalWindowInner)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mGamepads)
 
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mCacheStorage)
+#ifdef MOZ_VR
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mVRDisplays)
+#endif
 
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mDebuggerNotificationManager)
 
@@ -1925,6 +1935,7 @@ nsresult nsGlobalWindowInner::PostHandleEvent(EventChainPostVisitor& aVisitor) {
     // will receive a vrdisplayactive event to indicate that it should
     // immediately begin vr presentation. This should occur when navigating
     // forwards, navigating backwards, and on page reload.
+#ifdef MOZ_VR
     for (const auto& display : mVRDisplays) {
       if (display->IsPresenting()) {
         display->StartVRNavigation();
@@ -1942,6 +1953,7 @@ nsresult nsGlobalWindowInner::PostHandleEvent(EventChainPostVisitor& aVisitor) {
         break;
       }
     }
+#endif
     // Execute bindingdetached handlers before we tear ourselves
     // down.
     if (mDoc) {
@@ -1984,6 +1996,7 @@ nsresult nsGlobalWindowInner::PostHandleEvent(EventChainPostVisitor& aVisitor) {
       }
     }
 
+#ifdef MOZ_VR
     if (mVREventObserver) {
       mVREventObserver->NotifyAfterLoad();
     }
@@ -1997,6 +2010,7 @@ nsresult nsGlobalWindowInner::PostHandleEvent(EventChainPostVisitor& aVisitor) {
       DispatchVRDisplayActivate(autoActivateVRDisplayID,
                                 VRDisplayEventReason::Navigation);
     }
+#endif
   }
 
   return NS_OK;
@@ -4013,6 +4027,7 @@ void nsGlobalWindowInner::DisableGamepadUpdates() {
   }
 }
 
+#ifdef MOZ_VR
 void nsGlobalWindowInner::EnableVRUpdates() {
   if (mHasVREvents && !mVREventObserver) {
     mVREventObserver = new VREventObserver(this);
@@ -4043,6 +4058,7 @@ void nsGlobalWindowInner::StopVRActivity() {
     mVREventObserver->StopActivity();
   }
 }
+#endif
 
 #ifndef XP_WIN  // This guard should match the guard at the callsite.
 static bool ShouldShowFocusRingIfFocusedByMouse(nsIContent* aNode) {
@@ -5127,7 +5143,9 @@ void nsGlobalWindowInner::Suspend() {
       ac->RemoveWindowListener(mEnabledSensors[i], this);
   }
   DisableGamepadUpdates();
+#ifdef MOZ_VR
   DisableVRUpdates();
+#endif
 
   SuspendWorkersForWindow(this);
 
@@ -5180,7 +5198,9 @@ void nsGlobalWindowInner::Resume() {
       ac->AddWindowListener(mEnabledSensors[i], this);
   }
   EnableGamepadUpdates();
+#ifdef MOZ_VR
   EnableVRUpdates();
+#endif
 
   // Resume all of the AudioContexts for this window
   for (uint32_t i = 0; i < mAudioContexts.Length(); ++i) {
@@ -5979,6 +5999,7 @@ void nsGlobalWindowInner::SetHasGamepadEventListener(
 }
 
 void nsGlobalWindowInner::EventListenerAdded(nsAtom* aType) {
+#ifdef MOZ_VR
   if (aType == nsGkAtoms::onvrdisplayactivate ||
       aType == nsGkAtoms::onvrdisplayconnect ||
       aType == nsGkAtoms::onvrdisplaydeactivate ||
@@ -5990,6 +6011,7 @@ void nsGlobalWindowInner::EventListenerAdded(nsAtom* aType) {
   if (aType == nsGkAtoms::onvrdisplayactivate) {
     mHasVRDisplayActivateEvents = true;
   }
+#endif
 
   if (aType == nsGkAtoms::onbeforeunload && mBrowserChild &&
       (!mDoc || !(mDoc->GetSandboxFlags() & SANDBOXED_MODALS))) {
@@ -6035,6 +6057,7 @@ void nsGlobalWindowInner::EventListenerRemoved(nsAtom* aType) {
   }
 }
 
+#ifdef MOZ_VR
 void nsGlobalWindowInner::NotifyVREventListenerAdded() {
   mHasVREvents = true;
   EnableVRUpdates();
@@ -6060,6 +6083,7 @@ bool nsGlobalWindowInner::IsVRContentPresenting() const {
   }
   return false;
 }
+#endif
 
 void nsGlobalWindowInner::AddSizeOfIncludingThis(
     nsWindowSizes& aWindowSizes) const {
@@ -6183,6 +6207,7 @@ void nsGlobalWindowInner::StopGamepadHaptics() {
   }
 }
 
+#ifdef MOZ_VR
 bool nsGlobalWindowInner::UpdateVRDisplays(
     nsTArray<RefPtr<mozilla::dom::VRDisplay>>& aDevices) {
   VRDisplay::UpdateVRDisplays(mVRDisplays, this);
@@ -6352,6 +6377,7 @@ void nsGlobalWindowInner::DispatchVRDisplayPresentChange(uint32_t aDisplayID) {
     }
   }
 }
+#endif  // MOZ_VR
 
 enum WindowState {
   // These constants need to match the constants in Window.webidl

diff --git a/dom/base/nsGlobalWindowInner.h b/dom/base/nsGlobalWindowInner.h
@@ -127,9 +127,11 @@ class TabGroup;
 class Timeout;
 class U2F;
 class VisualViewport;
+#ifdef MOZ_VR
 class VRDisplay;
 enum class VRDisplayEventReason : uint8_t;
 class VREventObserver;
+#endif
 class WakeLock;
 #if defined(MOZ_WIDGET_ANDROID)
 class WindowOrientationObserver;
@@ -369,10 +371,12 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget,
 
   // Inner windows only.
   virtual void SetHasGamepadEventListener(bool aHasGamepad = true) override;
+#ifdef MOZ_VR
   void NotifyVREventListenerAdded();
   bool HasUsedVR() const;
   bool IsVRContentDetected() const;
   bool IsVRContentPresenting() const;
+#endif
 
   using EventTarget::EventListenerAdded;
   virtual void EventListenerAdded(nsAtom* aType) override;
@@ -513,6 +517,7 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget,
 
   // Inner windows only.
   // Enable/disable updates for VR
+#ifdef MOZ_VR
   void EnableVRUpdates();
   void DisableVRUpdates();
   // Reset telemetry data when switching windows.
@@ -538,6 +543,7 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget,
   void DispatchVRDisplayConnect(uint32_t aDisplayID);
   void DispatchVRDisplayDisconnect(uint32_t aDisplayID);
   void DispatchVRDisplayPresentChange(uint32_t aDisplayID);
+#endif
 
 #define EVENT(name_, id_, type_, struct_)                              \
   mozilla::dom::EventHandlerNonNull* GetOn##name_() {                  \
@@ -1299,13 +1305,17 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget,
   bool mHasGamepad : 1;
 
   // Indicates whether this window wants VR events
+#ifdef MOZ_VR
   bool mHasVREvents : 1;
+#endif
 
   // Whether we told the JS engine that we were in pageload.
   bool mHintedWasLoading : 1;
 
   // Indicates whether this window wants VRDisplayActivate events
+#ifdef MOZ_VR
   bool mHasVRDisplayActivateEvents : 1;
+#endif
   nsCheapSet<nsUint32HashKey> mGamepadIndexSet;
   nsRefPtrHashtable<nsUint32HashKey, mozilla::dom::Gamepad> mGamepads;
   bool mHasSeenGamepadInput;
@@ -1422,9 +1432,11 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget,
   uint32_t mCanSkipCCGeneration;
 
   // The VR Displays for this window
+#ifdef MOZ_VR
   nsTArray<RefPtr<mozilla::dom::VRDisplay>> mVRDisplays;
 
   RefPtr<mozilla::dom::VREventObserver> mVREventObserver;
+#endif
 
   int64_t mBeforeUnloadListenerCount;