Added some instrumentation to the software compositor.

cc/software_renderer.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/software_renderer.h"
 
+#include "base/debug/trace_event.h"
 #include "cc/debug_border_draw_quad.h"
 #include "cc/render_pass_draw_quad.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/texture_draw_quad.h"
 #include "cc/tile_draw_quad.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/effects/SkLayerRasterizer.h"
@@ skipping 67 matching lines @@
     return m_capabilities;
 }
 
 void SoftwareRenderer::viewportChanged()
 {
     m_outputDevice->didChangeViewportSize(WebSize(viewportSize().width(), viewportSize().height()));
 }
 
 void SoftwareRenderer::beginDrawingFrame(DrawingFrame& frame)
 {
+    TRACE_EVENT0("cc", "SoftwareRenderer::beginDrawingFrame");
     m_skRootCanvas = make_scoped_ptr(new SkCanvas(m_outputDevice->lock(true)->getSkBitmap()));
 }
 
 void SoftwareRenderer::finishDrawingFrame(DrawingFrame& frame)
 {
+    TRACE_EVENT0("cc", "SoftwareRenderer::finishDrawingFrame");
     m_currentFramebufferLock.reset();
     m_skCurrentCanvas = 0;
     m_skRootCanvas.reset();
     m_outputDevice->unlock();
 }
 
 bool SoftwareRenderer::flippedFramebuffer() const
 {
     return false;
 }
@@ skipping 47 matching lines @@
     case ResourceProvider::Bitmap:
         return true;
     }
 
     LOG(FATAL) << "Invalid resource type.";
     return false;
 }
 
 void SoftwareRenderer::drawQuad(DrawingFrame& frame, const DrawQuad* quad)
 {
+    TRACE_EVENT0("cc", "SoftwareRenderer::drawQuad");
     WebTransformationMatrix quadRectMatrix;
     quadRectTransform(&quadRectMatrix, quad->quadTransform(), quad->quadRect());
     WebTransformationMatrix contentsDeviceTransform = (frame.windowMatrix * frame.projectionMatrix * quadRectMatrix).to2dTransform();
     SkMatrix skDeviceMatrix;
     toSkMatrix(&skDeviceMatrix, contentsDeviceTransform);
     m_skCurrentCanvas->setMatrix(skDeviceMatrix);
 
     m_skCurrentPaint.reset();
     if (!isScaleAndTranslate(skDeviceMatrix)) {
       m_skCurrentPaint.setAntiAlias(true);
@@ skipping 153 matching lines @@
 
 bool SoftwareRenderer::swapBuffers()
 {
     if (m_client->hasImplThread())
         m_client->onSwapBuffersComplete();
     return true;
 }
 
 void SoftwareRenderer::getFramebufferPixels(void *pixels, const gfx::Rect& rect)
 {
+    TRACE_EVENT0("cc", "SoftwareRenderer::getFramebufferPixels");
     SkBitmap fullBitmap = m_outputDevice->lock(false)->getSkBitmap();
     SkBitmap subsetBitmap;
     SkIRect invertRect = SkIRect::MakeXYWH(rect.x(), viewportSize().height() - rect.bottom(), rect.width(), rect.height());
     fullBitmap.extractSubset(&subsetBitmap, invertRect);
     subsetBitmap.copyPixelsTo(pixels, rect.width() * rect.height() * 4, rect.width() * 4);
     m_outputDevice->unlock();
 }
 
 void SoftwareRenderer::setVisible(bool visible)
 {
     if (m_visible == visible)
         return;
     m_visible = visible;
 }
 
 }  // namespace cc