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

Unified Diff: cc/test/fake_tile_manager.cc

Issue 839143002: Roll Chrome into Mojo. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Rebase Created 5 years, 11 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/test/fake_proxy.h ('k') | cc/test/layer_tree_pixel_resource_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/fake_tile_manager.cc
diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc
index bb23aa824fcdd9a8a531298911c4105df749985e..f876271f8dae89f073c294f250bf9cfbb52fea28 100644
--- a/cc/test/fake_tile_manager.cc
+++ b/cc/test/fake_tile_manager.cc
@@ -65,8 +65,9 @@ base::LazyInstance<FakeTileTaskRunnerImpl> g_fake_tile_task_runner =
FakeTileManager::FakeTileManager(TileManagerClient* client)
: TileManager(client,
base::MessageLoopProxy::current(),
- NULL,
+ nullptr,
g_fake_tile_task_runner.Pointer(),
+ nullptr,
std::numeric_limits<size_t>::max()) {
}
@@ -76,19 +77,12 @@ FakeTileManager::FakeTileManager(TileManagerClient* client,
base::MessageLoopProxy::current(),
resource_pool,
g_fake_tile_task_runner.Pointer(),
+ nullptr,
std::numeric_limits<size_t>::max()) {
}
FakeTileManager::~FakeTileManager() {}
-void FakeTileManager::AssignMemoryToTiles(
- const GlobalStateThatImpactsTilePriority& state) {
- tiles_for_raster.clear();
-
- SetGlobalStateForTesting(state);
- AssignGpuMemoryToTiles(&tiles_for_raster);
-}
-
bool FakeTileManager::HasBeenAssignedMemory(Tile* tile) {
return std::find(tiles_for_raster.begin(),
tiles_for_raster.end(),
« no previous file with comments | « cc/test/fake_proxy.h ('k') | cc/test/layer_tree_pixel_resource_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698