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

Unified Diff: cc/layers/picture_layer_impl.cc

Issue 1149843002: cc: Remove recycled twin information from picture layer tiling set. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « no previous file | cc/layers/picture_layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/picture_layer_impl.cc
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 5c936220cfff34d2d336a24f9fb102070dab8db2..9e251e399bd32d68e28a7ea834721d80cbbfacef 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -490,12 +490,6 @@ PictureLayerImpl* PictureLayerImpl::GetPendingOrActiveTwinLayer() const {
return twin_layer_;
}
-PictureLayerImpl* PictureLayerImpl::GetRecycledTwinLayer() const {
- if (!twin_layer_ || twin_layer_->IsOnActiveOrPendingTree())
- return nullptr;
- return twin_layer_;
-}
-
void PictureLayerImpl::UpdateRasterSource(
scoped_refptr<RasterSource> raster_source,
Region* new_invalidation,
@@ -1037,19 +1031,9 @@ void PictureLayerImpl::CleanUpTilingsOnActiveLayer(
}
PictureLayerTilingSet* twin_set = twin ? twin->tilings_.get() : nullptr;
- // TODO(vmpstr): See if this step is required without tile sharing.
- PictureLayerImpl* recycled_twin = GetRecycledTwinLayer();
- PictureLayerTilingSet* recycled_twin_set =
- recycled_twin ? recycled_twin->tilings_.get() : nullptr;
-
- tilings_->CleanUpTilings(min_acceptable_high_res_scale,
- max_acceptable_high_res_scale, used_tilings,
- layer_tree_impl()->create_low_res_tiling(), twin_set,
- recycled_twin_set);
-
- if (recycled_twin_set && recycled_twin_set->num_tilings() == 0)
- recycled_twin->ResetRasterScale();
-
+ tilings_->CleanUpTilings(
+ min_acceptable_high_res_scale, max_acceptable_high_res_scale,
+ used_tilings, layer_tree_impl()->create_low_res_tiling(), twin_set);
DCHECK_GT(tilings_->num_tilings(), 0u);
SanityCheckTilingState();
}
@@ -1117,10 +1101,6 @@ bool PictureLayerImpl::CanHaveTilings() const {
void PictureLayerImpl::SanityCheckTilingState() const {
#if DCHECK_IS_ON()
- // Recycle tree doesn't have any restrictions.
- if (layer_tree_impl()->IsRecycleTree())
- return;
-
if (!CanHaveTilings()) {
DCHECK_EQ(0u, tilings_->num_tilings());
return;
« no previous file with comments | « no previous file | cc/layers/picture_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698