summaryrefslogtreecommitdiffstats
path: root/cc/resources
diff options
context:
space:
mode:
authorvmpstr@chromium.org <vmpstr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-25 06:25:44 +0000
committervmpstr@chromium.org <vmpstr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-25 06:25:44 +0000
commit7b4306209ed4b6b3f1f7c7696f122632fa50a7db (patch)
treee161de1b21c6a055fda5a10935a3d81d8368944c /cc/resources
parent35a2af1bc96ac2b4ff96e800ff2adf9d1c68b849 (diff)
downloadchromium_src-7b4306209ed4b6b3f1f7c7696f122632fa50a7db.zip
chromium_src-7b4306209ed4b6b3f1f7c7696f122632fa50a7db.tar.gz
chromium_src-7b4306209ed4b6b3f1f7c7696f122632fa50a7db.tar.bz2
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
Diffstat (limited to 'cc/resources')
-rw-r--r--cc/resources/tile_manager_perftest.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/cc/resources/tile_manager_perftest.cc b/cc/resources/tile_manager_perftest.cc
index 69bdaa4..0c7b40a 100644
--- a/cc/resources/tile_manager_perftest.cc
+++ b/cc/resources/tile_manager_perftest.cc
@@ -351,26 +351,28 @@ TEST_F(TileManagerPerfTest, ManageTiles) {
}
TEST_F(TileManagerPerfTest, RasterTileQueueConstruct) {
- SetupDefaultTrees(gfx::Size(10000, 10000));
+ SetupDefaultTrees(gfx::Size(1000, 1000));
active_root_layer_->CreateDefaultTilingsAndTiles();
pending_root_layer_->CreateDefaultTilingsAndTiles();
RunRasterQueueConstructTest("2");
- for (int i = 0; i < 8; ++i) {
- PictureLayerTiling* tiling = active_root_layer_->AddTiling(i * 0.3f);
+ int number_of_tilings = 2;
+ for (; number_of_tilings < 10; ++number_of_tilings) {
+ PictureLayerTiling* tiling =
+ active_root_layer_->AddTiling(1.0f + number_of_tilings * 0.3f);
tiling->CreateAllTilesForTesting();
}
RunRasterQueueConstructTest("10");
- for (int i = 0; i < 90; ++i) {
+ for (; number_of_tilings < 50; ++number_of_tilings) {
PictureLayerTiling* tiling =
- active_root_layer_->AddTiling(1.0f + i * 0.03f);
+ active_root_layer_->AddTiling(1.0f + number_of_tilings * 0.3f);
tiling->CreateAllTilesForTesting();
}
- RunRasterQueueConstructTest("100");
+ RunRasterQueueConstructTest("50");
}
TEST_F(TileManagerPerfTest, RasterTileQueueConstructAndIterate) {