Index: cc/resources/picture_layer_tiling_set.cc |
diff --git a/cc/resources/picture_layer_tiling_set.cc b/cc/resources/picture_layer_tiling_set.cc |
index d292d83fab2a53d05ba39d7ca579e3db11c2c0cc..267ee08ef4818fc44b56dd47fc58e9f8293f358b 100644 |
--- a/cc/resources/picture_layer_tiling_set.cc |
+++ b/cc/resources/picture_layer_tiling_set.cc |
@@ -324,10 +324,17 @@ void PictureLayerTilingSet::UpdateTilePriorities( |
gfx::Rect visible_layer_rect = gfx::ScaleToEnclosingRect( |
visible_content_rect, 1.f / layer_contents_scale); |
+ float max_layer_contents_scale = layer_contents_scale; |
enne (OOO)
2014/05/28 18:42:20
You should not need this. The scale used to be ma
sohanjg
2014/05/29 13:07:04
In LayerEvictionTileIterator test, tile->required_
|
+ for (size_t i = 0; i < this->num_tilings(); ++i) { |
+ const PictureLayerTiling* tiling = this->tiling_at(i); |
+ max_layer_contents_scale = |
+ std::max(max_layer_contents_scale, tiling->contents_scale()); |
+ } |
+ |
for (size_t i = 0; i < tilings_.size(); ++i) { |
tilings_[i]->UpdateTilePriorities(tree, |
visible_layer_rect, |
- layer_contents_scale, |
+ max_layer_contents_scale, |
current_frame_time_in_seconds); |
} |
} |