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 --- xfa/fde/fde_gedevice.cpp | 2 +- xfa/fde/fde_gedevice.h | 2 +- xfa/fde/tto/fde_textout.cpp | 2 +- xfa/fde/tto/fde_textout.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/fde') diff --git a/xfa/fde/fde_gedevice.cpp b/xfa/fde/fde_gedevice.cpp index 3c6ca9b37e..8af769aae5 100644 --- a/xfa/fde/fde_gedevice.cpp +++ b/xfa/fde/fde_gedevice.cpp @@ -82,7 +82,7 @@ float CFDE_RenderDevice::GetDpiY() const { return 96; } -bool CFDE_RenderDevice::DrawImage(CFX_DIBSource* pDib, +bool CFDE_RenderDevice::DrawImage(const CFX_RetainPtr& pDib, const CFX_RectF* pSrcRect, const CFX_RectF& dstRect, const CFX_Matrix* pImgMatrix, diff --git a/xfa/fde/fde_gedevice.h b/xfa/fde/fde_gedevice.h index 976e1bde6f..a3a1eaf111 100644 --- a/xfa/fde/fde_gedevice.h +++ b/xfa/fde/fde_gedevice.h @@ -34,7 +34,7 @@ class CFDE_RenderDevice { float GetDpiX() const; float GetDpiY() const; - bool DrawImage(CFX_DIBSource* pDib, + bool DrawImage(const CFX_RetainPtr& pDib, const CFX_RectF* pSrcRect, const CFX_RectF& dstRect, const CFX_Matrix* pImgMatrix = nullptr, diff --git a/xfa/fde/tto/fde_textout.cpp b/xfa/fde/tto/fde_textout.cpp index 7f6eddd9ce..c06a12fedf 100644 --- a/xfa/fde/tto/fde_textout.cpp +++ b/xfa/fde/tto/fde_textout.cpp @@ -112,7 +112,7 @@ void CFDE_TextOut::SetLineSpace(float fLineSpace) { m_fLineSpace = fLineSpace; } -void CFDE_TextOut::SetDIBitmap(CFX_DIBitmap* pDIB) { +void CFDE_TextOut::SetDIBitmap(const CFX_RetainPtr& pDIB) { ASSERT(pDIB); m_pRenderDevice.reset(); diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h index 6883a5701f..e48e25567e 100644 --- a/xfa/fde/tto/fde_textout.h +++ b/xfa/fde/tto/fde_textout.h @@ -87,7 +87,7 @@ class CFDE_TextOut { void SetParagraphBreakChar(wchar_t wch); void SetAlignment(int32_t iAlignment); void SetLineSpace(float fLineSpace); - void SetDIBitmap(CFX_DIBitmap* pDIB); + void SetDIBitmap(const CFX_RetainPtr& pDIB); void SetRenderDevice(CFX_RenderDevice* pDevice); void SetClipRect(const CFX_Rect& rtClip); void SetClipRect(const CFX_RectF& rtClip); -- cgit v1.2.3