From f0799fe84df4d86f25d342b03525f3016d674f86 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 28 Mar 2017 09:31:32 -0700 Subject: 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 Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fpdfapi/render/cpdf_imagerenderer.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/fpdfapi/render/cpdf_imagerenderer.h') diff --git a/core/fpdfapi/render/cpdf_imagerenderer.h b/core/fpdfapi/render/cpdf_imagerenderer.h index d358716e9f..542325449f 100644 --- a/core/fpdfapi/render/cpdf_imagerenderer.h +++ b/core/fpdfapi/render/cpdf_imagerenderer.h @@ -30,7 +30,7 @@ class CPDF_ImageRenderer { int blendType); bool Start(CPDF_RenderStatus* pStatus, - const CFX_DIBSource* pDIBSource, + const CFX_RetainPtr& pDIBSource, FX_ARGB bitmap_argb, int bitmap_alpha, const CFX_Matrix* pImage2Device, @@ -53,7 +53,7 @@ class CPDF_ImageRenderer { CFX_Matrix GetDrawMatrix(const FX_RECT& rect) const; void CalculateDrawImage(CFX_FxgeDevice* bitmap_device1, CFX_FxgeDevice* bitmap_device2, - const CFX_DIBSource* pDIBSource, + const CFX_RetainPtr& pDIBSource, CFX_Matrix* pNewMatrix, const FX_RECT& rect) const; @@ -63,8 +63,8 @@ class CPDF_ImageRenderer { const CFX_Matrix* m_pObj2Device; CFX_Matrix m_ImageMatrix; CPDF_ImageLoader m_Loader; - const CFX_DIBSource* m_pDIBSource; - std::unique_ptr m_pClone; + CFX_RetainPtr m_pDIBSource; + CFX_RetainPtr m_pClone; int m_BitmapAlpha; bool m_bPatternColor; CPDF_Pattern* m_pPattern; -- cgit v1.2.3