Index: cc/raster/zero_copy_tile_task_worker_pool.h |
diff --git a/cc/raster/zero_copy_tile_task_worker_pool.h b/cc/raster/zero_copy_tile_task_worker_pool.h |
index bc558d762ce9e103022ad7a11ba08dccecce1e06..d8d99481dd21be59324f327daef82e883aaf21dc 100644 |
--- a/cc/raster/zero_copy_tile_task_worker_pool.h |
+++ b/cc/raster/zero_copy_tile_task_worker_pool.h |
@@ -28,7 +28,7 @@ class CC_EXPORT ZeroCopyTileTaskWorkerPool : public TileTaskWorkerPool, |
public: |
~ZeroCopyTileTaskWorkerPool() override; |
- static scoped_ptr<TileTaskWorkerPool> Create( |
+ static std::unique_ptr<TileTaskWorkerPool> Create( |
base::SequencedTaskRunner* task_runner, |
TaskGraphRunner* task_graph_runner, |
ResourceProvider* resource_provider, |
@@ -45,11 +45,11 @@ class CC_EXPORT ZeroCopyTileTaskWorkerPool : 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: |
ZeroCopyTileTaskWorkerPool(base::SequencedTaskRunner* task_runner, |
@@ -58,7 +58,8 @@ class CC_EXPORT ZeroCopyTileTaskWorkerPool : public TileTaskWorkerPool, |
ResourceFormat preferred_tile_format); |
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_; |