| Index: cc/content_layer_updater.cc
|
| diff --git a/cc/content_layer_updater.cc b/cc/content_layer_updater.cc
|
| index 6e4858e9aecbe3bb639f1a1dbe223973454cb167..c9b7d3a4ace7553e6c441d8bb8d4858dfdc9e541 100644
|
| --- a/cc/content_layer_updater.cc
|
| +++ b/cc/content_layer_updater.cc
|
| @@ -26,7 +26,7 @@ ContentLayerUpdater::~ContentLayerUpdater()
|
| {
|
| }
|
|
|
| -void ContentLayerUpdater::paintContents(SkCanvas* canvas, const gfx::Rect& contentRect, float contentsWidthScale, float contentsHeightScale, gfx::Rect& resultingOpaqueRect, RenderingStats& stats)
|
| +void ContentLayerUpdater::paintContents(SkCanvas* canvas, const gfx::Rect& contentRect, float contentsWidthScale, float contentsHeightScale, gfx::Rect& resultingOpaqueRect, RenderingStats* stats)
|
| {
|
| TRACE_EVENT0("cc", "ContentLayerUpdater::paintContents");
|
| canvas->save();
|
| @@ -49,13 +49,16 @@ void ContentLayerUpdater::paintContents(SkCanvas* canvas, const gfx::Rect& conte
|
| canvas->clipRect(layerSkRect);
|
|
|
| gfx::RectF opaqueLayerRect;
|
| - base::TimeTicks paintBeginTime = base::TimeTicks::Now();
|
| + base::TimeTicks paintBeginTime;
|
| + if (stats)
|
| + paintBeginTime = base::TimeTicks::Now();
|
| m_painter->paint(canvas, layerRect, opaqueLayerRect);
|
| - stats.totalPaintTime += base::TimeTicks::Now() - paintBeginTime;
|
| + if (stats) {
|
| + stats->totalPaintTime += base::TimeTicks::Now() - paintBeginTime;
|
| + stats->totalPixelsPainted += contentRect.width() * contentRect.height();
|
| + }
|
| canvas->restore();
|
|
|
| - stats.totalPixelsPainted += contentRect.width() * contentRect.height();
|
| -
|
| gfx::RectF opaqueContentRect = gfx::ScaleRect(opaqueLayerRect, contentsWidthScale, contentsHeightScale);
|
| resultingOpaqueRect = gfx::ToEnclosedRect(opaqueContentRect);
|
|
|
|
|