From b71dc76df4a1eb04f89a64cd542a1d585df3251e Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 3 Jun 2016 14:04:19 -0700 Subject: Rename IFX_Font to IFGAS_Font Avoid confusion with CFX_Font, which is defined in fxcrt, and does not inherit from nor bear any resemblence to IFX_Font. Review-Url: https://codereview.chromium.org/2036173003 --- xfa/fde/tto/fde_textout.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/fde/tto/fde_textout.h') diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h index 2b00fee88d..e08a1487bb 100644 --- a/xfa/fde/tto/fde_textout.h +++ b/xfa/fde/tto/fde_textout.h @@ -75,7 +75,7 @@ class CFDE_TextOut : public CFX_Target { CFDE_TextOut(); ~CFDE_TextOut() override; - void SetFont(IFX_Font* pFont); + void SetFont(IFGAS_Font* pFont); void SetFontSize(FX_FLOAT fFontSize); void SetTextColor(FX_ARGB color); void SetStyles(uint32_t dwStyles); @@ -151,7 +151,7 @@ class CFDE_TextOut : public CFX_Target { void DrawLine(const FDE_TTOPIECE* pPiece, CFDE_Pen*& pPen); CFX_TxtBreak* m_pTxtBreak; - IFX_Font* m_pFont; + IFGAS_Font* m_pFont; FX_FLOAT m_fFontSize; FX_FLOAT m_fLineSpace; FX_FLOAT m_fLinePos; -- cgit v1.2.3