| Index: cc/raster/one_copy_raster_buffer_provider.cc
|
| diff --git a/cc/raster/one_copy_raster_buffer_provider.cc b/cc/raster/one_copy_raster_buffer_provider.cc
|
| index e632e0fabf598a0fb52ea1c8bf98e62b32dbb2e2..391a8f2b105ecc6a6665f8cebf163a5a1aa95089 100644
|
| --- a/cc/raster/one_copy_raster_buffer_provider.cc
|
| +++ b/cc/raster/one_copy_raster_buffer_provider.cc
|
| @@ -56,12 +56,12 @@ void OneCopyRasterBufferProvider::RasterBufferImpl::Playback(
|
| const gfx::Rect& raster_full_rect,
|
| const gfx::Rect& raster_dirty_rect,
|
| uint64_t new_content_id,
|
| - const gfx::SizeF& scales,
|
| + float scale,
|
| const RasterSource::PlaybackSettings& playback_settings) {
|
| TRACE_EVENT0("cc", "OneCopyRasterBuffer::Playback");
|
| client_->PlaybackAndCopyOnWorkerThread(
|
| resource_, &lock_, sync_token_, raster_source, raster_full_rect,
|
| - raster_dirty_rect, scales, playback_settings, previous_content_id_,
|
| + raster_dirty_rect, scale, playback_settings, previous_content_id_,
|
| new_content_id);
|
| }
|
|
|
| @@ -174,7 +174,7 @@ void OneCopyRasterBufferProvider::PlaybackAndCopyOnWorkerThread(
|
| const RasterSource* raster_source,
|
| const gfx::Rect& raster_full_rect,
|
| const gfx::Rect& raster_dirty_rect,
|
| - const gfx::SizeF& scales,
|
| + float scale,
|
| const RasterSource::PlaybackSettings& playback_settings,
|
| uint64_t previous_content_id,
|
| uint64_t new_content_id) {
|
| @@ -198,7 +198,7 @@ void OneCopyRasterBufferProvider::PlaybackAndCopyOnWorkerThread(
|
| : resource_lock->sk_color_space();
|
|
|
| PlaybackToStagingBuffer(staging_buffer.get(), resource, raster_source,
|
| - raster_full_rect, raster_dirty_rect, scales,
|
| + raster_full_rect, raster_dirty_rect, scale,
|
| raster_color_space, playback_settings,
|
| previous_content_id, new_content_id);
|
|
|
| @@ -214,7 +214,7 @@ void OneCopyRasterBufferProvider::PlaybackToStagingBuffer(
|
| const RasterSource* raster_source,
|
| const gfx::Rect& raster_full_rect,
|
| const gfx::Rect& raster_dirty_rect,
|
| - const gfx::SizeF& scales,
|
| + float scale,
|
| sk_sp<SkColorSpace> dst_color_space,
|
| const RasterSource::PlaybackSettings& playback_settings,
|
| uint64_t previous_content_id,
|
| @@ -264,7 +264,7 @@ void OneCopyRasterBufferProvider::PlaybackToStagingBuffer(
|
| RasterBufferProvider::PlaybackToMemory(
|
| buffer->memory(0), resource->format(), staging_buffer->size,
|
| buffer->stride(0), raster_source, raster_full_rect, playback_rect,
|
| - scales, dst_color_space, playback_settings);
|
| + scale, dst_color_space, playback_settings);
|
| buffer->Unmap();
|
| staging_buffer->content_id = new_content_id;
|
| }
|
|
|