More render trace. r=debug_only

--HG--
extra : rebase_source : b20e2e6e7469433ee6148c8fa0a7dd0c0ca21009

gfx/layers/basic/BasicLayers.cpp

@@ -3401,6 +3401,7 @@ BasicShadowLayerManager::EndEmptyTransaction()
 void
 BasicShadowLayerManager::ForwardTransaction()
 {
+  RenderTraceScope rendertrace("Foward Transaction", "000090");
 #ifdef DEBUG
   mPhase = PHASE_FORWARD;
 #endif

gfx/layers/ipc/ShadowLayers.cpp

@@ -50,6 +50,7 @@
 #include "ShadowLayers.h"
 #include "ShadowLayerChild.h"
 #include "gfxipc/ShadowLayerUtils.h"
+#include "RenderTrace.h"
 
 using namespace mozilla::ipc;
 
@@ -256,6 +257,7 @@ ShadowLayerForwarder::PaintedCanvas(ShadowableLayer* aCanvas,
 bool
 ShadowLayerForwarder::EndTransaction(InfallibleTArray<EditReply>* aReplies)
 {
+  RenderTraceScope rendertrace("Foward Transaction", "000091");
   NS_ABORT_IF_FALSE(HasShadowManager(), "no manager to forward to");
   NS_ABORT_IF_FALSE(!mTxn->Finished(), "forgot BeginTransaction?");
 
@@ -278,6 +280,7 @@ ShadowLayerForwarder::EndTransaction(InfallibleTArray<EditReply>* aReplies)
   // before we add paint ops.  This allows layers to record the
   // attribute changes before new pixels arrive, which can be useful
   // for setting up back/front buffers.
+  RenderTraceScope rendertrace2("Foward Transaction", "000092");
   for (ShadowableLayerSet::const_iterator it = mTxn->mMutants.begin();
        it != mTxn->mMutants.end(); ++it) {
     ShadowableLayer* shadow = *it;
@@ -321,6 +324,7 @@ ShadowLayerForwarder::EndTransaction(InfallibleTArray<EditReply>* aReplies)
   PlatformSyncBeforeUpdate();
 
   MOZ_LAYERS_LOG(("[LayersForwarder] sending transaction..."));
+  RenderTraceScope rendertrace3("Foward Transaction", "000093");
   if (!mShadowManager->SendUpdate(cset, aReplies)) {
     MOZ_LAYERS_LOG(("[LayersForwarder] WARNING: sending transaction failed!"));
     return false;

widget/android/nsWindow.cpp

@@ -1218,9 +1218,9 @@ nsWindow::OnDraw(AndroidGeckoEvent *ae)
     layers::renderTraceEventEnd("Widget draw to", "434646");
 
     __android_log_print(ANDROID_LOG_ERROR, "Gecko", "### Calling EndDrawing()!");
-    layers::renderTraceEventStart("Widget draw to", "434747");
+    layers::renderTraceEventStart("Widget end draw", "434747");
     client.EndDrawing();
-    layers::renderTraceEventEnd("Widget draw to", "434747");
+    layers::renderTraceEventEnd("Widget end draw", "434747");
     return;
 #endif