Tidy CPDF_ImageCacheEntry. - Remove parameter to Reset() that is always nullptr. - Initialize members in the header. Change-Id: Ia0ac2f3c88eb192ef333f67ec0f9c398b0b59f29 Reviewed-on: https://pdfium-review.googlesource.com/c/51293 Reviewed-by: Nicolás Peña Moreno <npm@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/render/cpdf_imagecacheentry.cpp b/core/fpdfapi/render/cpdf_imagecacheentry.cpp index 681c39e..9691937 100644 --- a/core/fpdfapi/render/cpdf_imagecacheentry.cpp +++ b/core/fpdfapi/render/cpdf_imagecacheentry.cpp
@@ -21,18 +21,12 @@ CPDF_ImageCacheEntry::CPDF_ImageCacheEntry(CPDF_Document* pDoc, const RetainPtr<CPDF_Image>& pImage) - : m_dwTimeCount(0), - m_MatteColor(0), - m_pDocument(pDoc), - m_pImage(pImage), - m_dwCacheSize(0) {} + : m_pDocument(pDoc), m_pImage(pImage) {} -CPDF_ImageCacheEntry::~CPDF_ImageCacheEntry() {} +CPDF_ImageCacheEntry::~CPDF_ImageCacheEntry() = default; -void CPDF_ImageCacheEntry::Reset(const RetainPtr<CFX_DIBitmap>& pBitmap) { +void CPDF_ImageCacheEntry::Reset() { m_pCachedBitmap.Reset(); - if (pBitmap) - m_pCachedBitmap = pBitmap->Clone(nullptr); CalcSize(); }
diff --git a/core/fpdfapi/render/cpdf_imagecacheentry.h b/core/fpdfapi/render/cpdf_imagecacheentry.h index 1cbe4ee..1a38019 100644 --- a/core/fpdfapi/render/cpdf_imagecacheentry.h +++ b/core/fpdfapi/render/cpdf_imagecacheentry.h
@@ -12,7 +12,6 @@ #include "core/fxcrt/retain_ptr.h" #include "core/fxcrt/unowned_ptr.h" -class CFX_DIBitmap; class CPDF_Dictionary; class CPDF_Document; class CPDF_Image; @@ -25,7 +24,7 @@ const RetainPtr<CPDF_Image>& pImage); ~CPDF_ImageCacheEntry(); - void Reset(const RetainPtr<CFX_DIBitmap>& pBitmap); + void Reset(); uint32_t EstimateSize() const { return m_dwCacheSize; } uint32_t GetTimeCount() const { return m_dwTimeCount; } CPDF_Image* GetImage() const { return m_pImage.Get(); } @@ -44,8 +43,8 @@ RetainPtr<CFX_DIBBase> DetachBitmap(); RetainPtr<CFX_DIBBase> DetachMask(); - int m_dwTimeCount; - uint32_t m_MatteColor; + int m_dwTimeCount = 0; + uint32_t m_MatteColor = 0; private: void ContinueGetCachedBitmap(CPDF_RenderStatus* pRenderStatus); @@ -57,7 +56,7 @@ RetainPtr<CFX_DIBBase> m_pCurMask; RetainPtr<CFX_DIBBase> m_pCachedBitmap; RetainPtr<CFX_DIBBase> m_pCachedMask; - uint32_t m_dwCacheSize; + uint32_t m_dwCacheSize = 0; }; #endif // CORE_FPDFAPI_RENDER_CPDF_IMAGECACHEENTRY_H_
diff --git a/core/fpdfapi/render/cpdf_pagerendercache.cpp b/core/fpdfapi/render/cpdf_pagerendercache.cpp index ba334ad..4d1add1 100644 --- a/core/fpdfapi/render/cpdf_pagerendercache.cpp +++ b/core/fpdfapi/render/cpdf_pagerendercache.cpp
@@ -127,6 +127,6 @@ pEntry = it->second.get(); m_nCacheSize -= pEntry->EstimateSize(); - pEntry->Reset(nullptr); + pEntry->Reset(); m_nCacheSize += pEntry->EstimateSize(); }