Index: cc/layers/picture_layer_impl.cc |
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc |
index 94c3d201639d0dd90a29545ba18ca067f43edd8a..8d08bbc48e123cdf15b2d350a226411eb5bb5adb 100644 |
--- a/cc/layers/picture_layer_impl.cc |
+++ b/cc/layers/picture_layer_impl.cc |
@@ -676,7 +676,12 @@ void PictureLayerImpl::SyncTiling( |
return; |
tilings_->AddTiling(tiling->contents_scale()); |
- if (!layer_tree_impl()->needs_update_draw_properties()) { |
+ // If this tree needs update draw properties, then the tiling will |
+ // get updated prior to drawing or activation. If this tree does not |
+ // need update draw properties, then its transforms are up to date and |
+ // we can create tiles for this tiling immediately. |
+ if (!layer_tree_impl()->needs_update_draw_properties() && |
+ should_update_tile_priorities_) { |
// When the tree is up to date, the set of tilings must either be empty or |
// contain at least one high resolution tiling. (If it is up to date, |
// then it would be invalid to sync a tiling if it is the first tiling |
@@ -684,15 +689,9 @@ void PictureLayerImpl::SyncTiling( |
SanityCheckTilingState(); |
// TODO(enne): temporary sanity CHECK for http://crbug.com/358350 |
CHECK_GT(tilings_->num_tilings(), 1u); |
- } |
- // If this tree needs update draw properties, then the tiling will |
- // get updated prior to drawing or activation. If this tree does not |
- // need update draw properties, then its transforms are up to date and |
- // we can create tiles for this tiling immediately. |
- if (!layer_tree_impl()->needs_update_draw_properties() && |
- should_update_tile_priorities_) |
UpdateTilePriorities(); |
+ } |
} |
void PictureLayerImpl::SetIsMask(bool is_mask) { |