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/page/cpdf_image.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/page/cpdf_image.h')
| -rw-r--r-- | core/fpdfapi/page/cpdf_image.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/fpdfapi/page/cpdf_image.h b/core/fpdfapi/page/cpdf_image.h index 1909498102..5b737e67b9 100644 --- a/core/fpdfapi/page/cpdf_image.h +++ b/core/fpdfapi/page/cpdf_image.h @@ -44,25 +44,25 @@ class CPDF_Image { bool IsMask() const { return m_bIsMask; } bool IsInterpol() const { return m_bInterpolate; } - std::unique_ptr<CFX_DIBSource> LoadDIBSource() const; + CFX_RetainPtr<CFX_DIBSource> LoadDIBSource() const; - void SetImage(const CFX_DIBitmap* pDIBitmap); + void SetImage(const CFX_RetainPtr<CFX_DIBitmap>& pDIBitmap); void SetJpegImage(const CFX_RetainPtr<IFX_SeekableReadStream>& pFile); void SetJpegImageInline(const CFX_RetainPtr<IFX_SeekableReadStream>& pFile); - void ResetCache(CPDF_Page* pPage, const CFX_DIBitmap* pDIBitmap); - + void ResetCache(CPDF_Page* pPage, + const CFX_RetainPtr<CFX_DIBitmap>& pDIBitmap); bool StartLoadDIBSource(CPDF_Dictionary* pFormResource, CPDF_Dictionary* pPageResource, bool bStdCS = false, uint32_t GroupFamily = 0, bool bLoadMask = false); bool Continue(IFX_Pause* pPause); - CFX_DIBSource* DetachBitmap(); - CFX_DIBSource* DetachMask(); + CFX_RetainPtr<CFX_DIBSource> DetachBitmap(); + CFX_RetainPtr<CFX_DIBSource> DetachMask(); - CFX_DIBSource* m_pDIBSource = nullptr; - CFX_DIBSource* m_pMask = nullptr; + CFX_RetainPtr<CFX_DIBSource> m_pDIBSource; + CFX_RetainPtr<CFX_DIBSource> m_pMask; uint32_t m_MatteColor = 0; private: |