diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-03-31 17:10:34 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-01 02:37:29 +0000 |
| commit | 7d4f6a89d7e2c5d13b7d630d6348950044a5465e (patch) | |
| tree | 3e0d95ba83fb471ef6d5a9cfde5a4d8bfd103471 /core/fpdfapi/page/cpdf_imageobject.h | |
| parent | 984f1d877ac59315f4c070b1d63c9f651221760b (diff) | |
| download | pdfium-chromium/3061.tar.xz | |
Refcount CPDF_Image all the time.chromium/3061chromium/3060
Remove the old externally-counted CPDF_CountedImage type.
Change-Id: Ia0b288586272da3f2daf7dfc153f08e62794321a
Reviewed-on: https://pdfium-review.googlesource.com/3553
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/page/cpdf_imageobject.h')
| -rw-r--r-- | core/fpdfapi/page/cpdf_imageobject.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/core/fpdfapi/page/cpdf_imageobject.h b/core/fpdfapi/page/cpdf_imageobject.h index 1bbfc0509c..484fb7baa6 100644 --- a/core/fpdfapi/page/cpdf_imageobject.h +++ b/core/fpdfapi/page/cpdf_imageobject.h @@ -27,19 +27,16 @@ class CPDF_ImageObject : public CPDF_PageObject { const CPDF_ImageObject* AsImage() const override; void CalcBoundingBox(); - CPDF_Image* GetImage() const { return m_pImage; } - void SetOwnedImage(std::unique_ptr<CPDF_Image> pImage); - void SetUnownedImage(CPDF_Image* pImage); - + CFX_RetainPtr<CPDF_Image> GetImage() const { return m_pImage; } + void SetImage(const CFX_RetainPtr<CPDF_Image>& pImage); void set_matrix(const CFX_Matrix& matrix) { m_Matrix = matrix; } const CFX_Matrix& matrix() const { return m_Matrix; } private: - void Release(); + void MaybePurgeCache(); CFX_Matrix m_Matrix; - CPDF_Image* m_pImage; - bool m_pImageOwned; + CFX_RetainPtr<CPDF_Image> m_pImage; }; #endif // CORE_FPDFAPI_PAGE_CPDF_IMAGEOBJECT_H_ |