Bug 1599609 - Change printf to a profiler text marker. r=sotaro

Differential Revision: https://phabricator.services.mozilla.com/D54856

--HG--
extra : moz-landing-system : lando

gfx/webrender_bindings/RenderCompositorOGL.cpp

@@ -12,6 +12,10 @@
 #include "mozilla/webrender/RenderThread.h"
 #include "mozilla/widget/CompositorWidget.h"
 
+#ifdef MOZ_GECKO_PROFILER
+#  include "ProfilerMarkerPayload.h"
+#endif
+
 namespace mozilla {
 namespace wr {
 
@@ -163,19 +167,27 @@ void RenderCompositorOGL::CompositorBeginFrame() {
   mAddedLayers.Clear();
   mAddedPixelCount = 0;
   mAddedClippedPixelCount = 0;
+  mBeginFrameTimeStamp = TimeStamp::NowUnfuzzed();
 }
 
 void RenderCompositorOGL::CompositorEndFrame() {
-  auto bufferSize = GetBufferSize();
-  uint64_t windowPixelCount = uint64_t(bufferSize.width) * bufferSize.height;
-  printf(
-      "CompositorEndFrame with %d layers (%d used / %d unused), in-use memory: "
-      "%d%%, overdraw: %d%%, painting: %d%%\n",
-      int(mNativeLayers.size()), int(mAddedLayers.Length()),
-      int(mNativeLayers.size() - mAddedLayers.Length()),
-      int(mAddedPixelCount * 100 / windowPixelCount),
-      int(mAddedClippedPixelCount * 100 / windowPixelCount),
-      int(mDrawnPixelCount * 100 / windowPixelCount));
+#ifdef MOZ_GECKO_PROFILER
+  if (profiler_thread_is_being_profiled()) {
+    auto bufferSize = GetBufferSize();
+    uint64_t windowPixelCount = uint64_t(bufferSize.width) * bufferSize.height;
+    profiler_add_text_marker(
+        "WR OS Compositor frame",
+        nsPrintfCString("%d%% painting, %d%% overdraw, %d%% memory, %d used "
+                        "layers + %d unused layers",
+                        int(mDrawnPixelCount * 100 / windowPixelCount),
+                        int(mAddedClippedPixelCount * 100 / windowPixelCount),
+                        int(mAddedPixelCount * 100 / windowPixelCount),
+                        int(mAddedLayers.Length()),
+                        int(mNativeLayers.size() - mAddedLayers.Length())),
+        JS::ProfilingCategoryPair::GRAPHICS, mBeginFrameTimeStamp,
+        TimeStamp::NowUnfuzzed());
+  }
+#endif
   mDrawnPixelCount = 0;
 
   mNativeLayerRoot->SetLayers(mAddedLayers);

gfx/webrender_bindings/RenderCompositorOGL.h

@@ -8,6 +8,7 @@
 #define MOZILLA_GFX_RENDERCOMPOSITOR_OGL_H
 
 #include "mozilla/webrender/RenderCompositor.h"
+#include "mozilla/TimeStamp.h"
 
 namespace mozilla {
 
@@ -71,6 +72,7 @@ class RenderCompositorOGL : public RenderCompositor {
   uint64_t mDrawnPixelCount = 0;
   gfx::IntRect mVisibleBounds;
   std::unordered_map<uint64_t, RefPtr<layers::NativeLayer>> mNativeLayers;
+  TimeStamp mBeginFrameTimeStamp;
 
   // Used to apply back-pressure in WaitForGPU().
   GLsync mPreviousFrameDoneSync;