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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/picture_layer_impl_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
« cc/base/tiling_data.cc ('K') | « cc/layers/picture_layer.cc ('k') | cc/layers/picture_layer_unittest.cc » ('j') | cc/layers/picture_layer_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/picture_layer_impl_unittest.cc
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 5079c5eec59e15934ccfb7471a278088c5104c0c..b8395dc76ada99a5da91f6f40b869c38a3212000 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -75,7 +75,7 @@ class PictureLayerImplTest : 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() {
@@ -95,10 +95,12 @@ class PictureLayerImplTest : 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 CreateHighLowResAndSetAllTilesVisible() {
@@ -121,14 +123,15 @@ class PictureLayerImplTest : public testing::Test {
}
void SetupPendingTree(
- scoped_refptr<PicturePileImpl> pile) {
+ 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);
enne (OOO) 2014/04/11 20:19:51 Maybe don't add another parameter here, and just m
ernstm 2014/04/11 23:43:51 Done. Added a separate CreateWithPartialPile for p
pending_layer->SetDrawsContent(true);
pending_tree->SetRootLayer(pending_layer.PassAs<LayerImpl>());
@@ -141,7 +144,7 @@ class PictureLayerImplTest : public testing::Test {
const PictureLayerTiling* tiling,
PicturePileImpl* pile) {
for (PictureLayerTiling::CoverageIterator
- iter(tiling, tiling->contents_scale(), tiling->ContentRect());
+ iter(tiling, tiling->contents_scale(), tiling->TilingRect());
iter;
++iter) {
EXPECT_TRUE(*iter);
@@ -205,7 +208,7 @@ class PictureLayerImplTest : public testing::Test {
scoped_refptr<FakePicturePileImpl> active_pile =
FakePicturePileImpl::CreateFilledPile(layer_size, layer_size);
- SetupTrees(pending_pile, active_pile);
+ SetupTrees(pending_pile, active_pile, layer_size, layer_size);
float result_scale_x, result_scale_y;
gfx::Size result_bounds;
@@ -275,7 +278,7 @@ TEST_F(PictureLayerImplTest, CloneNoInvalidation) {
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);
Region invalidation;
AddDefaultTilingsWithInvalidation(invalidation);
@@ -298,7 +301,7 @@ TEST_F(PictureLayerImplTest, TileManagerRegisterUnregister) {
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);
std::vector<TileManager::PairedPictureLayer> paired_layers;
host_impl_.tile_manager()->GetPairedPictureLayers(&paired_layers);
@@ -377,7 +380,7 @@ TEST_F(PictureLayerImplTest, SuppressUpdateTilePriorities) {
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);
Region invalidation;
AddDefaultTilingsWithInvalidation(invalidation);
@@ -431,7 +434,7 @@ TEST_F(PictureLayerImplTest, ClonePartialInvalidation) {
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);
Region invalidation(layer_invalidation);
AddDefaultTilingsWithInvalidation(invalidation);
@@ -446,7 +449,7 @@ TEST_F(PictureLayerImplTest, ClonePartialInvalidation) {
for (PictureLayerTiling::CoverageIterator
iter(tiling,
tiling->contents_scale(),
- tiling->ContentRect());
+ tiling->TilingRect());
iter;
++iter) {
EXPECT_TRUE(*iter);
@@ -468,7 +471,7 @@ TEST_F(PictureLayerImplTest, CloneFullInvalidation) {
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);
Region invalidation((gfx::Rect(layer_bounds)));
AddDefaultTilingsWithInvalidation(invalidation);
@@ -493,7 +496,8 @@ TEST_F(PictureLayerImplTest, NoInvalidationBoundsChange) {
scoped_refptr<FakePicturePileImpl> active_pile =
FakePicturePileImpl::CreateFilledPile(tile_size, active_layer_bounds);
- SetupTrees(pending_pile, active_pile);
+ SetupTrees(pending_pile, active_pile,
+ active_layer_bounds, pending_layer_bounds);
pending_layer_->set_fixed_tile_size(gfx::Size(100, 100));
Region invalidation;
@@ -509,7 +513,7 @@ TEST_F(PictureLayerImplTest, NoInvalidationBoundsChange) {
for (PictureLayerTiling::CoverageIterator
iter(tiling,
tiling->contents_scale(),
- tiling->ContentRect());
+ tiling->TilingRect());
iter;
++iter) {
EXPECT_TRUE(*iter);
@@ -553,7 +557,7 @@ TEST_F(PictureLayerImplTest, AddTilesFromNewRecording) {
}
}
- SetupTrees(pending_pile, active_pile);
+ SetupTrees(pending_pile, active_pile, layer_bounds, layer_bounds);
Region invalidation;
AddDefaultTilingsWithInvalidation(invalidation);
@@ -565,7 +569,7 @@ TEST_F(PictureLayerImplTest, AddTilesFromNewRecording) {
for (PictureLayerTiling::CoverageIterator
iter(tiling,
tiling->contents_scale(),
- tiling->ContentRect());
+ tiling->TilingRect());
iter;
++iter) {
EXPECT_FALSE(iter.full_tile_geometry_rect().IsEmpty());
@@ -597,7 +601,7 @@ TEST_F(PictureLayerImplTest, ManageTilingsWithNoRecording) {
float result_scale_x, result_scale_y;
gfx::Size result_bounds;
- SetupTrees(pending_pile, active_pile);
+ SetupTrees(pending_pile, active_pile, layer_bounds, layer_bounds);
pending_layer_->CalculateContentsScale(
1.f, 1.f, 1.f, false, &result_scale_x, &result_scale_y, &result_bounds);
@@ -617,7 +621,7 @@ TEST_F(PictureLayerImplTest, ManageTilingsCreatesTilings) {
float result_scale_x, result_scale_y;
gfx::Size result_bounds;
- SetupTrees(pending_pile, active_pile);
+ SetupTrees(pending_pile, active_pile, layer_bounds, layer_bounds);
EXPECT_EQ(0u, pending_layer_->tilings()->num_tilings());
float low_res_factor = host_impl_.settings().low_res_contents_scale_factor;
@@ -727,7 +731,7 @@ TEST_F(PictureLayerImplTest, CreateTilingsEvenIfTwinHasNone) {
float result_scale_x, result_scale_y;
gfx::Size result_bounds;
- SetupPendingTree(valid_pile);
+ SetupPendingTree(valid_pile, layer_bounds);
pending_layer_->CalculateContentsScale(high_res_scale,
device_scale,
page_scale,
@@ -742,7 +746,7 @@ TEST_F(PictureLayerImplTest, CreateTilingsEvenIfTwinHasNone) {
pending_layer_->LowResTiling()->contents_scale());
ActivateTree();
- SetupPendingTree(empty_pile);
+ SetupPendingTree(empty_pile, layer_bounds);
pending_layer_->CalculateContentsScale(high_res_scale,
device_scale,
page_scale,
@@ -763,7 +767,7 @@ TEST_F(PictureLayerImplTest, CreateTilingsEvenIfTwinHasNone) {
&result_bounds);
ASSERT_EQ(0u, active_layer_->tilings()->num_tilings());
- SetupPendingTree(valid_pile);
+ SetupPendingTree(valid_pile, layer_bounds);
pending_layer_->CalculateContentsScale(high_res_scale,
device_scale,
page_scale,
@@ -789,7 +793,7 @@ TEST_F(PictureLayerImplTest, ZoomOutCrash) {
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);
EXPECT_EQ(0u, active_layer_->tilings()->num_tilings());
SetContentsScaleOnBothLayers(32.0f, 1.0f, 32.0f, false);
host_impl_.PinchGestureBegin();
@@ -808,7 +812,7 @@ TEST_F(PictureLayerImplTest, PinchGestureTilings) {
FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
// Set up the high and low res tilings before pinch zoom.
- SetupTrees(pending_pile, active_pile);
+ SetupTrees(pending_pile, active_pile, layer_bounds, layer_bounds);
EXPECT_EQ(0u, active_layer_->tilings()->num_tilings());
SetContentsScaleOnBothLayers(1.0f, 1.0f, 1.0f, false);
float low_res_factor = host_impl_.settings().low_res_contents_scale_factor;
@@ -869,7 +873,7 @@ TEST_F(PictureLayerImplTest, CleanUpTilings) {
gfx::Size result_bounds;
std::vector<PictureLayerTiling*> used_tilings;
- SetupTrees(pending_pile, active_pile);
+ SetupTrees(pending_pile, active_pile, layer_bounds, layer_bounds);
EXPECT_EQ(0u, pending_layer_->tilings()->num_tilings());
float low_res_factor = host_impl_.settings().low_res_contents_scale_factor;
@@ -1085,7 +1089,7 @@ TEST_F(PictureLayerImplTest, ReleaseResources) {
float result_scale_x, result_scale_y;
gfx::Size result_bounds;
- SetupTrees(pending_pile, active_pile);
+ SetupTrees(pending_pile, active_pile, layer_bounds, layer_bounds);
EXPECT_EQ(0u, pending_layer_->tilings()->num_tilings());
pending_layer_->CalculateContentsScale(1.3f, // ideal contents scale
@@ -1127,7 +1131,7 @@ TEST_F(PictureLayerImplTest, ClampTilesToToMaxTileSize) {
float result_scale_x, result_scale_y;
gfx::Size result_bounds;
- SetupTrees(pending_pile, active_pile);
+ SetupTrees(pending_pile, active_pile, layer_bounds, layer_bounds);
EXPECT_EQ(0u, pending_layer_->tilings()->num_tilings());
pending_layer_->CalculateContentsScale(
@@ -1179,7 +1183,7 @@ TEST_F(PictureLayerImplTest, ClampSingleTileToToMaxTileSize) {
float result_scale_x, result_scale_y;
gfx::Size result_bounds;
- SetupTrees(pending_pile, active_pile);
+ SetupTrees(pending_pile, active_pile, layer_bounds, layer_bounds);
EXPECT_EQ(0u, pending_layer_->tilings()->num_tilings());
pending_layer_->CalculateContentsScale(
@@ -1234,7 +1238,7 @@ TEST_F(PictureLayerImplTest, DisallowTileDrawQuads) {
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);
active_layer_->SetContentBounds(layer_bounds);
active_layer_->draw_properties().visible_content_rect =
@@ -1262,7 +1266,7 @@ TEST_F(PictureLayerImplTest, MarkRequiredNullTiles) {
// Layers with entirely empty piles can't get tilings.
pending_pile->AddRecordingAt(0, 0);
- SetupPendingTree(pending_pile);
+ SetupPendingTree(pending_pile, layer_bounds);
ASSERT_TRUE(pending_layer_->CanHaveTilings());
pending_layer_->AddTiling(1.0f);
@@ -1280,7 +1284,7 @@ TEST_F(PictureLayerImplTest, MarkRequiredOffscreenTiles) {
scoped_refptr<FakePicturePileImpl> pending_pile =
FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
- SetupPendingTree(pending_pile);
+ SetupPendingTree(pending_pile, layer_bounds);
pending_layer_->set_fixed_tile_size(tile_size);
ASSERT_TRUE(pending_layer_->CanHaveTilings());
@@ -1407,7 +1411,7 @@ TEST_F(PictureLayerImplTest, NothingRequiredIfActiveMissingTiles) {
scoped_refptr<FakePicturePileImpl> active_pile =
FakePicturePileImpl::CreateEmptyPileThatThinksItHasRecordings(
tile_size, layer_bounds);
- SetupTrees(pending_pile, active_pile);
+ SetupTrees(pending_pile, active_pile, layer_bounds, layer_bounds);
pending_layer_->set_fixed_tile_size(tile_size);
active_layer_->set_fixed_tile_size(tile_size);
@@ -1432,7 +1436,7 @@ TEST_F(PictureLayerImplTest, HighResRequiredIfActiveCantHaveTiles) {
FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
scoped_refptr<FakePicturePileImpl> active_pile =
FakePicturePileImpl::CreateEmptyPile(tile_size, layer_bounds);
- SetupTrees(pending_pile, active_pile);
+ SetupTrees(pending_pile, active_pile, layer_bounds, layer_bounds);
pending_layer_->set_fixed_tile_size(tile_size);
active_layer_->set_fixed_tile_size(tile_size);
@@ -1460,7 +1464,8 @@ TEST_F(PictureLayerImplTest, ActivateUninitializedLayer) {
LayerTreeImpl* pending_tree = host_impl_.pending_tree();
scoped_ptr<FakePictureLayerImpl> pending_layer =
- FakePictureLayerImpl::CreateWithPile(pending_tree, id_, pending_pile);
+ FakePictureLayerImpl::CreateWithPile(pending_tree, id_, pending_pile,
+ layer_bounds);
pending_layer->SetDrawsContent(true);
pending_tree->SetRootLayer(pending_layer.PassAs<LayerImpl>());
@@ -1603,7 +1608,7 @@ class DeferredInitPictureLayerImplTest : public PictureLayerImplTest {
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);
}
};
@@ -1770,7 +1775,7 @@ TEST_F(PictureLayerImplTest, LayerRasterTileIterator) {
scoped_refptr<FakePicturePileImpl> pending_pile =
FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
- SetupPendingTree(pending_pile);
+ SetupPendingTree(pending_pile, layer_bounds);
ASSERT_TRUE(pending_layer_->CanHaveTilings());
« cc/base/tiling_data.cc ('K') | « cc/layers/picture_layer.cc ('k') | cc/layers/picture_layer_unittest.cc » ('j') | cc/layers/picture_layer_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698