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

Side by Side Diff: cc/test/fake_tile_manager.cc

Issue 634243003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating fix. 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/test/fake_tile_manager.h" 5 #include "cc/test/fake_tile_manager.h"
6 6
7 #include <deque> 7 #include <deque>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "cc/resources/raster_buffer.h" 10 #include "cc/resources/raster_buffer.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 RasterTask::Vector completed_tasks_; 60 RasterTask::Vector completed_tasks_;
61 }; 61 };
62 base::LazyInstance<FakeRasterizerImpl> g_fake_rasterizer = 62 base::LazyInstance<FakeRasterizerImpl> g_fake_rasterizer =
63 LAZY_INSTANCE_INITIALIZER; 63 LAZY_INSTANCE_INITIALIZER;
64 64
65 } // namespace 65 } // namespace
66 66
67 FakeTileManager::FakeTileManager(TileManagerClient* client) 67 FakeTileManager::FakeTileManager(TileManagerClient* client)
68 : TileManager(client, 68 : TileManager(client,
69 base::MessageLoopProxy::current(), 69 base::MessageLoopProxy::current(),
70 NULL, 70 nullptr,
71 g_fake_rasterizer.Pointer(), 71 g_fake_rasterizer.Pointer(),
72 NULL) {} 72 nullptr) {
73 }
73 74
74 FakeTileManager::FakeTileManager(TileManagerClient* client, 75 FakeTileManager::FakeTileManager(TileManagerClient* client,
75 ResourcePool* resource_pool) 76 ResourcePool* resource_pool)
76 : TileManager(client, 77 : TileManager(client,
77 base::MessageLoopProxy::current(), 78 base::MessageLoopProxy::current(),
78 resource_pool, 79 resource_pool,
79 g_fake_rasterizer.Pointer(), 80 g_fake_rasterizer.Pointer(),
80 NULL) {} 81 nullptr) {
82 }
81 83
82 FakeTileManager::~FakeTileManager() {} 84 FakeTileManager::~FakeTileManager() {}
83 85
84 void FakeTileManager::AssignMemoryToTiles( 86 void FakeTileManager::AssignMemoryToTiles(
85 const GlobalStateThatImpactsTilePriority& state) { 87 const GlobalStateThatImpactsTilePriority& state) {
86 tiles_for_raster.clear(); 88 tiles_for_raster.clear();
87 89
88 SetGlobalStateForTesting(state); 90 SetGlobalStateForTesting(state);
89 AssignGpuMemoryToTiles(&tiles_for_raster); 91 AssignGpuMemoryToTiles(&tiles_for_raster);
90 } 92 }
91 93
92 bool FakeTileManager::HasBeenAssignedMemory(Tile* tile) { 94 bool FakeTileManager::HasBeenAssignedMemory(Tile* tile) {
93 return std::find(tiles_for_raster.begin(), 95 return std::find(tiles_for_raster.begin(),
94 tiles_for_raster.end(), 96 tiles_for_raster.end(),
95 tile) != tiles_for_raster.end(); 97 tile) != tiles_for_raster.end();
96 } 98 }
97 99
98 void FakeTileManager::Release(Tile* tile) { 100 void FakeTileManager::Release(Tile* tile) {
99 TileManager::Release(tile); 101 TileManager::Release(tile);
100 102
101 FreeResourcesForReleasedTiles(); 103 FreeResourcesForReleasedTiles();
102 CleanUpReleasedTiles(); 104 CleanUpReleasedTiles();
103 } 105 }
104 106
105 } // namespace cc 107 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698