Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3716)

Unified Diff: cc/tiles/tile_manager_perftest.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/tiles/tile_manager.cc ('k') | cc/tiles/tile_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiles/tile_manager_perftest.cc
diff --git a/cc/tiles/tile_manager_perftest.cc b/cc/tiles/tile_manager_perftest.cc
index cc0a41497e9ce839bf102380d67602d93614ffcd..d4ef597b1a229f476a648ee1b790b9b1374d1998 100644
--- a/cc/tiles/tile_manager_perftest.cc
+++ b/cc/tiles/tile_manager_perftest.cc
@@ -71,13 +71,13 @@ class FakeTileTaskRunnerImpl : public TileTaskRunner, public TileTaskClient {
}
// Overridden from TileTaskClient:
- scoped_ptr<RasterBuffer> AcquireBufferForRaster(
+ std::unique_ptr<RasterBuffer> AcquireBufferForRaster(
const Resource* resource,
uint64_t new_content_id,
uint64_t previous_content_id) override {
return nullptr;
}
- void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override {}
+ void ReleaseBufferForRaster(std::unique_ptr<RasterBuffer> buffer) override {}
private:
TileTask::Vector completed_tasks_;
@@ -166,7 +166,7 @@ class TileManagerPerfTest : public testing::Test {
// Clear recycled tree.
pending_tree->ClearLayers();
- scoped_ptr<FakePictureLayerImpl> pending_layer =
+ std::unique_ptr<FakePictureLayerImpl> pending_layer =
FakePictureLayerImpl::CreateWithRasterSource(pending_tree, id_,
raster_source);
pending_layer->SetDrawsContent(true);
@@ -191,8 +191,9 @@ class TileManagerPerfTest : public testing::Test {
timer_.Reset();
do {
- scoped_ptr<RasterTilePriorityQueue> queue(host_impl_.BuildRasterQueue(
- priorities[priority_count], RasterTilePriorityQueue::Type::ALL));
+ std::unique_ptr<RasterTilePriorityQueue> queue(
+ host_impl_.BuildRasterQueue(priorities[priority_count],
+ RasterTilePriorityQueue::Type::ALL));
priority_count = (priority_count + 1) % arraysize(priorities);
timer_.NextLap();
} while (!timer_.HasTimeLimitExpired());
@@ -220,8 +221,9 @@ class TileManagerPerfTest : public testing::Test {
timer_.Reset();
do {
int count = tile_count;
- scoped_ptr<RasterTilePriorityQueue> queue(host_impl_.BuildRasterQueue(
- priorities[priority_count], RasterTilePriorityQueue::Type::ALL));
+ std::unique_ptr<RasterTilePriorityQueue> queue(
+ host_impl_.BuildRasterQueue(priorities[priority_count],
+ RasterTilePriorityQueue::Type::ALL));
while (count--) {
ASSERT_FALSE(queue->IsEmpty());
ASSERT_TRUE(queue->Top().tile());
@@ -258,7 +260,7 @@ class TileManagerPerfTest : public testing::Test {
timer_.Reset();
do {
- scoped_ptr<EvictionTilePriorityQueue> queue(
+ std::unique_ptr<EvictionTilePriorityQueue> queue(
host_impl_.BuildEvictionQueue(priorities[priority_count]));
priority_count = (priority_count + 1) % arraysize(priorities);
timer_.NextLap();
@@ -293,7 +295,7 @@ class TileManagerPerfTest : public testing::Test {
timer_.Reset();
do {
int count = tile_count;
- scoped_ptr<EvictionTilePriorityQueue> queue(
+ std::unique_ptr<EvictionTilePriorityQueue> queue(
host_impl_.BuildEvictionQueue(priorities[priority_count]));
while (count--) {
ASSERT_FALSE(queue->IsEmpty());
@@ -350,7 +352,7 @@ class TileManagerPerfTest : public testing::Test {
scoped_refptr<FakeRasterSource> raster_source =
FakeRasterSource::CreateFilled(layer_bounds);
while (static_cast<int>(layers.size()) < layer_count) {
- scoped_ptr<FakePictureLayerImpl> layer =
+ std::unique_ptr<FakePictureLayerImpl> layer =
FakePictureLayerImpl::CreateWithRasterSource(
host_impl_.pending_tree(), next_id, raster_source);
layer->SetBounds(layer_bounds);
@@ -417,7 +419,7 @@ class TileManagerPerfTest : public testing::Test {
int max_tiles_;
int id_;
FakeImplTaskRunnerProvider task_runner_provider_;
- scoped_ptr<OutputSurface> output_surface_;
+ std::unique_ptr<OutputSurface> output_surface_;
FakeLayerTreeHostImpl host_impl_;
FakePictureLayerImpl* pending_root_layer_;
FakePictureLayerImpl* active_root_layer_;
« no previous file with comments | « cc/tiles/tile_manager.cc ('k') | cc/tiles/tile_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698