Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3578)

Unified Diff: cc/layers/picture_layer_impl.cc

Issue 1418573002: cc: Add image decode control in the compositor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/playback/decoded_draw_image.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/playback/decoded_draw_image.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698