diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-03-28 09:31:32 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-28 16:42:55 +0000 |
| commit | f0799fe84df4d86f25d342b03525f3016d674f86 (patch) | |
| tree | d6839802a68b7b6ad6fb166179ede779c3560c75 /core/fpdfapi/render/cpdf_dibsource.h | |
| parent | 31b08d4cdaa17d7a03f35e087096a77036af98ec (diff) | |
| download | pdfium-f0799fe84df4d86f25d342b03525f3016d674f86.tar.xz | |
Revert "Revert "Refcount all CFX_DIBSources (and subclasses) all the time.""
This reverts commit 31b08d4cdaa17d7a03f35e087096a77036af98ec.
Re-landing the patch after fixing skia build issue.
Change-Id: Ie7039890088b803a6ec5ce365d70f57277459b48
Reviewed-on: https://pdfium-review.googlesource.com/3245
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/render/cpdf_dibsource.h')
| -rw-r--r-- | core/fpdfapi/render/cpdf_dibsource.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/fpdfapi/render/cpdf_dibsource.h b/core/fpdfapi/render/cpdf_dibsource.h index b0f8dedaf7..c77aac1776 100644 --- a/core/fpdfapi/render/cpdf_dibsource.h +++ b/core/fpdfapi/render/cpdf_dibsource.h @@ -39,7 +39,9 @@ typedef struct { class CPDF_DIBSource : public CFX_DIBSource { public: - CPDF_DIBSource(); + template <typename T, typename... Args> + friend CFX_RetainPtr<T> pdfium::MakeRetain(Args&&... args); + ~CPDF_DIBSource() override; bool Load(CPDF_Document* pDoc, const CPDF_Stream* pStream); @@ -71,9 +73,11 @@ class CPDF_DIBSource : public CFX_DIBSource { int StartLoadMaskDIB(); int ContinueLoadMaskDIB(IFX_Pause* pPause); int ContinueToLoadMask(); - CPDF_DIBSource* DetachMask(); + CFX_RetainPtr<CPDF_DIBSource> DetachMask(); private: + CPDF_DIBSource(); + bool LoadColorInfo(const CPDF_Dictionary* pFormResources, const CPDF_Dictionary* pPageResources); DIB_COMP_DATA* GetDecodeAndMaskArray(bool* bDefaultDecode, bool* bColorKey); @@ -133,9 +137,9 @@ class CPDF_DIBSource : public CFX_DIBSource { DIB_COMP_DATA* m_pCompData; uint8_t* m_pLineBuf; uint8_t* m_pMaskedLine; - std::unique_ptr<CFX_DIBitmap> m_pCachedBitmap; + CFX_RetainPtr<CFX_DIBitmap> m_pCachedBitmap; + CFX_RetainPtr<CPDF_DIBSource> m_pMask; std::unique_ptr<CCodec_ScanlineDecoder> m_pDecoder; - CPDF_DIBSource* m_pMask; std::unique_ptr<CPDF_StreamAcc> m_pGlobalStream; std::unique_ptr<CCodec_Jbig2Context> m_pJbig2Context; CPDF_Stream* m_pMaskStream; |