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

Unified Diff: cc/tiles/picture_layer_tiling_set.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 | « cc/tiles/picture_layer_tiling_set.h ('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/tiles/picture_layer_tiling_set.cc
diff --git a/cc/tiles/picture_layer_tiling_set.cc b/cc/tiles/picture_layer_tiling_set.cc
index 1831539a793063ee819e07247acee81eddd32cac..1a69814a2f72882e3207a225169578eb5e099d09 100644
--- a/cc/tiles/picture_layer_tiling_set.cc
+++ b/cc/tiles/picture_layer_tiling_set.cc
@@ -194,8 +194,7 @@ void PictureLayerTilingSet::CleanUpTilings(
float max_acceptable_high_res_scale,
const std::vector<PictureLayerTiling*>& needed_tilings,
bool should_have_low_res,
- PictureLayerTilingSet* twin_set,
- PictureLayerTilingSet* recycled_twin_set) {
+ PictureLayerTilingSet* twin_set) {
float twin_low_res_scale = 0.f;
if (twin_set) {
PictureLayerTiling* tiling =
@@ -229,15 +228,6 @@ void PictureLayerTilingSet::CleanUpTilings(
}
for (auto* tiling : to_remove) {
- PictureLayerTiling* recycled_twin_tiling =
- recycled_twin_set
- ? recycled_twin_set->FindTilingWithScale(tiling->contents_scale())
- : nullptr;
- // Remove the tiling from the recycle tree. Note that we ignore resolution,
- // since we don't need to maintain high/low res on the recycle set.
- if (recycled_twin_tiling)
- recycled_twin_set->Remove(recycled_twin_tiling);
-
DCHECK_NE(HIGH_RESOLUTION, tiling->resolution());
Remove(tiling);
}
« no previous file with comments | « cc/tiles/picture_layer_tiling_set.h ('k') | cc/trees/layer_tree_host_unittest_picture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698