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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
223 EXPECT_TRUE(tiling->live_tiles_rect().IsEmpty()); | 223 EXPECT_TRUE(tiling->live_tiles_rect().IsEmpty()); |
224 else if (!tiling->live_tiles_rect().IsEmpty()) | 224 else if (!tiling->live_tiles_rect().IsEmpty()) |
225 EXPECT_TRUE(tiling->TilingRect().Contains(tiling->live_tiles_rect())); | 225 EXPECT_TRUE(tiling->TilingRect().Contains(tiling->live_tiles_rect())); |
226 | 226 |
227 std::vector<Tile*> tiles = tiling->AllTilesForTesting(); | 227 std::vector<Tile*> tiles = tiling->AllTilesForTesting(); |
228 for (size_t i = 0; i < tiles.size(); ++i) { | 228 for (size_t i = 0; i < tiles.size(); ++i) { |
229 const Tile* tile = tiles[i]; | 229 const Tile* tile = tiles[i]; |
230 ASSERT_TRUE(!!tile); | 230 ASSERT_TRUE(!!tile); |
231 EXPECT_EQ(tile->picture_pile(), pile); | 231 EXPECT_EQ(tile->picture_pile(), pile); |
232 EXPECT_TRUE(tile->content_rect().Intersects(tiling->live_tiles_rect())) | 232 EXPECT_TRUE(tile->content_rect().Intersects(tiling->live_tiles_rect())) |
233 << "All tiles must be inside the live tiles rect."; | 233 << "All tiles must be inside the live tiles rect." |
234 << " Tile rect: " << tile->content_rect().ToString() | |
235 << " Live rect: " << tiling->live_tiles_rect().ToString() | |
236 << " Scale: " << tiling->contents_scale(); | |
234 } | 237 } |
235 | 238 |
236 for (PictureLayerTiling::CoverageIterator iter( | 239 for (PictureLayerTiling::CoverageIterator iter( |
237 tiling, tiling->contents_scale(), tiling->live_tiles_rect()); | 240 tiling, tiling->contents_scale(), tiling->live_tiles_rect()); |
238 iter; | 241 iter; |
239 ++iter) { | 242 ++iter) { |
240 EXPECT_TRUE(*iter) << "The live tiles rect must be full."; | 243 EXPECT_TRUE(*iter) << "The live tiles rect must be full."; |
241 } | 244 } |
242 } | 245 } |
243 | 246 |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
280 std::vector<Tile*> tiles = tiling->AllTilesForTesting(); | 283 std::vector<Tile*> tiles = tiling->AllTilesForTesting(); |
281 for (size_t i = 0; i < tiles.size(); ++i) { | 284 for (size_t i = 0; i < tiles.size(); ++i) { |
282 if (tiles[i]->content_rect().origin() == gfx::Point()) | 285 if (tiles[i]->content_rect().origin() == gfx::Point()) |
283 return tiles[i]; | 286 return tiles[i]; |
284 } | 287 } |
285 return NULL; | 288 return NULL; |
286 } | 289 } |
287 | 290 |
288 TEST_F(PictureLayerTilingSetSyncTest, KeepExisting) { | 291 TEST_F(PictureLayerTilingSetSyncTest, KeepExisting) { |
289 float source_scales[] = {0.7f, 1.f, 1.1f, 2.f}; | 292 float source_scales[] = {0.7f, 1.f, 1.1f, 2.f}; |
290 for (size_t i = 0; i < arraysize(source_scales); ++i) | 293 for (size_t i = 1; i < arraysize(source_scales); ++i) |
enne (OOO)
2014/07/11 00:12:04
Can you help me understand this?
danakj
2014/07/11 17:06:16
Shouldn't be there.
| |
291 source_->AddTiling(source_scales[i]); | 294 source_->AddTiling(source_scales[i]); |
292 float target_scales[] = {0.5f, 1.f, 2.f}; | 295 float target_scales[] = {0.5f, 1.f, 2.f}; |
293 for (size_t i = 0; i < arraysize(target_scales); ++i) | 296 for (size_t i = 1; i < arraysize(target_scales); ++i) |
294 target_->AddTiling(target_scales[i]); | 297 target_->AddTiling(target_scales[i]); |
295 | 298 |
296 PictureLayerTiling* tiling1 = source_->TilingAtScale(1.f); | 299 PictureLayerTiling* tiling1 = source_->TilingAtScale(1.f); |
297 ASSERT_TRUE(tiling1); | 300 ASSERT_TRUE(tiling1); |
298 tiling1->CreateAllTilesForTesting(); | 301 tiling1->CreateAllTilesForTesting(); |
299 EXPECT_EQ(tiling1->contents_scale(), 1.f); | 302 EXPECT_EQ(tiling1->contents_scale(), 1.f); |
300 Tile* tile1 = FindTileAtOrigin(tiling1); | 303 Tile* tile1 = FindTileAtOrigin(tiling1); |
301 ASSERT_TRUE(tile1); | 304 ASSERT_TRUE(tile1); |
302 | 305 |
303 PictureLayerTiling* tiling2 = source_->TilingAtScale(2.f); | 306 PictureLayerTiling* tiling2 = source_->TilingAtScale(2.f); |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
409 std::vector<Tile*> new_tiles = target_->tiling_at(0)->AllTilesForTesting(); | 412 std::vector<Tile*> new_tiles = target_->tiling_at(0)->AllTilesForTesting(); |
410 for (size_t i = 0; i < original_tiles.size(); ++i) { | 413 for (size_t i = 0; i < original_tiles.size(); ++i) { |
411 std::vector<Tile*>::iterator find = | 414 std::vector<Tile*>::iterator find = |
412 std::find(new_tiles.begin(), new_tiles.end(), original_tiles[i]); | 415 std::find(new_tiles.begin(), new_tiles.end(), original_tiles[i]); |
413 EXPECT_TRUE(find == new_tiles.end()); | 416 EXPECT_TRUE(find == new_tiles.end()); |
414 } | 417 } |
415 } | 418 } |
416 | 419 |
417 } // namespace | 420 } // namespace |
418 } // namespace cc | 421 } // namespace cc |
OLD | NEW |