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

Side by Side Diff: cc/resources/picture_layer_tiling_perftest.cc

Issue 657103003: cc: Change scoped_ptr<T>() to nullptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « cc/layers/texture_layer_unittest.cc ('k') | cc/test/animation_test_common.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/debug/lap_timer.h" 5 #include "cc/debug/lap_timer.h"
6 #include "cc/resources/picture_layer_tiling.h" 6 #include "cc/resources/picture_layer_tiling.h"
7 #include "cc/resources/resource_provider.h" 7 #include "cc/resources/resource_provider.h"
8 #include "cc/resources/scoped_resource.h" 8 #include "cc/resources/scoped_resource.h"
9 #include "cc/test/fake_output_surface.h" 9 #include "cc/test/fake_output_surface.h"
10 #include "cc/test/fake_output_surface_client.h" 10 #include "cc/test/fake_output_surface_client.h"
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 timer_.NextLap(); 253 timer_.NextLap();
254 } while (!timer_.HasTimeLimitExpired()); 254 } while (!timer_.HasTimeLimitExpired());
255 255
256 // Remove all resources from tiles to make sure the tile version destructor 256 // Remove all resources from tiles to make sure the tile version destructor
257 // doesn't complain. 257 // doesn't complain.
258 for (std::vector<Tile*>::iterator tile_it = all_tiles.begin(); 258 for (std::vector<Tile*>::iterator tile_it = all_tiles.begin();
259 tile_it != all_tiles.end(); 259 tile_it != all_tiles.end();
260 ++tile_it) { 260 ++tile_it) {
261 Tile* tile = *tile_it; 261 Tile* tile = *tile_it;
262 ManagedTileState::DrawInfo& draw_info = tile->draw_info(); 262 ManagedTileState::DrawInfo& draw_info = tile->draw_info();
263 draw_info.SetResourceForTesting(scoped_ptr<ScopedResource>()); 263 draw_info.SetResourceForTesting(nullptr);
264 } 264 }
265 265
266 perf_test::PrintResult( 266 perf_test::PrintResult(
267 "tiling_eviction_tile_iterator_construct_and_iterate", 267 "tiling_eviction_tile_iterator_construct_and_iterate",
268 "", 268 "",
269 test_name, 269 test_name,
270 timer_.LapsPerSecond(), 270 timer_.LapsPerSecond(),
271 "runs/s", 271 "runs/s",
272 true); 272 true);
273 } 273 }
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 "32_500x500", 32, gfx::Rect(0, 0, 500, 500)); 352 "32_500x500", 32, gfx::Rect(0, 0, 500, 500));
353 RunEvictionIteratorConstructAndIterateTest( 353 RunEvictionIteratorConstructAndIterateTest(
354 "64_100x100", 64, gfx::Rect(0, 0, 100, 100)); 354 "64_100x100", 64, gfx::Rect(0, 0, 100, 100));
355 RunEvictionIteratorConstructAndIterateTest( 355 RunEvictionIteratorConstructAndIterateTest(
356 "64_500x500", 64, gfx::Rect(0, 0, 500, 500)); 356 "64_500x500", 64, gfx::Rect(0, 0, 500, 500));
357 } 357 }
358 358
359 } // namespace 359 } // namespace
360 360
361 } // namespace cc 361 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/texture_layer_unittest.cc ('k') | cc/test/animation_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698