Backed out changeset c1cc52b986f8 (bug 1049258) for breaking non-unified windows builds

gfx/layers/composite/ContainerLayerComposite.cpp

@@ -35,8 +35,6 @@
 #include "nsTArray.h"                   // for nsAutoTArray
 #include "TextRenderer.h"               // for TextRenderer
 #include <vector>
-#include "GeckoProfiler.h"              // for GeckoProfiler
-#include "ProfilerMarkers.h"            // for ProfilerMarkers
 
 #define CULLING_LOG(...)
 // #define CULLING_LOG(...) printf_stderr("CULLING: " __VA_ARGS__)
@@ -117,9 +115,7 @@ static void DrawLayerInfo(const RenderTargetIntRect& aClipRect,
 
 static void PrintUniformityInfo(Layer* aLayer)
 {
-  if (!profiler_is_active()) {
-    return;
-  }
+  static TimeStamp t0 = TimeStamp::Now();
 
   // Don't want to print a log for smaller layers
   if (aLayer->GetEffectiveVisibleRegion().GetBounds().width < 300 ||
@@ -131,10 +127,10 @@ static void PrintUniformityInfo(Layer* aLayer)
   if (!transform.Is2D()) {
     return;
   }
-
   Point translation = transform.As2D().GetTranslation();
-  LayerTranslationPayload* payload = new LayerTranslationPayload(aLayer, translation);
-  PROFILER_MARKER_PAYLOAD("LayerTranslation", payload);
+  printf_stderr("UniformityInfo Layer_Move %llu %p %s\n",
+      (unsigned long long)(TimeStamp::Now() - t0).ToMilliseconds(), aLayer,
+      ToString(translation).c_str());
 }
 
 /* all of the per-layer prepared data we need to maintain */