summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cc/direct_renderer.cc3
-rw-r--r--cc/software_renderer.cc5
-rw-r--r--content/renderer/gpu/compositor_software_output_device_gl_adapter.cc2
3 files changed, 10 insertions, 0 deletions
diff --git a/cc/direct_renderer.cc b/cc/direct_renderer.cc
index d4e0099..13bea5f 100644
--- a/cc/direct_renderer.cc
+++ b/cc/direct_renderer.cc
@@ -6,6 +6,7 @@
#include <vector>
+#include "base/debug/trace_event.h"
#include "cc/math_util.h"
#include "ui/gfx/rect_conversions.h"
#include <public/WebTransformationMatrix.h>
@@ -152,6 +153,7 @@ void DirectRenderer::decideRenderPassAllocationsForFrame(const RenderPassList& r
void DirectRenderer::drawFrame(const RenderPassList& renderPassesInDrawOrder, const RenderPassIdHashMap& renderPassesById)
{
+ TRACE_EVENT0("cc", "DirectRenderer::drawFrame");
const RenderPass* rootRenderPass = renderPassesInDrawOrder.back();
DCHECK(rootRenderPass);
@@ -169,6 +171,7 @@ void DirectRenderer::drawFrame(const RenderPassList& renderPassesInDrawOrder, co
void DirectRenderer::drawRenderPass(DrawingFrame& frame, const RenderPass* renderPass)
{
+ TRACE_EVENT0("cc", "DirectRenderer::drawRenderPass");
if (!useRenderPass(frame, renderPass))
return;
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index ed37af6..d7aa06d 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -4,6 +4,7 @@
#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"
@@ -91,11 +92,13 @@ void SoftwareRenderer::viewportChanged()
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();
@@ -163,6 +166,7 @@ bool SoftwareRenderer::isSoftwareResource(ResourceProvider::ResourceId id) const
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();
@@ -345,6 +349,7 @@ bool SoftwareRenderer::swapBuffers()
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());
diff --git a/content/renderer/gpu/compositor_software_output_device_gl_adapter.cc b/content/renderer/gpu/compositor_software_output_device_gl_adapter.cc
index 835b007..e9c8df41 100644
--- a/content/renderer/gpu/compositor_software_output_device_gl_adapter.cc
+++ b/content/renderer/gpu/compositor_software_output_device_gl_adapter.cc
@@ -4,6 +4,7 @@
#include "content/renderer/gpu/compositor_software_output_device_gl_adapter.h"
+#include "base/debug/trace_event.h"
#include "base/logging.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkPixelRef.h"
@@ -161,6 +162,7 @@ void CompositorSoftwareOutputDeviceGLAdapter::Resize(
}
void CompositorSoftwareOutputDeviceGLAdapter::Draw(void* pixels) {
+ TRACE_EVENT0("renderer", "CompositorSoftwareOutputDeviceGLAdapter::Draw");
if (!initialized_)
NOTREACHED();
if (!framebuffer_texture_id_)