summaryrefslogtreecommitdiffstats
path: root/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'gfx')
-rwxr-xr-xgfx/layers/composite/ContainerLayerComposite.cpp24
-rw-r--r--gfx/layers/ipc/CompositorBridgeParent.cpp9
-rw-r--r--gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp3
-rw-r--r--gfx/layers/ipc/ImageBridgeChild.cpp14
-rw-r--r--gfx/thebes/ContextStateTracker.cpp12
5 files changed, 2 insertions, 60 deletions
diff --git a/gfx/layers/composite/ContainerLayerComposite.cpp b/gfx/layers/composite/ContainerLayerComposite.cpp
index 35070cad6..f25503532 100755
--- a/gfx/layers/composite/ContainerLayerComposite.cpp
+++ b/gfx/layers/composite/ContainerLayerComposite.cpp
@@ -35,9 +35,6 @@
#include "TextRenderer.h" // for TextRenderer
#include <vector>
#include "GeckoProfiler.h" // for GeckoProfiler
-#ifdef MOZ_ENABLE_PROFILER_SPS
-#include "ProfilerMarkers.h" // for ProfilerMarkers
-#endif
#define CULLING_LOG(...)
// #define CULLING_LOG(...) printf_stderr("CULLING: " __VA_ARGS__)
@@ -86,26 +83,7 @@ static gfx::IntRect ContainerVisibleRect(ContainerT* aContainer)
static void PrintUniformityInfo(Layer* aLayer)
{
-#ifdef MOZ_ENABLE_PROFILER_SPS
- if (!profiler_is_active()) {
- return;
- }
-
- // Don't want to print a log for smaller layers
- if (aLayer->GetLocalVisibleRegion().GetBounds().width < 300 ||
- aLayer->GetLocalVisibleRegion().GetBounds().height < 300) {
- return;
- }
-
- Matrix4x4 transform = aLayer->AsLayerComposite()->GetShadowBaseTransform();
- if (!transform.Is2D()) {
- return;
- }
-
- Point translation = transform.As2D().GetTranslation();
- LayerTranslationPayload* payload = new LayerTranslationPayload(aLayer, translation);
- PROFILER_MARKER_PAYLOAD("LayerTranslation", payload);
-#endif
+ /*** STUB ***/
}
/* all of the per-layer prepared data we need to maintain */
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
};
}
diff --git a/gfx/thebes/ContextStateTracker.cpp b/gfx/thebes/ContextStateTracker.cpp
index e3659e5fc..a179abad9 100644
--- a/gfx/thebes/ContextStateTracker.cpp
+++ b/gfx/thebes/ContextStateTracker.cpp
@@ -5,9 +5,6 @@
#include "ContextStateTracker.h"
#include "GLContext.h"
-#ifdef MOZ_ENABLE_PROFILER_SPS
-#include "ProfilerMarkers.h"
-#endif
namespace mozilla {
@@ -110,15 +107,6 @@ ContextStateTrackerOGL::Flush(GLContext* aGL)
aGL->fDeleteQueries(1, &handle);
-#ifdef MOZ_ENABLE_PROFILER_SPS
- PROFILER_MARKER_PAYLOAD("gpu_timer_query", new GPUMarkerPayload(
- mCompletedSections[0].mCpuTimeStart,
- mCompletedSections[0].mCpuTimeEnd,
- 0,
- gpuTime
- ));
-#endif
-
mCompletedSections.RemoveElementAt(0);
}
}