| Index: cc/resources/skpicture_content_layer_updater.cc
|
| diff --git a/cc/resources/skpicture_content_layer_updater.cc b/cc/resources/skpicture_content_layer_updater.cc
|
| index 0ca6ea826394cbd691009b20775632b23a93cbb3..4d0ec175dc880250b970d1fee96cbef1db374767 100644
|
| --- a/cc/resources/skpicture_content_layer_updater.cc
|
| +++ b/cc/resources/skpicture_content_layer_updater.cc
|
| @@ -22,21 +22,25 @@ SkPictureContentLayerUpdater::Resource::~Resource() {}
|
| void SkPictureContentLayerUpdater::Resource::Update(ResourceUpdateQueue* queue,
|
| gfx::Rect source_rect,
|
| gfx::Vector2d dest_offset,
|
| - bool partial_update,
|
| - RenderingStats*) {
|
| + bool partial_update) {
|
| updater_->UpdateTexture(
|
| queue, texture(), source_rect, dest_offset, partial_update);
|
| }
|
|
|
| SkPictureContentLayerUpdater::SkPictureContentLayerUpdater(
|
| - scoped_ptr<LayerPainter> painter)
|
| - : ContentLayerUpdater(painter.Pass()), layer_is_opaque_(false) {}
|
| + scoped_ptr<LayerPainter> painter,
|
| + RenderingStatsInstrumentation* stats_instrumentation)
|
| + : ContentLayerUpdater(painter.Pass(), stats_instrumentation),
|
| + layer_is_opaque_(false) {}
|
|
|
| SkPictureContentLayerUpdater::~SkPictureContentLayerUpdater() {}
|
|
|
| scoped_refptr<SkPictureContentLayerUpdater>
|
| -SkPictureContentLayerUpdater::Create(scoped_ptr<LayerPainter> painter) {
|
| - return make_scoped_refptr(new SkPictureContentLayerUpdater(painter.Pass()));
|
| +SkPictureContentLayerUpdater::Create(
|
| + scoped_ptr<LayerPainter> painter,
|
| + RenderingStatsInstrumentation* stats_instrumentation) {
|
| + return make_scoped_refptr(
|
| + new SkPictureContentLayerUpdater(painter.Pass(), stats_instrumentation));
|
| }
|
|
|
| scoped_ptr<LayerUpdater::Resource> SkPictureContentLayerUpdater::CreateResource(
|
| @@ -50,16 +54,14 @@ void SkPictureContentLayerUpdater::PrepareToUpdate(
|
| gfx::Size,
|
| float contentsWidthScale,
|
| float contents_height_scale,
|
| - gfx::Rect* resultingOpaqueRect,
|
| - RenderingStats* stats) {
|
| + gfx::Rect* resultingOpaqueRect) {
|
| SkCanvas* canvas =
|
| picture_.beginRecording(content_rect.width(), content_rect.height());
|
| PaintContents(canvas,
|
| content_rect,
|
| contentsWidthScale,
|
| contents_height_scale,
|
| - resultingOpaqueRect,
|
| - stats);
|
| + resultingOpaqueRect);
|
| picture_.endRecording();
|
| }
|
|
|
|
|