diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-09-03 13:32:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-01 14:31:55 +0200 |
| commit | 21ba0c5d4bf8fba15dddd97cd693bad2358b77fd (patch) | |
| tree | 91be119f694044dfc1ff9fdc054459e925de9df0 /chromium/cc/tiles/software_image_decode_cache.cc | |
| parent | 03c549e0392f92c02536d3f86d5e1d8dfa3435ac (diff) | |
BASELINE: Update Chromium to 92.0.4515.166
Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364
Diffstat (limited to 'chromium/cc/tiles/software_image_decode_cache.cc')
| -rw-r--r-- | chromium/cc/tiles/software_image_decode_cache.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/cc/tiles/software_image_decode_cache.cc b/chromium/cc/tiles/software_image_decode_cache.cc index d7e6678eead..5df593a29cf 100644 --- a/chromium/cc/tiles/software_image_decode_cache.cc +++ b/chromium/cc/tiles/software_image_decode_cache.cc @@ -361,7 +361,7 @@ SoftwareImageDecodeCache::DecodeImageIfNecessary(const CacheKey& key, } else { // Attempt to find a cached decode to generate a scaled/subrected decode // from. - base::Optional<CacheKey> candidate_key = FindCachedCandidate(key); + absl::optional<CacheKey> candidate_key = FindCachedCandidate(key); SkISize desired_size = gfx::SizeToSkISize(key.target_size()); const bool should_decode_to_scale = @@ -415,7 +415,7 @@ SoftwareImageDecodeCache::DecodeImageIfNecessary(const CacheKey& key, ? SkIRect::MakeWH(paint_image.width(), paint_image.height()) : gfx::RectToSkIRect(key.src_rect()); DrawImage candidate_draw_image( - paint_image, false, src_rect, kNone_SkFilterQuality, SkMatrix::I(), + paint_image, false, src_rect, kNone_SkFilterQuality, SkM44(), key.frame_key().frame_index(), key.target_color_space()); candidate_key.emplace(CacheKey::FromDrawImage( candidate_draw_image, @@ -469,7 +469,7 @@ SoftwareImageDecodeCache::DecodeImageIfNecessary(const CacheKey& key, return TaskProcessingResult::kFullDecode; } -base::Optional<SoftwareImageDecodeCache::CacheKey> +absl::optional<SoftwareImageDecodeCache::CacheKey> SoftwareImageDecodeCache::FindCachedCandidate(const CacheKey& key) { auto image_keys_it = frame_key_to_image_keys_.find(key.frame_key()); // We know that we must have at least our own |entry| in this list, so it @@ -503,7 +503,7 @@ SoftwareImageDecodeCache::FindCachedCandidate(const CacheKey& key) { } } - return base::nullopt; + return absl::nullopt; } bool SoftwareImageDecodeCache::UseCacheForDrawImage( |