| 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 31dad67aa86489218b4c6a3444b6c5c1dd656c92..1651aef9f0d966eaec55e53f30c29860ad773cb6 100644
|
| --- a/cc/raster/one_copy_raster_buffer_provider.cc
|
| +++ b/cc/raster/one_copy_raster_buffer_provider.cc
|
| @@ -54,12 +54,12 @@ void OneCopyRasterBufferProvider::RasterBufferImpl::Playback(
|
| const gfx::Rect& raster_full_rect,
|
| const gfx::Rect& raster_dirty_rect,
|
| uint64_t new_content_id,
|
| - float scale,
|
| + const ScaleTranslate2d& transform,
|
| const RasterSource::PlaybackSettings& playback_settings) {
|
| TRACE_EVENT0("cc", "OneCopyRasterBuffer::Playback");
|
| client_->PlaybackAndCopyOnWorkerThread(
|
| resource_, &lock_, sync_token_, raster_source, raster_full_rect,
|
| - raster_dirty_rect, scale, playback_settings, previous_content_id_,
|
| + raster_dirty_rect, transform, playback_settings, previous_content_id_,
|
| new_content_id);
|
| }
|
|
|
| @@ -172,7 +172,7 @@ void OneCopyRasterBufferProvider::PlaybackAndCopyOnWorkerThread(
|
| const RasterSource* raster_source,
|
| const gfx::Rect& raster_full_rect,
|
| const gfx::Rect& raster_dirty_rect,
|
| - float scale,
|
| + const ScaleTranslate2d& transform,
|
| const RasterSource::PlaybackSettings& playback_settings,
|
| uint64_t previous_content_id,
|
| uint64_t new_content_id) {
|
| @@ -192,7 +192,7 @@ void OneCopyRasterBufferProvider::PlaybackAndCopyOnWorkerThread(
|
| staging_pool_.AcquireStagingBuffer(resource, previous_content_id);
|
|
|
| PlaybackToStagingBuffer(staging_buffer.get(), resource, raster_source,
|
| - raster_full_rect, raster_dirty_rect, scale,
|
| + raster_full_rect, raster_dirty_rect, transform,
|
| playback_settings, previous_content_id,
|
| new_content_id);
|
|
|
| @@ -208,7 +208,7 @@ void OneCopyRasterBufferProvider::PlaybackToStagingBuffer(
|
| const RasterSource* raster_source,
|
| const gfx::Rect& raster_full_rect,
|
| const gfx::Rect& raster_dirty_rect,
|
| - float scale,
|
| + const ScaleTranslate2d& transform,
|
| const RasterSource::PlaybackSettings& playback_settings,
|
| uint64_t previous_content_id,
|
| uint64_t new_content_id) {
|
| @@ -258,7 +258,7 @@ void OneCopyRasterBufferProvider::PlaybackToStagingBuffer(
|
| RasterBufferProvider::PlaybackToMemory(
|
| buffer->memory(0), resource->format(), staging_buffer->size,
|
| buffer->stride(0), raster_source, raster_full_rect, playback_rect,
|
| - scale, playback_settings);
|
| + transform, playback_settings);
|
| buffer->Unmap();
|
| staging_buffer->content_id = new_content_id;
|
| }
|
|
|