summaryrefslogtreecommitdiffstats
path: root/gfx/layers/ipc
diff options
context:
space:
mode:
Diffstat (limited to 'gfx/layers/ipc')
-rw-r--r--gfx/layers/ipc/CompositorBridgeParent.cpp9
-rw-r--r--gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp3
-rw-r--r--gfx/layers/ipc/ImageBridgeChild.cpp14
3 files changed, 1 insertions, 25 deletions
diff --git a/gfx/layers/ipc/CompositorBridgeParent.cpp b/gfx/layers/ipc/CompositorBridgeParent.cpp
index 6728e8841..bf510cd46 100644
--- a/gfx/layers/ipc/CompositorBridgeParent.cpp
+++ b/gfx/layers/ipc/CompositorBridgeParent.cpp
@@ -74,9 +74,6 @@
#include "mozilla/HalTypes.h"
#include "mozilla/StaticPtr.h"
#include "mozilla/Telemetry.h"
-#ifdef MOZ_ENABLE_PROFILER_SPS
-#include "ProfilerMarkers.h"
-#endif
#include "mozilla/VsyncDispatcher.h"
#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK)
#include "VsyncSource.h"
@@ -1923,11 +1920,7 @@ CompositorBridgeParent::GetAPZCTreeManager(uint64_t aLayersId)
static void
InsertVsyncProfilerMarker(TimeStamp aVsyncTimestamp)
{
-#ifdef MOZ_ENABLE_PROFILER_SPS
- MOZ_ASSERT(CompositorThreadHolder::IsInCompositorThread());
- VsyncPayload* payload = new VsyncPayload(aVsyncTimestamp);
- PROFILER_MARKER_PAYLOAD("VsyncTimestamp", payload);
-#endif
+ /*** STUB ***/
}
/*static */ void
diff --git a/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp b/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp
index 1bb6d046b..c3ea33149 100644
--- a/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp
+++ b/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp
@@ -73,9 +73,6 @@
#include "mozilla/HalTypes.h"
#include "mozilla/StaticPtr.h"
#include "mozilla/Telemetry.h"
-#ifdef MOZ_ENABLE_PROFILER_SPS
-#include "ProfilerMarkers.h"
-#endif
#include "mozilla/VsyncDispatcher.h"
#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK)
#include "VsyncSource.h"
diff --git a/gfx/layers/ipc/ImageBridgeChild.cpp b/gfx/layers/ipc/ImageBridgeChild.cpp
index 0466a1031..efd7a0162 100644
--- a/gfx/layers/ipc/ImageBridgeChild.cpp
+++ b/gfx/layers/ipc/ImageBridgeChild.cpp
@@ -73,24 +73,10 @@ protected:
MOZ_IS_CLASS_INIT
void Init() {
-#ifdef MOZ_ENABLE_PROFILER_SPS
- mPseudoStackHack = mozilla_get_pseudo_stack();
-#endif
}
void CleanUp() {
-#ifdef MOZ_ENABLE_PROFILER_SPS
- mPseudoStackHack = nullptr;
-#endif
}
-
-private:
-
-#ifdef MOZ_ENABLE_PROFILER_SPS
- // This is needed to avoid a spurious leak report. There's no other
- // use for it. See bug 1239504 and bug 1215265.
- MOZ_INIT_OUTSIDE_CTOR PseudoStack* mPseudoStackHack;
-#endif
};
}