From 39046bbd1a81bccaa8f3a21166d0ba8b7e050117 Mon Sep 17 00:00:00 2001 From: vmpstr Date: Sat, 20 Dec 2014 13:58:39 -0800 Subject: [PATCH] cc: Remove auto use with smart pointers. This patch removes cc uses of auto with smart pointers. This ensures that it's explicit and clear what type of smart pointer is being used. I think it's better to do this now before this is used as a precedent for propagating this type of auto use. R=danakj Review URL: https://codereview.chromium.org/816193002 Cr-Commit-Position: refs/heads/master@{#309363} --- cc/debug/rasterize_and_record_benchmark_impl.cc | 2 +- cc/resources/picture_layer_tiling_set_unittest.cc | 17 ++++--- cc/resources/picture_layer_tiling_unittest.cc | 56 +++++++++++++---------- cc/test/test_context_provider.cc | 3 +- 4 files changed, 45 insertions(+), 33 deletions(-) diff --git a/cc/debug/rasterize_and_record_benchmark_impl.cc b/cc/debug/rasterize_and_record_benchmark_impl.cc index 2555f85a6440..c638ddcf65bb 100644 --- a/cc/debug/rasterize_and_record_benchmark_impl.cc +++ b/cc/debug/rasterize_and_record_benchmark_impl.cc @@ -209,7 +209,7 @@ void RasterizeAndRecordBenchmarkImpl::RunOnLayer(PictureLayerImpl* layer) { // it takes to rasterize content. As such, the actual settings used here don't // really matter. const LayerTreeSettings& settings = layer->layer_tree_impl()->settings(); - auto tiling_set = PictureLayerTilingSet::Create( + scoped_ptr tiling_set = PictureLayerTilingSet::Create( &client, settings.max_tiles_for_interest_area, settings.skewport_target_time_in_seconds, settings.skewport_extrapolation_limit_in_content_pixels); diff --git a/cc/resources/picture_layer_tiling_set_unittest.cc b/cc/resources/picture_layer_tiling_set_unittest.cc index fa79e2462512..3cafa4c64bd2 100644 --- a/cc/resources/picture_layer_tiling_set_unittest.cc +++ b/cc/resources/picture_layer_tiling_set_unittest.cc @@ -107,7 +107,8 @@ TEST(PictureLayerTilingSetTest, TilingRange) { EXPECT_EQ(4u, lower_than_low_res_range.start); EXPECT_EQ(5u, lower_than_low_res_range.end); - auto set_without_low_res = CreateTilingSet(&client); + scoped_ptr set_without_low_res = + CreateTilingSet(&client); set_without_low_res->AddTiling(2.0, pile); high_res_tiling = set_without_low_res->AddTiling(1.0, pile); high_res_tiling->set_resolution(HIGH_RESOLUTION); @@ -137,7 +138,8 @@ TEST(PictureLayerTilingSetTest, TilingRange) { PictureLayerTilingSet::LOWER_THAN_LOW_RES); EXPECT_EQ(0u, lower_than_low_res_range.end - lower_than_low_res_range.start); - auto set_with_only_high_and_low_res = CreateTilingSet(&client); + scoped_ptr set_with_only_high_and_low_res = + CreateTilingSet(&client); high_res_tiling = set_with_only_high_and_low_res->AddTiling(1.0, pile); high_res_tiling->set_resolution(HIGH_RESOLUTION); low_res_tiling = set_with_only_high_and_low_res->AddTiling(0.5, pile); @@ -168,7 +170,8 @@ TEST(PictureLayerTilingSetTest, TilingRange) { PictureLayerTilingSet::LOWER_THAN_LOW_RES); EXPECT_EQ(0u, lower_than_low_res_range.end - lower_than_low_res_range.start); - auto set_with_only_high_res = CreateTilingSet(&client); + scoped_ptr set_with_only_high_res = + CreateTilingSet(&client); high_res_tiling = set_with_only_high_res->AddTiling(1.0, pile); high_res_tiling->set_resolution(HIGH_RESOLUTION); @@ -298,9 +301,9 @@ TEST_F(PictureLayerTilingSetTestWithResources, ManyTilings_NotEqual) { TEST(PictureLayerTilingSetTest, TileSizeChange) { FakePictureLayerTilingClient pending_client; FakePictureLayerTilingClient active_client; - auto pending_set = + scoped_ptr pending_set = PictureLayerTilingSet::Create(&pending_client, 1000, 1.f, 1000); - auto active_set = + scoped_ptr active_set = PictureLayerTilingSet::Create(&active_client, 1000, 1.f, 1000); gfx::Size layer_bounds(100, 100); @@ -399,9 +402,9 @@ TEST(PictureLayerTilingSetTest, TileSizeChange) { TEST(PictureLayerTilingSetTest, MaxContentScale) { FakePictureLayerTilingClient pending_client; FakePictureLayerTilingClient active_client; - auto pending_set = + scoped_ptr pending_set = PictureLayerTilingSet::Create(&pending_client, 1000, 1.f, 1000); - auto active_set = + scoped_ptr active_set = PictureLayerTilingSet::Create(&active_client, 1000, 1.f, 1000); gfx::Size layer_bounds(100, 105); diff --git a/cc/resources/picture_layer_tiling_unittest.cc b/cc/resources/picture_layer_tiling_unittest.cc index 0a8934ea0b16..3ebcc5012c54 100644 --- a/cc/resources/picture_layer_tiling_unittest.cc +++ b/cc/resources/picture_layer_tiling_unittest.cc @@ -546,7 +546,7 @@ TEST(PictureLayerTilingTest, SkewportLimits) { scoped_refptr pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(layer_bounds); - auto tiling = + scoped_ptr tiling = TestablePictureLayerTiling::Create(1.0f, pile, &client, settings); tiling->ComputeTilePriorityRects(viewport, 1.f, 1.0, Occlusion()); @@ -615,8 +615,9 @@ TEST(PictureLayerTilingTest, ComputeSkewport) { scoped_refptr pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(layer_bounds); - auto tiling = TestablePictureLayerTiling::Create(1.0f, pile, &client, - LayerTreeSettings()); + scoped_ptr tiling = + TestablePictureLayerTiling::Create(1.0f, pile, &client, + LayerTreeSettings()); tiling->ComputeTilePriorityRects(viewport, 1.f, 1.0, Occlusion()); @@ -684,7 +685,7 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) { // tiling. scoped_refptr pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(layer_bounds); - auto tiling = + scoped_ptr tiling = TestablePictureLayerTiling::Create(0.25f, pile, &client, settings); gfx::Rect viewport_in_content_space = gfx::ToEnclosedRect(gfx::ScaleRect(viewport, 0.25f)); @@ -1104,7 +1105,7 @@ TEST(PictureLayerTilingTest, TilingRasterTileIteratorStaticViewport) { scoped_refptr pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(layer_bounds); - auto tiling = + scoped_ptr tiling = TestablePictureLayerTiling::Create(1.0f, pile, &client, settings); tiling->ComputeTilePriorityRects(viewport, 1.0f, 1.0, Occlusion()); tiling->UpdateAllTilePrioritiesForTesting(); @@ -1213,7 +1214,7 @@ TEST(PictureLayerTilingTest, TilingRasterTileIteratorMovingViewport) { scoped_refptr pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(layer_bounds); - auto tiling = + scoped_ptr tiling = TestablePictureLayerTiling::Create(1.f, pile, &client, settings); tiling->ComputeTilePriorityRects(viewport, 1.0f, 1.0, Occlusion()); tiling->ComputeTilePriorityRects(moved_viewport, 1.0f, 2.0, Occlusion()); @@ -1393,8 +1394,9 @@ TEST(ComputeTilePriorityRectsTest, VisibleTiles) { scoped_refptr pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize( current_layer_bounds); - auto tiling = TestablePictureLayerTiling::Create(1.0f, pile, &client, - LayerTreeSettings()); + scoped_ptr tiling = + TestablePictureLayerTiling::Create(1.0f, pile, &client, + LayerTreeSettings()); tiling->ComputeTilePriorityRects(viewport_in_layer_space, current_layer_contents_scale, @@ -1448,8 +1450,9 @@ TEST(ComputeTilePriorityRectsTest, OffscreenTiles) { scoped_refptr pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize( current_layer_bounds); - auto tiling = TestablePictureLayerTiling::Create(1.0f, pile, &client, - LayerTreeSettings()); + scoped_ptr tiling = + TestablePictureLayerTiling::Create(1.0f, pile, &client, + LayerTreeSettings()); tiling->ComputeTilePriorityRects(viewport_in_layer_space, current_layer_contents_scale, @@ -1513,8 +1516,9 @@ TEST(ComputeTilePriorityRectsTest, PartiallyOffscreenLayer) { scoped_refptr pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize( current_layer_bounds); - auto tiling = TestablePictureLayerTiling::Create(1.0f, pile, &client, - LayerTreeSettings()); + scoped_ptr tiling = + TestablePictureLayerTiling::Create(1.0f, pile, &client, + LayerTreeSettings()); tiling->ComputeTilePriorityRects(viewport_in_layer_space, current_layer_contents_scale, @@ -1572,8 +1576,9 @@ TEST(ComputeTilePriorityRectsTest, PartiallyOffscreenRotatedLayer) { scoped_refptr pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize( current_layer_bounds); - auto tiling = TestablePictureLayerTiling::Create(1.0f, pile, &client, - LayerTreeSettings()); + scoped_ptr tiling = + TestablePictureLayerTiling::Create(1.0f, pile, &client, + LayerTreeSettings()); tiling->ComputeTilePriorityRects(viewport_in_layer_space, current_layer_contents_scale, @@ -1655,8 +1660,9 @@ TEST(ComputeTilePriorityRectsTest, PerspectiveLayer) { scoped_refptr pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize( current_layer_bounds); - auto tiling = TestablePictureLayerTiling::Create(1.0f, pile, &client, - LayerTreeSettings()); + scoped_ptr tiling = + TestablePictureLayerTiling::Create(1.0f, pile, &client, + LayerTreeSettings()); tiling->ComputeTilePriorityRects(viewport_in_layer_space, current_layer_contents_scale, @@ -1748,8 +1754,9 @@ TEST(ComputeTilePriorityRectsTest, PerspectiveLayerClippedByW) { scoped_refptr pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize( current_layer_bounds); - auto tiling = TestablePictureLayerTiling::Create(1.0f, pile, &client, - LayerTreeSettings()); + scoped_ptr tiling = + TestablePictureLayerTiling::Create(1.0f, pile, &client, + LayerTreeSettings()); tiling->ComputeTilePriorityRects(viewport_in_layer_space, current_layer_contents_scale, @@ -1813,7 +1820,7 @@ TEST(ComputeTilePriorityRectsTest, BasicMotion) { scoped_refptr pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize( current_layer_bounds); - auto tiling = + scoped_ptr tiling = TestablePictureLayerTiling::Create(1.0f, pile, &client, settings); // previous ("last") frame @@ -1944,7 +1951,7 @@ TEST(PictureLayerTilingTest, RecycledTilesCleared) { scoped_refptr pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize( gfx::Size(10000, 10000)); - auto active_tiling = + scoped_ptr active_tiling = TestablePictureLayerTiling::Create(1.0f, pile, &active_client, settings); // Create all tiles on this tiling. active_tiling->ComputeTilePriorityRects(gfx::Rect(0, 0, 100, 100), 1.0f, 1.0f, @@ -1957,7 +1964,7 @@ TEST(PictureLayerTilingTest, RecycledTilesCleared) { pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize( gfx::Size(10000, 10000)); - auto recycle_tiling = + scoped_ptr recycle_tiling = TestablePictureLayerTiling::Create(1.0f, pile, &recycle_client, settings); // Create all tiles on the second tiling. All tiles should be shared. @@ -1998,8 +2005,9 @@ TEST(PictureLayerTilingTest, RecycledTilesClearedOnReset) { scoped_refptr pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize( gfx::Size(100, 100)); - auto active_tiling = TestablePictureLayerTiling::Create( - 1.0f, pile, &active_client, LayerTreeSettings()); + scoped_ptr active_tiling = + TestablePictureLayerTiling::Create(1.0f, pile, &active_client, + LayerTreeSettings()); // Create all tiles on this tiling. active_tiling->ComputeTilePriorityRects(gfx::Rect(0, 0, 100, 100), 1.0f, 1.0f, Occlusion()); @@ -2014,7 +2022,7 @@ TEST(PictureLayerTilingTest, RecycledTilesClearedOnReset) { pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize( gfx::Size(100, 100)); - auto recycle_tiling = + scoped_ptr recycle_tiling = TestablePictureLayerTiling::Create(1.0f, pile, &recycle_client, settings); // Create all tiles on the recycle tiling. All tiles should be shared. diff --git a/cc/test/test_context_provider.cc b/cc/test/test_context_provider.cc index 2a2b6f6e67e7..4c24fe1efeba 100644 --- a/cc/test/test_context_provider.cc +++ b/cc/test/test_context_provider.cc @@ -95,7 +95,8 @@ class GrContext* TestContextProvider::GrContext() { if (gr_context_) return gr_context_.get(); - auto null_interface = skia::AdoptRef(GrGLCreateNullInterface()); + skia::RefPtr null_interface = + skia::AdoptRef(GrGLCreateNullInterface()); gr_context_ = skia::AdoptRef(GrContext::Create( kOpenGL_GrBackend, reinterpret_cast(null_interface.get()))); -- 2.11.4.GIT