Chromium Code Reviews| Index: cc/layers/picture_layer.cc |
| diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc |
| index ca4033f6c39d7e8fabb35b7c0c10d8673f5dc62d..027274a1fad6c69726a56b535d44ed4241a7fe0d 100644 |
| --- a/cc/layers/picture_layer.cc |
| +++ b/cc/layers/picture_layer.cc |
| @@ -41,12 +41,13 @@ void PictureLayer::PushPropertiesTo(LayerImpl* base_layer) { |
| // Using layer_impl because either bounds() or paint_properties().bounds |
| // may disagree and either one could have been pushed to layer_impl. |
| pile_->SetEmptyBounds(); |
| - } else if (update_source_frame_number_ == |
| - layer_tree_host()->source_frame_number()) { |
| + } else { |
| // TODO(ernstm): This DCHECK is only valid as long as the pile's tiling_rect |
|
vmpstr
2014/10/24 20:41:12
I'm not sure what the todo here is, it seems to be
danakj
2014/10/24 20:43:07
Ya.. not sure either.
danakj
2014/10/24 20:44:30
I think this is from when we were going to use non
enne (OOO)
2014/10/24 20:50:24
Yes, that's exactly it.
|
| // is identical to the layer_rect. |
| // If update called, then pile size must match bounds pushed to impl layer. |
| - DCHECK_EQ(layer_impl->bounds().ToString(), pile_->tiling_size().ToString()); |
| + DCHECK_IMPLIES( |
| + update_source_frame_number_ == layer_tree_host()->source_frame_number(), |
| + layer_impl->bounds().ToString() == pile_->tiling_size().ToString()); |
| } |
| // Unlike other properties, invalidation must always be set on layer_impl. |