OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/picture_layer_tiling_set.h" | 5 #include "cc/resources/picture_layer_tiling_set.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "cc/resources/resource_pool.h" | 10 #include "cc/resources/resource_pool.h" |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 last_scale = target_tiling->contents_scale(); | 213 last_scale = target_tiling->contents_scale(); |
214 } | 214 } |
215 } | 215 } |
216 | 216 |
217 for (size_t i = 0; i < target_->num_tilings(); ++i) | 217 for (size_t i = 0; i < target_->num_tilings(); ++i) |
218 ValidateTiling(target_->tiling_at(i), target_client_.pile()); | 218 ValidateTiling(target_->tiling_at(i), target_client_.pile()); |
219 } | 219 } |
220 | 220 |
221 void ValidateTiling(const PictureLayerTiling* tiling, | 221 void ValidateTiling(const PictureLayerTiling* tiling, |
222 const PicturePileImpl* pile) const { | 222 const PicturePileImpl* pile) const { |
223 if (tiling->ContentRect().IsEmpty()) | 223 if (tiling->TilingRect().IsEmpty()) |
224 EXPECT_TRUE(tiling->live_tiles_rect().IsEmpty()); | 224 EXPECT_TRUE(tiling->live_tiles_rect().IsEmpty()); |
225 else if (!tiling->live_tiles_rect().IsEmpty()) | 225 else if (!tiling->live_tiles_rect().IsEmpty()) |
226 EXPECT_TRUE(tiling->ContentRect().Contains(tiling->live_tiles_rect())); | 226 EXPECT_TRUE(tiling->TilingRect().Contains(tiling->live_tiles_rect())); |
227 | 227 |
228 std::vector<Tile*> tiles = tiling->AllTilesForTesting(); | 228 std::vector<Tile*> tiles = tiling->AllTilesForTesting(); |
229 for (size_t i = 0; i < tiles.size(); ++i) { | 229 for (size_t i = 0; i < tiles.size(); ++i) { |
230 const Tile* tile = tiles[i]; | 230 const Tile* tile = tiles[i]; |
231 ASSERT_TRUE(!!tile); | 231 ASSERT_TRUE(!!tile); |
232 EXPECT_EQ(tile->picture_pile(), pile); | 232 EXPECT_EQ(tile->picture_pile(), pile); |
233 EXPECT_TRUE(tile->content_rect().Intersects(tiling->live_tiles_rect())) | 233 EXPECT_TRUE(tile->content_rect().Intersects(tiling->live_tiles_rect())) |
234 << "All tiles must be inside the live tiles rect."; | 234 << "All tiles must be inside the live tiles rect."; |
235 } | 235 } |
236 | 236 |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
410 std::vector<Tile*> new_tiles = target_->tiling_at(0)->AllTilesForTesting(); | 410 std::vector<Tile*> new_tiles = target_->tiling_at(0)->AllTilesForTesting(); |
411 for (size_t i = 0; i < original_tiles.size(); ++i) { | 411 for (size_t i = 0; i < original_tiles.size(); ++i) { |
412 std::vector<Tile*>::iterator find = | 412 std::vector<Tile*>::iterator find = |
413 std::find(new_tiles.begin(), new_tiles.end(), original_tiles[i]); | 413 std::find(new_tiles.begin(), new_tiles.end(), original_tiles[i]); |
414 EXPECT_TRUE(find == new_tiles.end()); | 414 EXPECT_TRUE(find == new_tiles.end()); |
415 } | 415 } |
416 } | 416 } |
417 | 417 |
418 } // namespace | 418 } // namespace |
419 } // namespace cc | 419 } // namespace cc |
OLD | NEW |