Bug 1340709 - Don't include ForwardTransaction time in the Rasterize tracing marker. r?mattwoodrow draft
authorMarkus Stange <mstange@themasta.com>
Fri, 17 Feb 2017 17:19:51 -0500
changeset 488794 9d244d24a77f27c47212d2e390cd1448c2178633
parent 488793 389eda0f6109619d1bca5347ae44a237bdfa2a7f
child 488795 c886783a51b157460e5b36d6f54753b9aed6509b
push id46643
push userbmo:mstange@themasta.com
push dateThu, 23 Feb 2017 19:31:53 +0000
reviewersmattwoodrow
bugs1340709
milestone54.0a1
Bug 1340709 - Don't include ForwardTransaction time in the Rasterize tracing marker. r?mattwoodrow MozReview-Commit-ID: ZKuARHuw68
gfx/layers/client/ClientLayerManager.cpp
gfx/layers/ipc/ShadowLayers.cpp
--- a/gfx/layers/client/ClientLayerManager.cpp
+++ b/gfx/layers/client/ClientLayerManager.cpp
@@ -309,33 +309,33 @@ ClientLayerManager::BeginTransaction()
 }
 
 bool
 ClientLayerManager::EndTransactionInternal(DrawPaintedLayerCallback aCallback,
                                            void* aCallbackData,
                                            EndTransactionFlags)
 {
   PaintTelemetry::AutoRecord record(PaintTelemetry::Metric::Rasterization);
+  GeckoProfilerTracingRAII tracer("Paint", "Rasterize");
 
 #ifdef WIN32
   if (aCallbackData) {
     // Content processes don't get OnPaint called. So update here whenever we
     // may do Thebes drawing.
     gfxDWriteFont::UpdateClearTypeUsage();
   }
 #endif
 
   PROFILER_LABEL("ClientLayerManager", "EndTransactionInternal",
     js::ProfileEntry::Category::GRAPHICS);
 
 #ifdef MOZ_LAYERS_HAVE_LOG
   MOZ_LAYERS_LOG(("  ----- (beginning paint)"));
   Log();
 #endif
-  profiler_tracing("Paint", "Rasterize", TRACING_INTERVAL_START);
 
   NS_ASSERTION(InConstruction(), "Should be in construction phase");
   mPhase = PHASE_DRAWING;
 
   ClientLayer* root = ClientLayer::ToClientLayer(GetRoot());
 
   mTransactionIncomplete = false;
 
--- a/gfx/layers/ipc/ShadowLayers.cpp
+++ b/gfx/layers/ipc/ShadowLayers.cpp
@@ -693,18 +693,16 @@ ShadowLayerForwarder::EndTransaction(con
                             aRegionToClear);
   info.targetConfig() = targetConfig;
 
   if (!GetTextureForwarder()->IsSameProcess()) {
     MOZ_LAYERS_LOG(("[LayersForwarder] syncing before send..."));
     PlatformSyncBeforeUpdate();
   }
 
-  profiler_tracing("Paint", "Rasterize", TRACING_INTERVAL_END);
-
   MOZ_LAYERS_LOG(("[LayersForwarder] sending transaction..."));
   RenderTraceScope rendertrace3("Forward Transaction", "000093");
   if (!mShadowManager->SendUpdate(info)) {
     MOZ_LAYERS_LOG(("[LayersForwarder] WARNING: sending transaction failed!"));
     return false;
   }
 
   *aSent = true;