| Index: cc/tiles/software_image_decode_cache.cc
|
| diff --git a/cc/tiles/software_image_decode_cache.cc b/cc/tiles/software_image_decode_cache.cc
|
| index cc1f54fbda0c091f355f0c3a75c338d715879b3e..a4694530f2f0c5c1483fd7d27aabc8a56172fbc7 100644
|
| --- a/cc/tiles/software_image_decode_cache.cc
|
| +++ b/cc/tiles/software_image_decode_cache.cc
|
| @@ -113,7 +113,8 @@ class ImageDecodeTaskImpl : public TileTask {
|
| tracing_info_.prepare_tiles_id);
|
| devtools_instrumentation::ScopedImageDecodeTask image_decode_task(
|
| image_.image().get(),
|
| - devtools_instrumentation::ScopedImageDecodeTask::SOFTWARE);
|
| + devtools_instrumentation::ScopedImageDecodeTask::SOFTWARE,
|
| + ImageDecodeCache::ToScopedDecodeTaskType(tracing_info_.type));
|
| cache_->DecodeImage(image_key_, image_, task_type_);
|
| }
|
|
|
| @@ -227,15 +228,19 @@ bool SoftwareImageDecodeCache::GetTaskForImageAndRef(
|
| const DrawImage& image,
|
| const TracingInfo& tracing_info,
|
| scoped_refptr<TileTask>* task) {
|
| + DCHECK_EQ(tracing_info.type, ImageDecodeType::IN_RASTER);
|
| return GetTaskForImageAndRefInternal(
|
| image, tracing_info, DecodeTaskType::USE_IN_RASTER_TASKS, task);
|
| }
|
|
|
| bool SoftwareImageDecodeCache::GetOutOfRasterDecodeTaskForImageAndRef(
|
| const DrawImage& image,
|
| + ImageDecodeType decode_type,
|
| scoped_refptr<TileTask>* task) {
|
| - return GetTaskForImageAndRefInternal(
|
| - image, TracingInfo(), DecodeTaskType::USE_OUT_OF_RASTER_TASKS, task);
|
| + DCHECK_NE(decode_type, ImageDecodeType::IN_RASTER);
|
| + return GetTaskForImageAndRefInternal(image, TracingInfo(decode_type),
|
| + DecodeTaskType::USE_OUT_OF_RASTER_TASKS,
|
| + task);
|
| }
|
|
|
| bool SoftwareImageDecodeCache::GetTaskForImageAndRefInternal(
|
|
|