| OLD | NEW |
| 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 942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 953 } | 953 } |
| 954 | 954 |
| 955 last_tile = tile; | 955 last_tile = tile; |
| 956 new_content_tiles.insert(tile); | 956 new_content_tiles.insert(tile); |
| 957 } | 957 } |
| 958 | 958 |
| 959 EXPECT_EQ(tile_count, new_content_tiles.size()); | 959 EXPECT_EQ(tile_count, new_content_tiles.size()); |
| 960 EXPECT_EQ(all_tiles, new_content_tiles); | 960 EXPECT_EQ(all_tiles, new_content_tiles); |
| 961 } | 961 } |
| 962 | 962 |
| 963 TEST_F(TileManagerTileIteratorTest, EvictionTileIteratorWithOcclusion) { | 963 #if defined(OS_WIN) |
| 964 #define MAYBE_EvictionTileIteratorWithOcclusion \ |
| 965 DISABLED_EvictionTileIteratorWithOcclusion |
| 966 #else |
| 967 #define MAYBE_EvictionTileIteratorWithOcclusion \ |
| 968 EvictionTileIteratorWithOcclusion |
| 969 #endif |
| 970 TEST_F(TileManagerTileIteratorTest, MAYBE_EvictionTileIteratorWithOcclusion) { |
| 964 gfx::Size tile_size(102, 102); | 971 gfx::Size tile_size(102, 102); |
| 965 gfx::Size layer_bounds(1000, 1000); | 972 gfx::Size layer_bounds(1000, 1000); |
| 966 | 973 |
| 967 scoped_refptr<FakePicturePileImpl> pending_pile = | 974 scoped_refptr<FakePicturePileImpl> pending_pile = |
| 968 FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds); | 975 FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds); |
| 969 SetupPendingTree(pending_pile); | 976 SetupPendingTree(pending_pile); |
| 970 pending_layer_->CreateDefaultTilingsAndTiles(); | 977 pending_layer_->CreateDefaultTilingsAndTiles(); |
| 971 | 978 |
| 972 scoped_ptr<FakePictureLayerImpl> pending_child = | 979 scoped_ptr<FakePictureLayerImpl> pending_child = |
| 973 FakePictureLayerImpl::CreateWithPile( | 980 FakePictureLayerImpl::CreateWithPile( |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1099 } | 1106 } |
| 1100 } | 1107 } |
| 1101 last_tile = tile; | 1108 last_tile = tile; |
| 1102 } | 1109 } |
| 1103 size_t expected_occluded_count = | 1110 size_t expected_occluded_count = |
| 1104 pending_child_high_res_tiles.size() + pending_child_low_res_tiles.size(); | 1111 pending_child_high_res_tiles.size() + pending_child_low_res_tiles.size(); |
| 1105 EXPECT_EQ(expected_occluded_count, occluded_count); | 1112 EXPECT_EQ(expected_occluded_count, occluded_count); |
| 1106 } | 1113 } |
| 1107 } // namespace | 1114 } // namespace |
| 1108 } // namespace cc | 1115 } // namespace cc |
| OLD | NEW |