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

Unified Diff: cc/resources/tile_manager_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: 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 side-by-side diff with in-line comments
Download patch
Index: cc/resources/tile_manager_unittest.cc
diff --git a/cc/resources/tile_manager_unittest.cc b/cc/resources/tile_manager_unittest.cc
index 849f4a7f8ea5c77fb114315e8365ec7146482490..702745a0f5154a556aa2a20a05126ff8ff5cd0fc 100644
--- a/cc/resources/tile_manager_unittest.cc
+++ b/cc/resources/tile_manager_unittest.cc
@@ -680,7 +680,7 @@ class TileManagerTileIteratorTest : public testing::Test,
scoped_refptr<FakePicturePileImpl> active_pile =
FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
- SetupTrees(pending_pile, active_pile);
+ SetupTrees(pending_pile, active_pile, layer_bounds, layer_bounds);
}
void ActivateTree() {
@@ -699,20 +699,24 @@ class TileManagerTileIteratorTest : public testing::Test,
}
void SetupTrees(scoped_refptr<PicturePileImpl> pending_pile,
- scoped_refptr<PicturePileImpl> active_pile) {
- SetupPendingTree(active_pile);
+ scoped_refptr<PicturePileImpl> active_pile,
+ const gfx::Size& pending_layer_bounds,
+ const gfx::Size& active_layer_bounds) {
+ SetupPendingTree(active_pile, active_layer_bounds);
ActivateTree();
- SetupPendingTree(pending_pile);
+ SetupPendingTree(pending_pile, pending_layer_bounds);
}
- void SetupPendingTree(scoped_refptr<PicturePileImpl> pile) {
+ void SetupPendingTree(scoped_refptr<PicturePileImpl> pile,
+ const gfx::Size& layer_bounds) {
host_impl_.CreatePendingTree();
LayerTreeImpl* pending_tree = host_impl_.pending_tree();
// Clear recycled tree.
pending_tree->DetachLayerTree();
scoped_ptr<FakePictureLayerImpl> pending_layer =
- FakePictureLayerImpl::CreateWithPile(pending_tree, id_, pile);
+ FakePictureLayerImpl::CreateWithPile(
+ pending_tree, id_, pile, layer_bounds);
pending_layer->SetDrawsContent(true);
pending_tree->SetRootLayer(pending_layer.PassAs<LayerImpl>());

Powered by Google App Engine
This is Rietveld 408576698