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

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

Issue 235753002: cc: Give TilingData a Rect instead of a Size (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Git cl format Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « cc/resources/picture_layer_tiling_set.cc ('k') | cc/resources/picture_layer_tiling_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 last_scale = target_tiling->contents_scale(); 212 last_scale = target_tiling->contents_scale();
213 } 213 }
214 } 214 }
215 215
216 for (size_t i = 0; i < target_->num_tilings(); ++i) 216 for (size_t i = 0; i < target_->num_tilings(); ++i)
217 ValidateTiling(target_->tiling_at(i), target_client_.pile()); 217 ValidateTiling(target_->tiling_at(i), target_client_.pile());
218 } 218 }
219 219
220 void ValidateTiling(const PictureLayerTiling* tiling, 220 void ValidateTiling(const PictureLayerTiling* tiling,
221 const PicturePileImpl* pile) const { 221 const PicturePileImpl* pile) const {
222 if (tiling->ContentRect().IsEmpty()) 222 if (tiling->TilingRect().IsEmpty())
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->ContentRect().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 } 234 }
235 235
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 std::vector<Tile*> new_tiles = target_->tiling_at(0)->AllTilesForTesting(); 409 std::vector<Tile*> new_tiles = target_->tiling_at(0)->AllTilesForTesting();
410 for (size_t i = 0; i < original_tiles.size(); ++i) { 410 for (size_t i = 0; i < original_tiles.size(); ++i) {
411 std::vector<Tile*>::iterator find = 411 std::vector<Tile*>::iterator find =
412 std::find(new_tiles.begin(), new_tiles.end(), original_tiles[i]); 412 std::find(new_tiles.begin(), new_tiles.end(), original_tiles[i]);
413 EXPECT_TRUE(find == new_tiles.end()); 413 EXPECT_TRUE(find == new_tiles.end());
414 } 414 }
415 } 415 }
416 416
417 } // namespace 417 } // namespace
418 } // namespace cc 418 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/picture_layer_tiling_set.cc ('k') | cc/resources/picture_layer_tiling_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698