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

Unified Diff: cc/tiles/gpu_image_decode_controller.cc

Issue 1912513003: cc: Fix regression in TileManager InsertNodeForDecodeTask(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@land_merge_tile_task_runner
Patch Set: Created 4 years, 8 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 | « no previous file | cc/tiles/tile_manager.cc » ('j') | cc/tiles/tile_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b6daab4ccfeac4a8a627aa6973ee84438ee20dc7..4dd75959d123857bfab625b520c9c6bbf1da10be 100644
--- a/cc/tiles/gpu_image_decode_controller.cc
+++ b/cc/tiles/gpu_image_decode_controller.cc
@@ -110,7 +110,11 @@ class ImageUploadTaskImpl : public TileTask {
image_ref_(skia::SharePtr(draw_image.image())),
source_prepare_tiles_id_(source_prepare_tiles_id) {
DCHECK(!SkipImage(draw_image));
- dependencies_.push_back(std::move(decode_dependency));
+ // For already-uploaded image, ImageDecodeTaskImpl is not created. The
+ // ImageUploadTaskImpl should hold valid decode dependency in
+ // |dependencies_|.
+ if (decode_dependency.get())
+ dependencies_.push_back(std::move(decode_dependency));
}
// Override from Task:
« no previous file with comments | « no previous file | cc/tiles/tile_manager.cc » ('j') | cc/tiles/tile_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698