commit 8841d123a5d378068d6d7666fe95abbbc8b4cba6
author Tom Sepez <tsepez@chromium.org> Sat Oct 22 00:37:56 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Oct 22 00:37:56 2022 +0000
tree 4e1805dc763ae761ec4809664dfd66b183ecf62a
parent 57a6f3d3db2cd6f8af342cf2ad5d3a261181f65f

Shorten CPDF_PageImageCache::ImageCacheEntry to Entry

Now that this class is named as "image cache" instead of "render cache",
the ImageClass part is redundant in the nested Entry class name.

Change-Id: I3fe88de6446e1c59622fcfc8a194e36f093169dd
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/99934
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

core/fpdfapi/page/cpdf_pageimagecache.cpp

diff --git a/core/fpdfapi/page/cpdf_pageimagecache.cpp b/core/fpdfapi/page/cpdf_pageimagecache.cpp
index dc8a12a..b4f0435 100644
--- a/core/fpdfapi/page/cpdf_pageimagecache.cpp
+++ b/core/fpdfapi/page/cpdf_pageimagecache.cpp
@@ -93,8 +93,7 @@
   if (m_bCurFindCache) {
     m_pCurImageCacheEntry = it->second.get();
   } else {
-    m_pCurImageCacheEntry =
-        std::make_unique<ImageCacheEntry>(std::move(pImage));
+    m_pCurImageCacheEntry = std::make_unique<Entry>(std::move(pImage));
   }
   CPDF_DIB::LoadState ret = m_pCurImageCacheEntry->StartGetCachedBitmap(
       this, pFormResources, pPageResources, bStdCS, eFamily, bLoadMask);
@@ -131,7 +130,7 @@
   if (it == m_ImageCache.end())
     return;
 
-  ImageCacheEntry* pEntry = it->second.get();
+  Entry* pEntry = it->second.get();
   m_nCacheSize -= pEntry->EstimateSize();
   pEntry->Reset();
   m_nCacheSize += pEntry->EstimateSize();
@@ -149,26 +148,25 @@
   return m_pCurImageCacheEntry->DetachMask();
 }
 
-CPDF_PageImageCache::ImageCacheEntry::ImageCacheEntry(
-    RetainPtr<CPDF_Image> pImage)
+CPDF_PageImageCache::Entry::Entry(RetainPtr<CPDF_Image> pImage)
     : m_pImage(std::move(pImage)) {}
 
-CPDF_PageImageCache::ImageCacheEntry::~ImageCacheEntry() = default;
+CPDF_PageImageCache::Entry::~Entry() = default;
 
-void CPDF_PageImageCache::ImageCacheEntry::Reset() {
+void CPDF_PageImageCache::Entry::Reset() {
   m_pCachedBitmap.Reset();
   CalcSize();
 }
 
-RetainPtr<CFX_DIBBase> CPDF_PageImageCache::ImageCacheEntry::DetachBitmap() {
+RetainPtr<CFX_DIBBase> CPDF_PageImageCache::Entry::DetachBitmap() {
   return std::move(m_pCurBitmap);
 }
 
-RetainPtr<CFX_DIBBase> CPDF_PageImageCache::ImageCacheEntry::DetachMask() {
+RetainPtr<CFX_DIBBase> CPDF_PageImageCache::Entry::DetachMask() {
   return std::move(m_pCurMask);
 }
 
-CPDF_DIB::LoadState CPDF_PageImageCache::ImageCacheEntry::StartGetCachedBitmap(
+CPDF_DIB::LoadState CPDF_PageImageCache::Entry::StartGetCachedBitmap(
     CPDF_PageImageCache* pPageImageCache,
     const CPDF_Dictionary* pFormResources,
     const CPDF_Dictionary* pPageResources,
@@ -194,7 +192,7 @@
   return CPDF_DIB::LoadState::kFail;
 }
 
-bool CPDF_PageImageCache::ImageCacheEntry::Continue(
+bool CPDF_PageImageCache::Entry::Continue(
     PauseIndicatorIface* pPause,
     CPDF_PageImageCache* pPageImageCache) {
   CPDF_DIB::LoadState ret =
@@ -209,7 +207,7 @@
   return false;
 }
 
-void CPDF_PageImageCache::ImageCacheEntry::ContinueGetCachedBitmap(
+void CPDF_PageImageCache::Entry::ContinueGetCachedBitmap(
     CPDF_PageImageCache* pPageImageCache) {
   m_MatteColor = m_pCurBitmap.As<CPDF_DIB>()->GetMatteColor();
   m_pCurMask = m_pCurBitmap.As<CPDF_DIB>()->DetachMask();
@@ -229,7 +227,7 @@
   CalcSize();
 }
 
-void CPDF_PageImageCache::ImageCacheEntry::CalcSize() {
+void CPDF_PageImageCache::Entry::CalcSize() {
   m_dwCacheSize = 0;
   if (m_pCachedBitmap)
     m_dwCacheSize += m_pCachedBitmap->GetEstimatedImageMemoryBurden();

core/fpdfapi/page/cpdf_pageimagecache.h

diff --git a/core/fpdfapi/page/cpdf_pageimagecache.h b/core/fpdfapi/page/cpdf_pageimagecache.h
index 7c489ff..b6dcae8 100644
--- a/core/fpdfapi/page/cpdf_pageimagecache.h
+++ b/core/fpdfapi/page/cpdf_pageimagecache.h
@@ -48,10 +48,10 @@
   RetainPtr<CFX_DIBBase> DetachCurMask();
 
  private:
-  class ImageCacheEntry {
+  class Entry {
    public:
-    explicit ImageCacheEntry(RetainPtr<CPDF_Image> pImage);
-    ~ImageCacheEntry();
+    explicit Entry(RetainPtr<CPDF_Image> pImage);
+    ~Entry();
 
     void Reset();
     uint32_t EstimateSize() const { return m_dwCacheSize; }
@@ -92,11 +92,9 @@
   void ClearImageCacheEntry(const CPDF_Stream* pStream);
 
   UnownedPtr<CPDF_Page> const m_pPage;
-  std::map<RetainPtr<const CPDF_Stream>,
-           std::unique_ptr<ImageCacheEntry>,
-           std::less<>>
+  std::map<RetainPtr<const CPDF_Stream>, std::unique_ptr<Entry>, std::less<>>
       m_ImageCache;
-  MaybeOwned<ImageCacheEntry> m_pCurImageCacheEntry;
+  MaybeOwned<Entry> m_pCurImageCacheEntry;
   uint32_t m_nTimeCount = 0;
   uint32_t m_nCacheSize = 0;
   bool m_bCurFindCache = false;