diff options
author | danakj <danakj@chromium.org> | 2015-11-18 12:40:55 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-18 20:41:32 +0000 |
commit | 78c30f07606287bc3238b50fbc7438c0d0a79361 (patch) | |
tree | cdca505caabdd9c58638e71876b171582e1063bb /cc/raster | |
parent | a04855af140e24ed3ec3f59da178837b3d32d9c4 (diff) | |
download | chromium_src-78c30f07606287bc3238b50fbc7438c0d0a79361.zip chromium_src-78c30f07606287bc3238b50fbc7438c0d0a79361.tar.gz chromium_src-78c30f07606287bc3238b50fbc7438c0d0a79361.tar.bz2 |
cc: Replace Pass() with std::move() in some subdirs.
This hits the following:
cc/playback/
cc/raster/
cc/test/
cc/tiles/
R=enne, vmpstr
BUG=557422
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1455753003
Cr-Commit-Position: refs/heads/master@{#360406}
Diffstat (limited to 'cc/raster')
-rw-r--r-- | cc/raster/one_copy_tile_task_worker_pool.cc | 4 | ||||
-rw-r--r-- | cc/raster/task_graph_runner_unittest.cc | 2 | ||||
-rw-r--r-- | cc/raster/tile_task_worker_pool_perftest.cc | 6 | ||||
-rw-r--r-- | cc/raster/tile_task_worker_pool_unittest.cc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/cc/raster/one_copy_tile_task_worker_pool.cc b/cc/raster/one_copy_tile_task_worker_pool.cc index dc1d118..c66c2ad 100644 --- a/cc/raster/one_copy_tile_task_worker_pool.cc +++ b/cc/raster/one_copy_tile_task_worker_pool.cc @@ -530,7 +530,7 @@ void OneCopyTileTaskWorkerPool::PlaybackAndCopyOnWorkerThread( } staging_buffer->last_usage = base::TimeTicks::Now(); - busy_buffers_.push_back(staging_buffer.Pass()); + busy_buffers_.push_back(std::move(staging_buffer)); ScheduleReduceMemoryUsage(); } @@ -693,7 +693,7 @@ OneCopyTileTaskWorkerPool::AcquireStagingBuffer(const Resource* resource, free_buffers_.pop_front(); } - return staging_buffer.Pass(); + return staging_buffer; } base::TimeTicks OneCopyTileTaskWorkerPool::GetUsageTimeForLRUBuffer() { diff --git a/cc/raster/task_graph_runner_unittest.cc b/cc/raster/task_graph_runner_unittest.cc index 31144e7..3e8a339 100644 --- a/cc/raster/task_graph_runner_unittest.cc +++ b/cc/raster/task_graph_runner_unittest.cc @@ -174,7 +174,7 @@ class TaskGraphRunnerTest : public TaskGraphRunnerTestBase, scoped_ptr<base::DelegateSimpleThread> worker = make_scoped_ptr(new base::DelegateSimpleThread(this, "TestWorker")); worker->Start(); - workers_.push_back(worker.Pass()); + workers_.push_back(std::move(worker)); } for (int i = 0; i < kNamespaceCount; ++i) diff --git a/cc/raster/tile_task_worker_pool_perftest.cc b/cc/raster/tile_task_worker_pool_perftest.cc index a67f6b0..7d6706d 100644 --- a/cc/raster/tile_task_worker_pool_perftest.cc +++ b/cc/raster/tile_task_worker_pool_perftest.cc @@ -146,7 +146,7 @@ class PerfRasterTaskImpl : public RasterTask { public: PerfRasterTaskImpl(scoped_ptr<ScopedResource> resource, ImageDecodeTask::Vector* dependencies) - : RasterTask(dependencies), resource_(resource.Pass()) {} + : RasterTask(dependencies), resource_(std::move(resource)) {} // Overridden from Task: void RunOnWorkerThread() override {} @@ -157,7 +157,7 @@ class PerfRasterTaskImpl : public RasterTask { raster_buffer_ = client->AcquireBufferForRaster(resource_.get(), 0, 0); } void CompleteOnOriginThread(TileTaskClient* client) override { - client->ReleaseBufferForRaster(raster_buffer_.Pass()); + client->ReleaseBufferForRaster(std::move(raster_buffer_)); Reset(); } @@ -209,7 +209,7 @@ class TileTaskWorkerPoolPerfTestBase { ImageDecodeTask::Vector dependencies = image_decode_tasks; raster_tasks->push_back( - new PerfRasterTaskImpl(resource.Pass(), &dependencies)); + new PerfRasterTaskImpl(std::move(resource), &dependencies)); } } diff --git a/cc/raster/tile_task_worker_pool_unittest.cc b/cc/raster/tile_task_worker_pool_unittest.cc index 9cbbd7e..aff1423 100644 --- a/cc/raster/tile_task_worker_pool_unittest.cc +++ b/cc/raster/tile_task_worker_pool_unittest.cc @@ -75,7 +75,7 @@ class TestRasterTaskImpl : public RasterTask { raster_buffer_ = client->AcquireBufferForRaster(resource_, 0, 0); } void CompleteOnOriginThread(TileTaskClient* client) override { - client->ReleaseBufferForRaster(raster_buffer_.Pass()); + client->ReleaseBufferForRaster(std::move(raster_buffer_)); reply_.Run(DisplayListRasterSource::SolidColorAnalysis(), !HasFinishedRunning()); } |