diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-26 16:41:20 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-26 16:41:20 +0100 |
commit | 7504ca8ab4b0a145488f03c51a0f78ffd5682174 (patch) | |
tree | 29f30a39758d9a5dbb31dfd006f4d837b2f18e34 /gfx/layers/ipc | |
parent | 083c6b7b99107f5f107b3c86487d13d04184afac (diff) | |
download | uxp-7504ca8ab4b0a145488f03c51a0f78ffd5682174.tar.gz |
Remove VR hardware support.
This resolves #881
Diffstat (limited to 'gfx/layers/ipc')
-rw-r--r-- | gfx/layers/ipc/CompositorBridgeParent.cpp | 11 | ||||
-rw-r--r-- | gfx/layers/ipc/CompositorThread.cpp | 6 | ||||
-rw-r--r-- | gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp | 1 | ||||
-rw-r--r-- | gfx/layers/ipc/PTexture.ipdl | 3 |
4 files changed, 1 insertions, 20 deletions
diff --git a/gfx/layers/ipc/CompositorBridgeParent.cpp b/gfx/layers/ipc/CompositorBridgeParent.cpp index 00602fab58..87a19f5c01 100644 --- a/gfx/layers/ipc/CompositorBridgeParent.cpp +++ b/gfx/layers/ipc/CompositorBridgeParent.cpp @@ -30,7 +30,6 @@ #include "mozilla/gfx/2D.h" // for DrawTarget #include "mozilla/gfx/Point.h" // for IntSize #include "mozilla/gfx/Rect.h" // for IntSize -#include "VRManager.h" // for VRManager #include "mozilla/ipc/Transport.h" // for Transport #include "mozilla/layers/APZCTreeManager.h" // for APZCTreeManager #include "mozilla/layers/APZCTreeManagerParent.h" // for APZCTreeManagerParent @@ -475,7 +474,6 @@ CompositorVsyncScheduler::Composite(TimeStamp aVsyncTimestamp) } DispatchTouchEvents(aVsyncTimestamp); - DispatchVREvents(aVsyncTimestamp); if (mNeedsComposite || mAsapScheduling) { mNeedsComposite = 0; @@ -542,15 +540,6 @@ CompositorVsyncScheduler::DispatchTouchEvents(TimeStamp aVsyncTimestamp) } void -CompositorVsyncScheduler::DispatchVREvents(TimeStamp aVsyncTimestamp) -{ - MOZ_ASSERT(CompositorThreadHolder::IsInCompositorThread()); - - VRManager* vm = VRManager::Get(); - vm->NotifyVsync(aVsyncTimestamp); -} - -void CompositorVsyncScheduler::ScheduleTask(already_AddRefed<CancelableRunnable> aTask, int aTime) { diff --git a/gfx/layers/ipc/CompositorThread.cpp b/gfx/layers/ipc/CompositorThread.cpp index 789a5d5d3f..3f75832b61 100644 --- a/gfx/layers/ipc/CompositorThread.cpp +++ b/gfx/layers/ipc/CompositorThread.cpp @@ -12,11 +12,6 @@ namespace mozilla { -namespace gfx { -// See VRManagerChild.cpp -void ReleaseVRManagerParentSingleton(); -} // namespace gfx - namespace layers { static StaticRefPtr<CompositorThreadHolder> sCompositorThreadHolder; @@ -130,7 +125,6 @@ CompositorThreadHolder::Shutdown() MOZ_ASSERT(sCompositorThreadHolder, "The compositor thread has already been shut down!"); ReleaseImageBridgeParentSingleton(); - gfx::ReleaseVRManagerParentSingleton(); MediaSystemResourceService::Shutdown(); sCompositorThreadHolder = nullptr; diff --git a/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp b/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp index c3ea33149b..8bb5cf2d53 100644 --- a/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp +++ b/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp @@ -30,7 +30,6 @@ #include "mozilla/gfx/2D.h" // for DrawTarget #include "mozilla/gfx/Point.h" // for IntSize #include "mozilla/gfx/Rect.h" // for IntSize -#include "VRManager.h" // for VRManager #include "mozilla/ipc/Transport.h" // for Transport #include "mozilla/layers/APZCTreeManager.h" // for APZCTreeManager #include "mozilla/layers/APZCTreeManagerParent.h" // for APZCTreeManagerParent diff --git a/gfx/layers/ipc/PTexture.ipdl b/gfx/layers/ipc/PTexture.ipdl index bccff8627a..7c1979bf02 100644 --- a/gfx/layers/ipc/PTexture.ipdl +++ b/gfx/layers/ipc/PTexture.ipdl @@ -9,7 +9,6 @@ include LayersSurfaces; include protocol PLayerTransaction; include protocol PCompositorBridge; include protocol PImageBridge; -include protocol PVRManager; include protocol PVideoBridge; include "mozilla/GfxMessageUtils.h"; @@ -23,7 +22,7 @@ namespace layers { * PTexture is the IPDL glue between a TextureClient and a TextureHost. */ sync protocol PTexture { - manager PImageBridge or PCompositorBridge or PVRManager or PVideoBridge; + manager PImageBridge or PCompositorBridge or PVideoBridge; child: async __delete__(); |