Index: cc/layers/picture_layer_impl.cc |
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc |
index 0849c516bab58e63b183c957eb877e748f85187a..6d96a0867948b65ea0679c6d5f80d759e8e40a6c 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. |
enne (OOO)
2015/12/02 23:33:25
...for efficiency's sake? It'd still be set later,
vmpstr
2015/12/03 21:20:23
This effectively does just this. PictureLayer sets
|
+ 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(); |