| Index: cc/layers/picture_layer_impl.cc
|
| diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
|
| index 34357ff92a63f822b606a2577c80e7dc7dfceb9f..c0738d189a03680eee6f81b06509db5b12995d53 100644
|
| --- a/cc/layers/picture_layer_impl.cc
|
| +++ b/cc/layers/picture_layer_impl.cc
|
| @@ -539,6 +539,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();
|
|
|