summaryrefslogtreecommitdiffstats
path: root/gfx/layers/ipc/CompositorBridgeParent.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-12-18 11:39:00 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-12-18 11:39:00 +0100
commit76fe52eb81db323ceaa8396de39b76efbce1c25e (patch)
tree061c409281374d893f9730f89e6a4ef32d0b53f9 /gfx/layers/ipc/CompositorBridgeParent.cpp
parent63635e38ff9341c02fae7f4557d230ec710947b6 (diff)
parent680c3eadb6aaec1f3653636db081a519e0f62ef5 (diff)
downloadUXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar
UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar.gz
UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar.lz
UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.tar.xz
UXP-76fe52eb81db323ceaa8396de39b76efbce1c25e.zip
Merge branch 'master' into Basilisk-releasev2018.12.18
Diffstat (limited to 'gfx/layers/ipc/CompositorBridgeParent.cpp')
-rw-r--r--gfx/layers/ipc/CompositorBridgeParent.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/gfx/layers/ipc/CompositorBridgeParent.cpp b/gfx/layers/ipc/CompositorBridgeParent.cpp
index 00602fab5..87a19f5c0 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)
{