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

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

Issue 271533011: cc: Move tiling management out of draw properties calculation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments + unit/perf test fails addressed Created 6 years, 7 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 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/resources/tile.h" 5 #include "cc/resources/tile.h"
6 #include "cc/resources/tile_priority.h" 6 #include "cc/resources/tile_priority.h"
7 #include "cc/test/fake_impl_proxy.h" 7 #include "cc/test/fake_impl_proxy.h"
8 #include "cc/test/fake_layer_tree_host_impl.h" 8 #include "cc/test/fake_layer_tree_host_impl.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 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 813
814 tile_manager->UnregisterPictureLayerImpl(active_layer.get()); 814 tile_manager->UnregisterPictureLayerImpl(active_layer.get());
815 tile_manager->UnregisterPictureLayerImpl(pending_layer.get()); 815 tile_manager->UnregisterPictureLayerImpl(pending_layer.get());
816 } 816 }
817 817
818 TEST_F(TileManagerTileIteratorTest, RasterTileIterator) { 818 TEST_F(TileManagerTileIteratorTest, RasterTileIterator) {
819 SetupDefaultTrees(gfx::Size(1000, 1000)); 819 SetupDefaultTrees(gfx::Size(1000, 1000));
820 TileManager* tile_manager = TileManagerTileIteratorTest::tile_manager(); 820 TileManager* tile_manager = TileManagerTileIteratorTest::tile_manager();
821 EXPECT_TRUE(tile_manager); 821 EXPECT_TRUE(tile_manager);
822 822
823 active_layer_->SetBounds(gfx::Size(1000, 1000));
danakj 2014/05/21 15:01:00 Maybe do these in SetupDefaultTrees?
824 active_layer_->SetContentBounds(gfx::Size(1000, 1000));
823 active_layer_->CreateDefaultTilingsAndTiles(); 825 active_layer_->CreateDefaultTilingsAndTiles();
826 pending_layer_->SetBounds(gfx::Size(1000, 1000));
827 pending_layer_->SetContentBounds(gfx::Size(1000, 1000));
824 pending_layer_->CreateDefaultTilingsAndTiles(); 828 pending_layer_->CreateDefaultTilingsAndTiles();
825 829
826 std::vector<TileManager::PairedPictureLayer> paired_layers; 830 std::vector<TileManager::PairedPictureLayer> paired_layers;
827 tile_manager->GetPairedPictureLayers(&paired_layers); 831 tile_manager->GetPairedPictureLayers(&paired_layers);
828 EXPECT_EQ(1u, paired_layers.size()); 832 EXPECT_EQ(1u, paired_layers.size());
829 833
830 TileManager::RasterTileIterator it(tile_manager, 834 TileManager::RasterTileIterator it(tile_manager,
831 SAME_PRIORITY_FOR_BOTH_TREES); 835 SAME_PRIORITY_FOR_BOTH_TREES);
832 EXPECT_TRUE(it); 836 EXPECT_TRUE(it);
833 837
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
980 // Since we don't guarantee increasing distance due to spiral iterator, we 984 // Since we don't guarantee increasing distance due to spiral iterator, we
981 // should check that we're _mostly_ right. 985 // should check that we're _mostly_ right.
982 EXPECT_GT(increasing_distance_tiles, 3 * tile_count / 4); 986 EXPECT_GT(increasing_distance_tiles, 3 * tile_count / 4);
983 } 987 }
984 988
985 TEST_F(TileManagerTileIteratorTest, EvictionTileIterator) { 989 TEST_F(TileManagerTileIteratorTest, EvictionTileIterator) {
986 SetupDefaultTrees(gfx::Size(1000, 1000)); 990 SetupDefaultTrees(gfx::Size(1000, 1000));
987 TileManager* tile_manager = TileManagerTileIteratorTest::tile_manager(); 991 TileManager* tile_manager = TileManagerTileIteratorTest::tile_manager();
988 EXPECT_TRUE(tile_manager); 992 EXPECT_TRUE(tile_manager);
989 993
994 active_layer_->SetBounds(gfx::Size(1000, 1000));
995 active_layer_->SetContentBounds(gfx::Size(1000, 1000));
990 active_layer_->CreateDefaultTilingsAndTiles(); 996 active_layer_->CreateDefaultTilingsAndTiles();
997 pending_layer_->SetBounds(gfx::Size(1000, 1000));
998 pending_layer_->SetContentBounds(gfx::Size(1000, 1000));
991 pending_layer_->CreateDefaultTilingsAndTiles(); 999 pending_layer_->CreateDefaultTilingsAndTiles();
992 1000
993 std::vector<TileManager::PairedPictureLayer> paired_layers; 1001 std::vector<TileManager::PairedPictureLayer> paired_layers;
994 tile_manager->GetPairedPictureLayers(&paired_layers); 1002 tile_manager->GetPairedPictureLayers(&paired_layers);
995 EXPECT_EQ(1u, paired_layers.size()); 1003 EXPECT_EQ(1u, paired_layers.size());
996 1004
997 TileManager::EvictionTileIterator empty_it(tile_manager, 1005 TileManager::EvictionTileIterator empty_it(tile_manager,
998 SAME_PRIORITY_FOR_BOTH_TREES); 1006 SAME_PRIORITY_FOR_BOTH_TREES);
999 EXPECT_FALSE(empty_it); 1007 EXPECT_FALSE(empty_it);
1000 std::set<Tile*> all_tiles; 1008 std::set<Tile*> all_tiles;
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
1133 1141
1134 last_tile = tile; 1142 last_tile = tile;
1135 new_content_tiles.insert(tile); 1143 new_content_tiles.insert(tile);
1136 } 1144 }
1137 1145
1138 EXPECT_EQ(tile_count, new_content_tiles.size()); 1146 EXPECT_EQ(tile_count, new_content_tiles.size());
1139 EXPECT_EQ(all_tiles, new_content_tiles); 1147 EXPECT_EQ(all_tiles, new_content_tiles);
1140 } 1148 }
1141 } // namespace 1149 } // namespace
1142 } // namespace cc 1150 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698