| 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/eviction_tile_priority_queue.h" | 5 #include "cc/resources/eviction_tile_priority_queue.h" |
| 6 #include "cc/resources/raster_tile_priority_queue.h" | 6 #include "cc/resources/raster_tile_priority_queue.h" |
| 7 #include "cc/resources/tile.h" | 7 #include "cc/resources/tile.h" |
| 8 #include "cc/resources/tile_priority.h" | 8 #include "cc/resources/tile_priority.h" |
| 9 #include "cc/test/fake_impl_proxy.h" | 9 #include "cc/test/fake_impl_proxy.h" |
| 10 #include "cc/test/fake_layer_tree_host_impl.h" | 10 #include "cc/test/fake_layer_tree_host_impl.h" |
| (...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 921 | 921 |
| 922 last_tile = tile; | 922 last_tile = tile; |
| 923 new_content_tiles.insert(tile); | 923 new_content_tiles.insert(tile); |
| 924 queue.Pop(); | 924 queue.Pop(); |
| 925 } | 925 } |
| 926 | 926 |
| 927 EXPECT_EQ(tile_count, new_content_tiles.size()); | 927 EXPECT_EQ(tile_count, new_content_tiles.size()); |
| 928 EXPECT_EQ(all_tiles, new_content_tiles); | 928 EXPECT_EQ(all_tiles, new_content_tiles); |
| 929 } | 929 } |
| 930 | 930 |
| 931 #if defined(OS_WIN) | |
| 932 #define MAYBE_EvictionTilePriorityQueueWithOcclusion \ | |
| 933 DISABLED_EvictionTilePriorityQueueWithOcclusion | |
| 934 #else | |
| 935 #define MAYBE_EvictionTilePriorityQueueWithOcclusion \ | |
| 936 EvictionTilePriorityQueueWithOcclusion | |
| 937 #endif | |
| 938 TEST_F(TileManagerTilePriorityQueueTest, | 931 TEST_F(TileManagerTilePriorityQueueTest, |
| 939 MAYBE_EvictionTilePriorityQueueWithOcclusion) { | 932 EvictionTilePriorityQueueWithOcclusion) { |
| 940 gfx::Size tile_size(102, 102); | 933 gfx::Size tile_size(102, 102); |
| 941 gfx::Size layer_bounds(1000, 1000); | 934 gfx::Size layer_bounds(1000, 1000); |
| 942 | 935 |
| 943 scoped_refptr<FakePicturePileImpl> pending_pile = | 936 scoped_refptr<FakePicturePileImpl> pending_pile = |
| 944 FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds); | 937 FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds); |
| 945 SetupPendingTree(pending_pile); | 938 SetupPendingTree(pending_pile); |
| 946 pending_layer_->CreateDefaultTilingsAndTiles(); | 939 pending_layer_->CreateDefaultTilingsAndTiles(); |
| 947 | 940 |
| 948 scoped_ptr<FakePictureLayerImpl> pending_child = | 941 scoped_ptr<FakePictureLayerImpl> pending_child = |
| 949 FakePictureLayerImpl::CreateWithPile( | 942 FakePictureLayerImpl::CreateWithPile( |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1143 all_tiles.insert(queue.Top()); | 1136 all_tiles.insert(queue.Top()); |
| 1144 ++tile_count; | 1137 ++tile_count; |
| 1145 queue.Pop(); | 1138 queue.Pop(); |
| 1146 } | 1139 } |
| 1147 EXPECT_EQ(tile_count, all_tiles.size()); | 1140 EXPECT_EQ(tile_count, all_tiles.size()); |
| 1148 EXPECT_EQ(17u, tile_count); | 1141 EXPECT_EQ(17u, tile_count); |
| 1149 } | 1142 } |
| 1150 | 1143 |
| 1151 } // namespace | 1144 } // namespace |
| 1152 } // namespace cc | 1145 } // namespace cc |
| OLD | NEW |