| Index: cc/raster/gpu_raster_buffer_provider.cc
|
| diff --git a/cc/raster/gpu_raster_buffer_provider.cc b/cc/raster/gpu_raster_buffer_provider.cc
|
| index e7e4f9200ad100c02c050b101cf3b22872ec4fb7..97fb5812f5f986e4a4dd573b87f21230ddbd5333 100644
|
| --- a/cc/raster/gpu_raster_buffer_provider.cc
|
| +++ b/cc/raster/gpu_raster_buffer_provider.cc
|
| @@ -32,7 +32,7 @@ static void RasterizeSource(
|
| const gfx::Size& resource_size,
|
| const gfx::Rect& raster_full_rect,
|
| const gfx::Rect& raster_dirty_rect,
|
| - const gfx::SizeF& scales,
|
| + float scale,
|
| const RasterSource::PlaybackSettings& playback_settings,
|
| ContextProvider* context_provider,
|
| ResourceProvider::ScopedWriteLockGL* resource_lock,
|
| @@ -74,7 +74,7 @@ static void RasterizeSource(
|
| }
|
|
|
| raster_source->PlaybackToCanvas(sk_surface->getCanvas(), raster_full_rect,
|
| - playback_rect, scales, playback_settings);
|
| + playback_rect, scale, playback_settings);
|
| }
|
|
|
| } // namespace
|
| @@ -100,13 +100,13 @@ void GpuRasterBufferProvider::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", "GpuRasterBuffer::Playback");
|
| client_->PlaybackOnWorkerThread(&lock_, sync_token_,
|
| resource_has_previous_content_, raster_source,
|
| raster_full_rect, raster_dirty_rect,
|
| - new_content_id, scales, playback_settings);
|
| + new_content_id, scale, playback_settings);
|
| }
|
|
|
| GpuRasterBufferProvider::GpuRasterBufferProvider(
|
| @@ -198,7 +198,7 @@ void GpuRasterBufferProvider::PlaybackOnWorkerThread(
|
| 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) {
|
| ContextProvider::ScopedContextLock scoped_context(worker_context_provider_);
|
| gpu::gles2::GLES2Interface* gl = scoped_context.ContextGL();
|
| @@ -215,7 +215,7 @@ void GpuRasterBufferProvider::PlaybackOnWorkerThread(
|
|
|
| RasterizeSource(raster_source, resource_has_previous_content,
|
| resource_lock->size(), raster_full_rect, raster_dirty_rect,
|
| - scales, playback_settings, worker_context_provider_,
|
| + scale, playback_settings, worker_context_provider_,
|
| resource_lock, async_worker_context_enabled_,
|
| use_distance_field_text_, msaa_sample_count_);
|
|
|
|
|