| Index: cc/raster/gpu_tile_task_worker_pool.cc
|
| diff --git a/cc/raster/gpu_tile_task_worker_pool.cc b/cc/raster/gpu_tile_task_worker_pool.cc
|
| index 75c9646a85858c0d9bae56f11e2d4779a8053398..27d0a4651559e8a5d2402a09aaa422e9824924ca 100644
|
| --- a/cc/raster/gpu_tile_task_worker_pool.cc
|
| +++ b/cc/raster/gpu_tile_task_worker_pool.cc
|
| @@ -37,15 +37,16 @@ class RasterBufferImpl : public RasterBuffer {
|
| }
|
|
|
| // Overridden from RasterBuffer:
|
| - void Playback(const RasterSource* raster_source,
|
| - const gfx::Rect& raster_full_rect,
|
| - const gfx::Rect& raster_dirty_rect,
|
| - uint64_t new_content_id,
|
| - float scale,
|
| - bool include_images) override {
|
| + void Playback(
|
| + const RasterSource* raster_source,
|
| + const gfx::Rect& raster_full_rect,
|
| + const gfx::Rect& raster_dirty_rect,
|
| + uint64_t new_content_id,
|
| + float scale,
|
| + const RasterSource::PlaybackSettings& playback_settings) override {
|
| TRACE_EVENT0("cc", "RasterBufferImpl::Playback");
|
| // GPU raster doesn't do low res tiles, so should always include images.
|
| - DCHECK(include_images);
|
| + DCHECK(!playback_settings.skip_images);
|
| ContextProvider* context_provider = rasterizer_->resource_provider()
|
| ->output_surface()
|
| ->worker_context_provider();
|
| @@ -63,7 +64,7 @@ class RasterBufferImpl : public RasterBuffer {
|
| // TODO(danakj): Implement partial raster with raster_dirty_rect.
|
| // Rasterize source into resource.
|
| rasterizer_->RasterizeSource(&lock_, raster_source, raster_full_rect,
|
| - playback_rect, scale);
|
| + playback_rect, scale, playback_settings);
|
|
|
| gpu::gles2::GLES2Interface* gl = scoped_context.ContextGL();
|
| const uint64_t fence_sync = gl->InsertFenceSyncCHROMIUM();
|
|
|