diff options
| author | tsepez <tsepez@chromium.org> | 2016-06-03 14:04:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-03 14:04:19 -0700 |
| commit | b71dc76df4a1eb04f89a64cd542a1d585df3251e (patch) | |
| tree | 12c37f62e8bcf2c8803c111ec692d4c08329fa41 /xfa/fde/tto | |
| parent | b5032dd963b6a25145c285b36a12c98593744d2f (diff) | |
| download | pdfium-b71dc76df4a1eb04f89a64cd542a1d585df3251e.tar.xz | |
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
Diffstat (limited to 'xfa/fde/tto')
| -rw-r--r-- | xfa/fde/tto/fde_textout.cpp | 2 | ||||
| -rw-r--r-- | xfa/fde/tto/fde_textout.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fde/tto/fde_textout.cpp b/xfa/fde/tto/fde_textout.cpp index 1cf9226409..7a0107d0f4 100644 --- a/xfa/fde/tto/fde_textout.cpp +++ b/xfa/fde/tto/fde_textout.cpp @@ -53,7 +53,7 @@ CFDE_TextOut::~CFDE_TextOut() { FX_Free(m_pCharPos); m_ttoLines.RemoveAll(); } -void CFDE_TextOut::SetFont(IFX_Font* pFont) { +void CFDE_TextOut::SetFont(IFGAS_Font* pFont) { ASSERT(pFont); m_pFont = pFont; m_pTxtBreak->SetFont(pFont); 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; |