Index: cc/raster/bitmap_tile_task_worker_pool.h |
diff --git a/cc/raster/bitmap_tile_task_worker_pool.h b/cc/raster/bitmap_tile_task_worker_pool.h |
index 7fea2b2dcfd21a5dbfe0edd6040e1bdb3f5858c8..4f6d99df3858e51ddc924ffdd19228396b37a2cc 100644 |
--- a/cc/raster/bitmap_tile_task_worker_pool.h |
+++ b/cc/raster/bitmap_tile_task_worker_pool.h |
@@ -27,7 +27,7 @@ class CC_EXPORT BitmapTileTaskWorkerPool : public TileTaskWorkerPool, |
public: |
~BitmapTileTaskWorkerPool() override; |
- static scoped_ptr<TileTaskWorkerPool> Create( |
+ static std::unique_ptr<TileTaskWorkerPool> Create( |
base::SequencedTaskRunner* task_runner, |
TaskGraphRunner* task_graph_runner, |
ResourceProvider* resource_provider); |
@@ -43,11 +43,11 @@ class CC_EXPORT BitmapTileTaskWorkerPool : 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; |
protected: |
BitmapTileTaskWorkerPool(base::SequencedTaskRunner* task_runner, |
@@ -55,7 +55,8 @@ class CC_EXPORT BitmapTileTaskWorkerPool : public TileTaskWorkerPool, |
ResourceProvider* resource_provider); |
private: |
- scoped_ptr<base::trace_event::ConvertableToTraceFormat> StateAsValue() const; |
+ std::unique_ptr<base::trace_event::ConvertableToTraceFormat> StateAsValue() |
+ const; |
scoped_refptr<base::SequencedTaskRunner> task_runner_; |
TaskGraphRunner* task_graph_runner_; |