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

Side by Side Diff: cc/tiles/gpu_image_decode_controller.cc

Issue 1910663002: Fix ImageUploadTaskImpl with null dependencies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@skskp
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 unified diff | Download patch
« no previous file with comments | « no previous file | cc/tiles/gpu_image_decode_controller_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/tiles/gpu_image_decode_controller.h" 5 #include "cc/tiles/gpu_image_decode_controller.h"
6 6
7 #include "base/memory/discardable_memory_allocator.h" 7 #include "base/memory/discardable_memory_allocator.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/numerics/safe_math.h" 9 #include "base/numerics/safe_math.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 ImageUploadTaskImpl(GpuImageDecodeController* controller, 103 ImageUploadTaskImpl(GpuImageDecodeController* controller,
104 const DrawImage& draw_image, 104 const DrawImage& draw_image,
105 scoped_refptr<TileTask> decode_dependency, 105 scoped_refptr<TileTask> decode_dependency,
106 uint64_t source_prepare_tiles_id) 106 uint64_t source_prepare_tiles_id)
107 : TileTask(false), 107 : TileTask(false),
108 controller_(controller), 108 controller_(controller),
109 image_(draw_image), 109 image_(draw_image),
110 image_ref_(draw_image.image()), 110 image_ref_(draw_image.image()),
111 source_prepare_tiles_id_(source_prepare_tiles_id) { 111 source_prepare_tiles_id_(source_prepare_tiles_id) {
112 DCHECK(!SkipImage(draw_image)); 112 DCHECK(!SkipImage(draw_image));
113 dependencies_.push_back(std::move(decode_dependency)); 113 if (decode_dependency) {
vmpstr 2016/04/20 22:26:44 nit: no braces Also, the unittest makes it clear,
ericrk 2016/04/20 22:34:45 Done.
114 dependencies_.push_back(std::move(decode_dependency));
115 }
114 } 116 }
115 117
116 // Override from Task: 118 // Override from Task:
117 void RunOnWorkerThread() override { 119 void RunOnWorkerThread() override {
118 TRACE_EVENT2("cc", "ImageUploadTaskImpl::RunOnWorkerThread", "mode", "gpu", 120 TRACE_EVENT2("cc", "ImageUploadTaskImpl::RunOnWorkerThread", "mode", "gpu",
119 "source_prepare_tiles_id", source_prepare_tiles_id_); 121 "source_prepare_tiles_id", source_prepare_tiles_id_);
120 controller_->UploadImage(image_); 122 controller_->UploadImage(image_);
121 } 123 }
122 124
123 void ScheduleOnOriginThread(RasterBufferProvider* provider) override {} 125 void ScheduleOnOriginThread(RasterBufferProvider* provider) override {}
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 } 739 }
738 740
739 SkImageInfo GpuImageDecodeController::CreateImageInfoForDrawImage( 741 SkImageInfo GpuImageDecodeController::CreateImageInfoForDrawImage(
740 const DrawImage& draw_image) const { 742 const DrawImage& draw_image) const {
741 return SkImageInfo::Make( 743 return SkImageInfo::Make(
742 draw_image.image()->width(), draw_image.image()->height(), 744 draw_image.image()->width(), draw_image.image()->height(),
743 ResourceFormatToClosestSkColorType(format_), kPremul_SkAlphaType); 745 ResourceFormatToClosestSkColorType(format_), kPremul_SkAlphaType);
744 } 746 }
745 747
746 } // namespace cc 748 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/tiles/gpu_image_decode_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698