diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-02-04 17:20:24 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-02-12 08:15:25 +0000 |
| commit | 8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b (patch) | |
| tree | 788d8d7549712682703a0310ca4a0f0860d4802b /chromium/cc/tiles/software_image_decode_cache.cc | |
| parent | 606d85f2a5386472314d39923da28c70c60dc8e7 (diff) | |
BASELINE: Update Chromium to 98.0.4758.90
Change-Id: Ib7c41539bf8a8e0376bd639f27d68294de90f3c8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/cc/tiles/software_image_decode_cache.cc')
| -rw-r--r-- | chromium/cc/tiles/software_image_decode_cache.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/chromium/cc/tiles/software_image_decode_cache.cc b/chromium/cc/tiles/software_image_decode_cache.cc index 16333b02ae2..587db407bf4 100644 --- a/chromium/cc/tiles/software_image_decode_cache.cc +++ b/chromium/cc/tiles/software_image_decode_cache.cc @@ -13,7 +13,9 @@ #include "base/bind.h" #include "base/debug/stack_trace.h" #include "base/format_macros.h" +#include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" +#include "base/numerics/ostream_operators.h" #include "base/strings/stringprintf.h" #include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/memory_dump_manager.h" @@ -47,9 +49,10 @@ class AutoRemoveKeyFromTaskMap { ~AutoRemoveKeyFromTaskMap() { task_map_->erase(key_); } private: - std::unordered_map<SoftwareImageDecodeCache::CacheKey, - scoped_refptr<TileTask>, - SoftwareImageDecodeCache::CacheKeyHash>* task_map_; + raw_ptr<std::unordered_map<SoftwareImageDecodeCache::CacheKey, + scoped_refptr<TileTask>, + SoftwareImageDecodeCache::CacheKeyHash>> + task_map_; const SoftwareImageDecodeCache::CacheKey& key_; }; @@ -104,7 +107,7 @@ class SoftwareImageDecodeTaskImpl : public TileTask { ~SoftwareImageDecodeTaskImpl() override = default; private: - SoftwareImageDecodeCache* cache_; + raw_ptr<SoftwareImageDecodeCache> cache_; SoftwareImageDecodeCache::CacheKey image_key_; PaintImage paint_image_; SoftwareImageDecodeCache::DecodeTaskType task_type_; @@ -141,7 +144,7 @@ SoftwareImageDecodeCache::SoftwareImageDecodeCache( SkColorType color_type, size_t locked_memory_limit_bytes, PaintImage::GeneratorClientId generator_client_id) - : decoded_images_(ImageMRUCache::NO_AUTO_EVICT), + : decoded_images_(ImageLRUCache::NO_AUTO_EVICT), locked_images_budget_(locked_memory_limit_bytes), color_type_(color_type), generator_client_id_(generator_client_id), |