Index: cc/benchmarks/rasterize_and_record_benchmark_impl.cc |
diff --git a/cc/benchmarks/rasterize_and_record_benchmark_impl.cc b/cc/benchmarks/rasterize_and_record_benchmark_impl.cc |
index 0144636664c6eebe130b36487617f8a0f660af86..0630064e142dd5761dc253b96641bccec0066e27 100644 |
--- a/cc/benchmarks/rasterize_and_record_benchmark_impl.cc |
+++ b/cc/benchmarks/rasterize_and_record_benchmark_impl.cc |
@@ -11,6 +11,7 @@ |
#include "base/values.h" |
#include "cc/base/lap_timer.h" |
+#include "cc/base/scale_translate2d.h" |
#include "cc/layers/layer_impl.h" |
#include "cc/layers/picture_layer_impl.h" |
#include "cc/raster/raster_buffer_provider.h" |
@@ -52,9 +53,10 @@ void RunBenchmark(RasterSource* raster_source, |
bitmap.allocPixels(SkImageInfo::MakeN32Premul(content_rect.width(), |
content_rect.height())); |
SkCanvas canvas(bitmap); |
- raster_source->PlaybackToCanvas(&canvas, gfx::ColorSpace(), content_rect, |
- content_rect, contents_scale, |
- RasterSource::PlaybackSettings()); |
+ raster_source->PlaybackToCanvas( |
+ &canvas, gfx::ColorSpace(), content_rect, content_rect, |
+ ScaleTranslate2d(contents_scale, gfx::Vector2dF()), |
+ RasterSource::PlaybackSettings()); |
timer.NextLap(); |
} while (!timer.HasTimeLimitExpired()); |
@@ -177,7 +179,7 @@ void RasterizeAndRecordBenchmarkImpl::RunOnLayer(PictureLayerImpl* layer) { |
settings.max_preraster_distance_in_screen_pixels); |
PictureLayerTiling* tiling = |
- tiling_set->AddTiling(1.f, layer->GetRasterSource()); |
+ tiling_set->AddTiling(ScaleTranslate2d(), layer->GetRasterSource()); |
tiling->set_resolution(HIGH_RESOLUTION); |
tiling->CreateAllTilesForTesting(); |
RasterSource* raster_source = tiling->raster_source().get(); |
@@ -187,7 +189,7 @@ void RasterizeAndRecordBenchmarkImpl::RunOnLayer(PictureLayerImpl* layer) { |
DCHECK(*it); |
gfx::Rect content_rect = (*it)->content_rect(); |
- float contents_scale = (*it)->contents_scale(); |
+ float contents_scale = (*it)->raster_transform().scale(); |
base::TimeDelta min_time; |
bool is_solid_color = false; |