Commit 7b430620 authored by vmpstr@chromium.org's avatar vmpstr@chromium.org

cc: Fix DCHECK in tile manager queue perftests.

There's an issue with adding some of the tilings, since the scales
collide (or are not valid otherwise), which is causing some DCHECKs
to be triggered.

This just shuffles the scales, as well as make the layer smaller so
that we don't create massive amounts of textures (which is pretty slow
even on my desktop).

R=reveman, jbedley

Review URL: https://codereview.chromium.org/413243004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285506 0039d316-1c4b-4281-b951-d872f2087c98
parent 35a2af1b
...@@ -351,26 +351,28 @@ TEST_F(TileManagerPerfTest, ManageTiles) { ...@@ -351,26 +351,28 @@ TEST_F(TileManagerPerfTest, ManageTiles) {
} }
TEST_F(TileManagerPerfTest, RasterTileQueueConstruct) { TEST_F(TileManagerPerfTest, RasterTileQueueConstruct) {
SetupDefaultTrees(gfx::Size(10000, 10000)); SetupDefaultTrees(gfx::Size(1000, 1000));
active_root_layer_->CreateDefaultTilingsAndTiles(); active_root_layer_->CreateDefaultTilingsAndTiles();
pending_root_layer_->CreateDefaultTilingsAndTiles(); pending_root_layer_->CreateDefaultTilingsAndTiles();
RunRasterQueueConstructTest("2"); RunRasterQueueConstructTest("2");
for (int i = 0; i < 8; ++i) { int number_of_tilings = 2;
PictureLayerTiling* tiling = active_root_layer_->AddTiling(i * 0.3f); for (; number_of_tilings < 10; ++number_of_tilings) {
PictureLayerTiling* tiling =
active_root_layer_->AddTiling(1.0f + number_of_tilings * 0.3f);
tiling->CreateAllTilesForTesting(); tiling->CreateAllTilesForTesting();
} }
RunRasterQueueConstructTest("10"); RunRasterQueueConstructTest("10");
for (int i = 0; i < 90; ++i) { for (; number_of_tilings < 50; ++number_of_tilings) {
PictureLayerTiling* tiling = PictureLayerTiling* tiling =
active_root_layer_->AddTiling(1.0f + i * 0.03f); active_root_layer_->AddTiling(1.0f + number_of_tilings * 0.3f);
tiling->CreateAllTilesForTesting(); tiling->CreateAllTilesForTesting();
} }
RunRasterQueueConstructTest("100"); RunRasterQueueConstructTest("50");
} }
TEST_F(TileManagerPerfTest, RasterTileQueueConstructAndIterate) { TEST_F(TileManagerPerfTest, RasterTileQueueConstructAndIterate) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment