diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-31 09:45:25 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-31 09:45:25 +0200 |
commit | 2d4ff8df91414b42974c72b2870f5c6e9ad397a8 (patch) | |
tree | 15b23dc6494a147e723cfdb3765be1568cf6c113 /widget/VsyncDispatcher.cpp | |
parent | f4b8be889cb7ee31a62af5660f36aaa192599009 (diff) | |
parent | 14eb8dc7bee8670e39d1199591d335579601f2ad (diff) | |
download | UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.gz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.lz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.xz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.zip |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'widget/VsyncDispatcher.cpp')
-rw-r--r-- | widget/VsyncDispatcher.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/widget/VsyncDispatcher.cpp b/widget/VsyncDispatcher.cpp index 5979466e8..7bb32b89b 100644 --- a/widget/VsyncDispatcher.cpp +++ b/widget/VsyncDispatcher.cpp @@ -11,11 +11,6 @@ #include "mozilla/layers/CompositorBridgeParent.h" #include "mozilla/layers/CompositorThread.h" -#ifdef MOZ_ENABLE_PROFILER_SPS -#include "GeckoProfiler.h" -#include "ProfilerMarkers.h" -#endif - namespace mozilla { CompositorVsyncDispatcher::CompositorVsyncDispatcher() @@ -35,11 +30,6 @@ CompositorVsyncDispatcher::~CompositorVsyncDispatcher() void CompositorVsyncDispatcher::NotifyVsync(TimeStamp aVsyncTimestamp) { - // In vsync thread -#ifdef MOZ_ENABLE_PROFILER_SPS - layers::CompositorBridgeParent::PostInsertVsyncProfilerMarker(aVsyncTimestamp); -#endif - MutexAutoLock lock(mCompositorObserverLock); if (mCompositorVsyncObserver) { mCompositorVsyncObserver->NotifyVsync(aVsyncTimestamp); |