Index: cc/layers/picture_layer_impl.cc |
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc |
index 04ac9ad59a79c3a74c35881d8e1e9a5ed4096ee6..3caa20721de2b29b1a09262cae941b025117fac2 100644 |
--- a/cc/layers/picture_layer_impl.cc |
+++ b/cc/layers/picture_layer_impl.cc |
@@ -551,6 +551,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(); |