| Index: cc/raster/zero_copy_tile_task_worker_pool.cc
|
| diff --git a/cc/raster/zero_copy_tile_task_worker_pool.cc b/cc/raster/zero_copy_tile_task_worker_pool.cc
|
| index da962333e1a5fa440880ca08d5dacc876cdbb399..203415a7c5d22abf23e28030ee8c4770f22b0643 100644
|
| --- a/cc/raster/zero_copy_tile_task_worker_pool.cc
|
| +++ b/cc/raster/zero_copy_tile_task_worker_pool.cc
|
| @@ -9,6 +9,7 @@
|
| #include <algorithm>
|
|
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/trace_event/trace_event.h"
|
| #include "base/trace_event/trace_event_argument.h"
|
| @@ -65,12 +66,12 @@ class RasterBufferImpl : public RasterBuffer {
|
| } // namespace
|
|
|
| // static
|
| -scoped_ptr<TileTaskWorkerPool> ZeroCopyTileTaskWorkerPool::Create(
|
| +std::unique_ptr<TileTaskWorkerPool> ZeroCopyTileTaskWorkerPool::Create(
|
| base::SequencedTaskRunner* task_runner,
|
| TaskGraphRunner* task_graph_runner,
|
| ResourceProvider* resource_provider,
|
| ResourceFormat preferred_tile_format) {
|
| - return make_scoped_ptr<TileTaskWorkerPool>(
|
| + return base::WrapUnique<TileTaskWorkerPool>(
|
| new ZeroCopyTileTaskWorkerPool(task_runner, task_graph_runner,
|
| resource_provider, preferred_tile_format));
|
| }
|
| @@ -140,16 +141,17 @@ bool ZeroCopyTileTaskWorkerPool::GetResourceRequiresSwizzle(
|
| return ResourceFormatRequiresSwizzle(GetResourceFormat(must_support_alpha));
|
| }
|
|
|
| -scoped_ptr<RasterBuffer> ZeroCopyTileTaskWorkerPool::AcquireBufferForRaster(
|
| +std::unique_ptr<RasterBuffer>
|
| +ZeroCopyTileTaskWorkerPool::AcquireBufferForRaster(
|
| const Resource* resource,
|
| uint64_t resource_content_id,
|
| uint64_t previous_content_id) {
|
| - return make_scoped_ptr<RasterBuffer>(
|
| + return base::WrapUnique<RasterBuffer>(
|
| new RasterBufferImpl(resource_provider_, resource));
|
| }
|
|
|
| void ZeroCopyTileTaskWorkerPool::ReleaseBufferForRaster(
|
| - scoped_ptr<RasterBuffer> buffer) {
|
| + std::unique_ptr<RasterBuffer> buffer) {
|
| // Nothing to do here. RasterBufferImpl destructor cleans up after itself.
|
| }
|
|
|
|
|