commit 246d56e304723f3063bec2723bbe8ce68080b81b
author Tom Sepez <tsepez@chromium.org> Mon Apr 26 18:23:59 2021 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Apr 26 18:23:59 2021 +0000
tree 58ec2a016e47af1b019e991a1d8ae698e31479fc
parent 0c036acb724913c718c88b676008322e897555ed

Encapsulate CPDF_ImageCacheEntry::m_dwTimeCount and m_MatteColor

-- make m_dwTimeCount be an uint32_t while at it, since it is always
   retrieved/set as such.

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

core/fpdfapi/render/cpdf_imagecacheentry.h

diff --git a/core/fpdfapi/render/cpdf_imagecacheentry.h b/core/fpdfapi/render/cpdf_imagecacheentry.h
index c48554e..d18b79f 100644
--- a/core/fpdfapi/render/cpdf_imagecacheentry.h
+++ b/core/fpdfapi/render/cpdf_imagecacheentry.h
@@ -26,7 +26,9 @@
 
   void Reset();
   uint32_t EstimateSize() const { return m_dwCacheSize; }
+  uint32_t GetMatteColor() const { return m_MatteColor; }
   uint32_t GetTimeCount() const { return m_dwTimeCount; }
+  void SetTimeCount(uint32_t count) { m_dwTimeCount = count; }
   CPDF_Image* GetImage() const { return m_pImage.Get(); }
 
   CPDF_DIB::LoadState StartGetCachedBitmap(
@@ -40,20 +42,19 @@
   RetainPtr<CFX_DIBBase> DetachBitmap();
   RetainPtr<CFX_DIBBase> DetachMask();
 
-  int m_dwTimeCount = 0;
-  uint32_t m_MatteColor = 0;
-
  private:
   void ContinueGetCachedBitmap(const CPDF_RenderStatus* pRenderStatus);
   void CalcSize();
 
+  uint32_t m_dwTimeCount = 0;
+  uint32_t m_MatteColor = 0;
+  uint32_t m_dwCacheSize = 0;
   UnownedPtr<CPDF_Document> const m_pDocument;
   RetainPtr<CPDF_Image> const m_pImage;
   RetainPtr<CFX_DIBBase> m_pCurBitmap;
   RetainPtr<CFX_DIBBase> m_pCurMask;
   RetainPtr<CFX_DIBBase> m_pCachedBitmap;
   RetainPtr<CFX_DIBBase> m_pCachedMask;
-  uint32_t m_dwCacheSize = 0;
 };
 
 #endif  // CORE_FPDFAPI_RENDER_CPDF_IMAGECACHEENTRY_H_

core/fpdfapi/render/cpdf_imageloader.cpp

diff --git a/core/fpdfapi/render/cpdf_imageloader.cpp b/core/fpdfapi/render/cpdf_imageloader.cpp
index bb198e7..710bfa3 100644
--- a/core/fpdfapi/render/cpdf_imageloader.cpp
+++ b/core/fpdfapi/render/cpdf_imageloader.cpp
@@ -67,7 +67,7 @@
     m_bCached = true;
     m_pBitmap = entry->DetachBitmap();
     m_pMask = entry->DetachMask();
-    m_MatteColor = entry->m_MatteColor;
+    m_MatteColor = entry->GetMatteColor();
     return;
   }
   RetainPtr<CPDF_Image> pImage = m_pImageObject->GetImage();

core/fpdfapi/render/cpdf_pagerendercache.cpp

diff --git a/core/fpdfapi/render/cpdf_pagerendercache.cpp b/core/fpdfapi/render/cpdf_pagerendercache.cpp
index c0885e4..0d60794 100644
--- a/core/fpdfapi/render/cpdf_pagerendercache.cpp
+++ b/core/fpdfapi/render/cpdf_pagerendercache.cpp
@@ -50,7 +50,7 @@
   uint32_t nTimeCount = m_nTimeCount;
   if (nTimeCount + 1 < nTimeCount) {
     for (size_t i = 0; i < nCount; i++)
-      m_ImageCache[cache_info[i].pStream]->m_dwTimeCount = i;
+      m_ImageCache[cache_info[i].pStream]->SetTimeCount(i);
     m_nTimeCount = nCount;
   }