diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-03-27 13:51:46 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-28 14:14:50 +0000 |
| commit | 0004f29bf6ee3c6060a272c79f14993e92e053c7 (patch) | |
| tree | b82385e4853a157e10148af8d95ebb6bae4fb4c7 /core/fpdfapi/render/cpdf_imagecacheentry.h | |
| parent | 369fe1f7f9f3a424ee3cf8f992c3128db27fa479 (diff) | |
| download | pdfium-0004f29bf6ee3c6060a272c79f14993e92e053c7.tar.xz | |
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 <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/render/cpdf_imagecacheentry.h')
| -rw-r--r-- | core/fpdfapi/render/cpdf_imagecacheentry.h | 15 |
1 files changed, 8 insertions, 7 deletions
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 <memory> +#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<CFX_DIBitmap>& 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<CFX_DIBSource> DetachBitmap(); + CFX_RetainPtr<CFX_DIBSource> 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<CFX_DIBSource> m_pCachedBitmap; - std::unique_ptr<CFX_DIBSource> m_pCachedMask; + CFX_RetainPtr<CFX_DIBSource> m_pCurBitmap; + CFX_RetainPtr<CFX_DIBSource> m_pCurMask; + CFX_RetainPtr<CFX_DIBSource> m_pCachedBitmap; + CFX_RetainPtr<CFX_DIBSource> m_pCachedMask; uint32_t m_dwCacheSize; }; |