From 0b95042db2e6dab5876abd12ce485fff0a8e08fe Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 21 Sep 2017 15:49:49 -0400 Subject: Rename CFX_RetainPtr to RetainPtr This CL renames CFX_RetainPtr to RetainPtr and places in the fxcrt namespace. Bug: pdfium:898 Change-Id: I8798a9f79cb0840d3f037e8d04937cedd742914e Reviewed-on: https://pdfium-review.googlesource.com/14616 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fde/cfde_textout.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fde/cfde_textout.h') diff --git a/xfa/fde/cfde_textout.h b/xfa/fde/cfde_textout.h index b936eb4415..f69c0a8717 100644 --- a/xfa/fde/cfde_textout.h +++ b/xfa/fde/cfde_textout.h @@ -77,7 +77,7 @@ class CFDE_TextOut { public: static bool DrawString(CFX_RenderDevice* device, FX_ARGB color, - const CFX_RetainPtr& pFont, + const RetainPtr& pFont, FXTEXT_CHARPOS* pCharPos, int32_t iCount, float fFontSize, @@ -86,7 +86,7 @@ class CFDE_TextOut { CFDE_TextOut(); ~CFDE_TextOut(); - void SetFont(const CFX_RetainPtr& pFont); + void SetFont(const RetainPtr& pFont); void SetFontSize(float fFontSize); void SetTextColor(FX_ARGB color) { m_TxtColor = color; } void SetStyles(const FDE_TextStyle& dwStyles); @@ -121,7 +121,7 @@ class CFDE_TextOut { int32_t GetDisplayPos(FDE_TTOPIECE* pPiece); std::unique_ptr m_pTxtBreak; - CFX_RetainPtr m_pFont; + RetainPtr m_pFont; float m_fFontSize; float m_fLineSpace; float m_fLinePos; -- cgit v1.2.3