| Index: cc/raster/one_copy_tile_task_worker_pool.cc
|
| diff --git a/cc/raster/one_copy_tile_task_worker_pool.cc b/cc/raster/one_copy_tile_task_worker_pool.cc
|
| index 7fb123bb5a0a9aff78d4a1c85d989927e565cb35..47e4c01c5a6ddb37f1513c1311f4cb402d7e97ac 100644
|
| --- a/cc/raster/one_copy_tile_task_worker_pool.cc
|
| +++ b/cc/raster/one_copy_tile_task_worker_pool.cc
|
| @@ -69,7 +69,7 @@ const int kMaxBytesPerCopyOperation = 1024 * 1024 * 4;
|
| } // namespace
|
|
|
| // static
|
| -scoped_ptr<TileTaskWorkerPool> OneCopyTileTaskWorkerPool::Create(
|
| +std::unique_ptr<TileTaskWorkerPool> OneCopyTileTaskWorkerPool::Create(
|
| base::SequencedTaskRunner* task_runner,
|
| TaskGraphRunner* task_graph_runner,
|
| ContextProvider* context_provider,
|
| @@ -78,7 +78,7 @@ scoped_ptr<TileTaskWorkerPool> OneCopyTileTaskWorkerPool::Create(
|
| bool use_partial_raster,
|
| int max_staging_buffer_usage_in_bytes,
|
| ResourceFormat preferred_tile_format) {
|
| - return make_scoped_ptr<TileTaskWorkerPool>(new OneCopyTileTaskWorkerPool(
|
| + return base::WrapUnique<TileTaskWorkerPool>(new OneCopyTileTaskWorkerPool(
|
| task_runner, task_graph_runner, resource_provider,
|
| max_copy_texture_chromium_size, use_partial_raster,
|
| max_staging_buffer_usage_in_bytes, preferred_tile_format));
|
| @@ -172,19 +172,19 @@ bool OneCopyTileTaskWorkerPool::GetResourceRequiresSwizzle(
|
| return ResourceFormatRequiresSwizzle(GetResourceFormat(must_support_alpha));
|
| }
|
|
|
| -scoped_ptr<RasterBuffer> OneCopyTileTaskWorkerPool::AcquireBufferForRaster(
|
| +std::unique_ptr<RasterBuffer> OneCopyTileTaskWorkerPool::AcquireBufferForRaster(
|
| const Resource* resource,
|
| uint64_t resource_content_id,
|
| uint64_t previous_content_id) {
|
| // TODO(danakj): If resource_content_id != 0, we only need to copy/upload
|
| // the dirty rect.
|
| - return make_scoped_ptr<RasterBuffer>(
|
| + return base::WrapUnique<RasterBuffer>(
|
| new RasterBufferImpl(this, resource_provider_, resource->format(),
|
| resource, previous_content_id));
|
| }
|
|
|
| void OneCopyTileTaskWorkerPool::ReleaseBufferForRaster(
|
| - scoped_ptr<RasterBuffer> buffer) {
|
| + std::unique_ptr<RasterBuffer> buffer) {
|
| // Nothing to do here. RasterBufferImpl destructor cleans up after itself.
|
| }
|
|
|
| @@ -198,7 +198,7 @@ void OneCopyTileTaskWorkerPool::PlaybackAndCopyOnWorkerThread(
|
| const RasterSource::PlaybackSettings& playback_settings,
|
| uint64_t previous_content_id,
|
| uint64_t new_content_id) {
|
| - scoped_ptr<StagingBuffer> staging_buffer =
|
| + std::unique_ptr<StagingBuffer> staging_buffer =
|
| staging_pool_->AcquireStagingBuffer(resource, previous_content_id);
|
|
|
| PlaybackToStagingBuffer(staging_buffer.get(), resource, raster_source,
|
|
|