| Index: cc/tiles/gpu_image_decode_controller.cc
|
| diff --git a/cc/tiles/gpu_image_decode_controller.cc b/cc/tiles/gpu_image_decode_controller.cc
|
| index 93a15d2e606c00e7ef29604b0ec807834bc11019..a9c26d4a06c18d0b51b88fe6f403f140edac863d 100644
|
| --- a/cc/tiles/gpu_image_decode_controller.cc
|
| +++ b/cc/tiles/gpu_image_decode_controller.cc
|
| @@ -107,7 +107,10 @@ class ImageUploadTaskImpl : public TileTask {
|
| image_(draw_image),
|
| source_prepare_tiles_id_(source_prepare_tiles_id) {
|
| DCHECK(!SkipImage(draw_image));
|
| - dependencies_.push_back(std::move(decode_dependency));
|
| + // If an image is already decoded and locked, we will not generate a
|
| + // decode task.
|
| + if (decode_dependency)
|
| + dependencies_.push_back(std::move(decode_dependency));
|
| }
|
|
|
| // Override from Task:
|
|
|