| Index: cc/raster/gpu_tile_task_worker_pool.h
|
| diff --git a/cc/raster/gpu_tile_task_worker_pool.h b/cc/raster/gpu_tile_task_worker_pool.h
|
| index 0577b51fdfb70e1ac620bbe491a049f2a4d4ba59..6943a271c0ef1d50fc7aba9d21d3260a7b7eabcd 100644
|
| --- a/cc/raster/gpu_tile_task_worker_pool.h
|
| +++ b/cc/raster/gpu_tile_task_worker_pool.h
|
| @@ -22,7 +22,7 @@ class CC_EXPORT GpuTileTaskWorkerPool : public TileTaskWorkerPool,
|
| public:
|
| ~GpuTileTaskWorkerPool() override;
|
|
|
| - static scoped_ptr<TileTaskWorkerPool> Create(
|
| + static std::unique_ptr<TileTaskWorkerPool> Create(
|
| base::SequencedTaskRunner* task_runner,
|
| TaskGraphRunner* task_graph_runner,
|
| ContextProvider* context_provider,
|
| @@ -41,11 +41,11 @@ class CC_EXPORT GpuTileTaskWorkerPool : 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;
|
|
|
| private:
|
| GpuTileTaskWorkerPool(base::SequencedTaskRunner* task_runner,
|
| @@ -60,7 +60,7 @@ class CC_EXPORT GpuTileTaskWorkerPool : public TileTaskWorkerPool,
|
| scoped_refptr<base::SequencedTaskRunner> task_runner_;
|
| TaskGraphRunner* task_graph_runner_;
|
| const NamespaceToken namespace_token_;
|
| - scoped_ptr<GpuRasterizer> rasterizer_;
|
| + std::unique_ptr<GpuRasterizer> rasterizer_;
|
|
|
| Task::Vector completed_tasks_;
|
|
|
|
|