From 0004f29bf6ee3c6060a272c79f14993e92e053c7 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Mar 2017 13:51:46 -0700 Subject: Refcount all CFX_DIBSources (and subclasses) all the time. There are currently several ownership models for these objects, including ad-hoc logic for sharing and deletion, and the now-redundant CFX_DIBitmapRef externally-counted handle to the DIBs. Replace them all with the internal refcount scheme. Change-Id: I2db399dfc19219eda384f94cc989353b78ce2872 Reviewed-on: https://pdfium-review.googlesource.com/3166 Reviewed-by: dsinclair Commit-Queue: dsinclair --- core/fpdfapi/render/cpdf_imagecacheentry.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'core/fpdfapi/render/cpdf_imagecacheentry.h') diff --git a/core/fpdfapi/render/cpdf_imagecacheentry.h b/core/fpdfapi/render/cpdf_imagecacheentry.h index d11fe94c29..b17d3fdda2 100644 --- a/core/fpdfapi/render/cpdf_imagecacheentry.h +++ b/core/fpdfapi/render/cpdf_imagecacheentry.h @@ -9,6 +9,7 @@ #include +#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_system.h" class CFX_DIBitmap; @@ -24,7 +25,7 @@ class CPDF_ImageCacheEntry { CPDF_ImageCacheEntry(CPDF_Document* pDoc, CPDF_Stream* pStream); ~CPDF_ImageCacheEntry(); - void Reset(const CFX_DIBitmap* pBitmap); + void Reset(const CFX_RetainPtr& pBitmap); uint32_t EstimateSize() const { return m_dwCacheSize; } uint32_t GetTimeCount() const { return m_dwTimeCount; } CPDF_Stream* GetStream() const { return m_pStream; } @@ -38,8 +39,8 @@ class CPDF_ImageCacheEntry { int32_t downsampleWidth, int32_t downsampleHeight); int Continue(IFX_Pause* pPause); - CFX_DIBSource* DetachBitmap(); - CFX_DIBSource* DetachMask(); + CFX_RetainPtr DetachBitmap(); + CFX_RetainPtr DetachMask(); int m_dwTimeCount; uint32_t m_MatteColor; @@ -51,10 +52,10 @@ class CPDF_ImageCacheEntry { CPDF_RenderStatus* m_pRenderStatus; CPDF_Document* m_pDocument; CPDF_Stream* m_pStream; - CFX_DIBSource* m_pCurBitmap; - CFX_DIBSource* m_pCurMask; - std::unique_ptr m_pCachedBitmap; - std::unique_ptr m_pCachedMask; + CFX_RetainPtr m_pCurBitmap; + CFX_RetainPtr m_pCurMask; + CFX_RetainPtr m_pCachedBitmap; + CFX_RetainPtr m_pCachedMask; uint32_t m_dwCacheSize; }; -- cgit v1.2.3