| Index: cc/layers/picture_layer_impl.cc
|
| diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
|
| index b3a095f5c5a01d0a408707fca288f15534937fe1..4a27984645599771726ace783feabf3fa2305aa4 100644
|
| --- a/cc/layers/picture_layer_impl.cc
|
| +++ b/cc/layers/picture_layer_impl.cc
|
| @@ -118,15 +118,14 @@ void PictureLayerImpl::PushPropertiesTo(LayerImpl* base_layer) {
|
|
|
| // Tilings would be expensive to push, so we swap.
|
| layer_impl->tilings_.swap(tilings_);
|
| + layer_impl->tilings_->SetClient(layer_impl);
|
| + if (tilings_)
|
| + tilings_->SetClient(this);
|
|
|
| // Remove invalidated tiles from what will become a recycle tree.
|
| if (tilings_)
|
| tilings_->RemoveTilesInRegion(invalidation_);
|
|
|
| - layer_impl->tilings_->SetClient(layer_impl);
|
| - if (tilings_)
|
| - tilings_->SetClient(this);
|
| -
|
| layer_impl->raster_page_scale_ = raster_page_scale_;
|
| layer_impl->raster_device_scale_ = raster_device_scale_;
|
| layer_impl->raster_source_scale_ = raster_source_scale_;
|
|
|