| Index: cc/raster/one_copy_tile_task_worker_pool.h
|
| diff --git a/cc/raster/one_copy_tile_task_worker_pool.h b/cc/raster/one_copy_tile_task_worker_pool.h
|
| index c4614b1ac75036ddcc576c8aeeeb61dabaa904c1..e362bdd0eaf408fb7ca6f64bc58e77852990f207 100644
|
| --- a/cc/raster/one_copy_tile_task_worker_pool.h
|
| +++ b/cc/raster/one_copy_tile_task_worker_pool.h
|
| @@ -24,7 +24,7 @@ class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool,
|
| public:
|
| ~OneCopyTileTaskWorkerPool() override;
|
|
|
| - static scoped_ptr<TileTaskWorkerPool> Create(
|
| + static std::unique_ptr<TileTaskWorkerPool> Create(
|
| base::SequencedTaskRunner* task_runner,
|
| TaskGraphRunner* task_graph_runner,
|
| ContextProvider* context_provider,
|
| @@ -45,11 +45,11 @@ class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool,
|
| bool GetResourceRequiresSwizzle(bool must_support_alpha) const override;
|
|
|
| // Overridden from TileTaskClient:
|
| - scoped_ptr<RasterBuffer> AcquireBufferForRaster(
|
| + std::unique_ptr<RasterBuffer> AcquireBufferForRaster(
|
| const Resource* resource,
|
| uint64_t resource_content_id,
|
| uint64_t previous_content_id) override;
|
| - void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override;
|
| + void ReleaseBufferForRaster(std::unique_ptr<RasterBuffer> buffer) override;
|
|
|
| // Playback raster source and copy result into |resource|.
|
| void PlaybackAndCopyOnWorkerThread(
|
| @@ -100,7 +100,7 @@ class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool,
|
| int bytes_scheduled_since_last_flush_;
|
|
|
| ResourceFormat preferred_tile_format_;
|
| - scoped_ptr<StagingBufferPool> staging_pool_;
|
| + std::unique_ptr<StagingBufferPool> staging_pool_;
|
|
|
| Task::Vector completed_tasks_;
|
|
|
|
|