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

Unified Diff: cc/test/fake_picture_layer_impl.cc

Issue 1108773003: Revert of cc: Remove tile sharing from tilings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « cc/resources/tiling_set_raster_queue_required.cc ('k') | cc/trees/layer_tree_host_unittest_picture.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/fake_picture_layer_impl.cc
diff --git a/cc/test/fake_picture_layer_impl.cc b/cc/test/fake_picture_layer_impl.cc
index dba0c6e300a1d636231f8137a89adc5f5d6bdaec..75f7fdafa4f1a927ae87d7437a1e82be297f235c 100644
--- a/cc/test/fake_picture_layer_impl.cc
+++ b/cc/test/fake_picture_layer_impl.cc
@@ -148,6 +148,9 @@
}
void FakePictureLayerImpl::SetAllTilesVisible() {
+ WhichTree tree =
+ layer_tree_impl()->IsActiveTree() ? ACTIVE_TREE : PENDING_TREE;
+
for (size_t tiling_idx = 0; tiling_idx < tilings_->num_tilings();
++tiling_idx) {
PictureLayerTiling* tiling = tilings_->tiling_at(tiling_idx);
@@ -158,7 +161,7 @@
priority.resolution = HIGH_RESOLUTION;
priority.priority_bin = TilePriority::NOW;
priority.distance_to_visible = 0.f;
- tile->set_priority(priority);
+ tile->SetPriority(tree, priority);
}
}
}
@@ -170,7 +173,8 @@
std::vector<Tile*> tiles = tiling->AllTilesForTesting();
for (size_t tile_idx = 0; tile_idx < tiles.size(); ++tile_idx) {
Tile* tile = tiles[tile_idx];
- tile->set_priority(TilePriority());
+ tile->SetPriority(ACTIVE_TREE, TilePriority());
+ tile->SetPriority(PENDING_TREE, TilePriority());
}
}
}
@@ -256,14 +260,16 @@
if (!layer_tree_impl()->IsPendingTree())
return 0;
- return CountTilesRequired(&PictureLayerTiling::IsTileRequiredForActivation);
+ return CountTilesRequired(
+ &PictureLayerTiling::IsTileRequiredForActivationIfVisible);
}
size_t FakePictureLayerImpl::CountTilesRequiredForDraw() const {
if (!layer_tree_impl()->IsActiveTree())
return 0;
- return CountTilesRequired(&PictureLayerTiling::IsTileRequiredForDraw);
+ return CountTilesRequired(
+ &PictureLayerTiling::IsTileRequiredForDrawIfVisible);
}
void FakePictureLayerImpl::ReleaseResources() {
« no previous file with comments | « cc/resources/tiling_set_raster_queue_required.cc ('k') | cc/trees/layer_tree_host_unittest_picture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698