| Index: cc/layers/picture_layer_impl.cc
|
| diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
|
| index 405d68590da67bd73005aa601c48c66c0ad97627..5fdaaf9e339d06f52eb80edac6dec3d91125b102 100644
|
| --- a/cc/layers/picture_layer_impl.cc
|
| +++ b/cc/layers/picture_layer_impl.cc
|
| @@ -538,6 +538,12 @@ void PictureLayerImpl::UpdateRasterSource(
|
| bool could_have_tilings = raster_source_.get() && CanHaveTilings();
|
| raster_source_.swap(raster_source);
|
|
|
| + // Only set the image decode controller when we're committing.
|
| + if (!pending_set) {
|
| + raster_source_->SetImageDecodeController(
|
| + layer_tree_impl()->tile_manager()->GetImageDecodeController());
|
| + }
|
| +
|
| // The |new_invalidation| must be cleared before updating tilings since they
|
| // access the invalidation through the PictureLayerTilingClient interface.
|
| invalidation_.Clear();
|
|
|