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/fwl/basewidget | |
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/fwl/basewidget')
-rw-r--r-- | xfa/fwl/basewidget/fwl_barcodeimp.cpp | 2 | ||||
-rw-r--r-- | xfa/fwl/basewidget/fwl_editimp.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fwl/basewidget/fwl_barcodeimp.cpp b/xfa/fwl/basewidget/fwl_barcodeimp.cpp index 97ade357d3..f780a22002 100644 --- a/xfa/fwl/basewidget/fwl_barcodeimp.cpp +++ b/xfa/fwl/basewidget/fwl_barcodeimp.cpp @@ -111,7 +111,7 @@ void CFWL_BarcodeImp::GenerateBarcodeImageCache() { CFWL_ThemePart part; part.m_pWidget = m_pInterface; IFWL_ThemeProvider* pTheme = GetAvailableTheme(); - IFX_Font* pFont = static_cast<IFX_Font*>( + IFGAS_Font* pFont = static_cast<IFGAS_Font*>( pTheme->GetCapacity(&part, CFWL_WidgetCapacity::Font)); CFX_Font* pCXFont = pFont ? static_cast<CFX_Font*>(pFont->GetDevFont()) : nullptr; diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp index 6d0197eeb4..e1b82a07c6 100644 --- a/xfa/fwl/basewidget/fwl_editimp.cpp +++ b/xfa/fwl/basewidget/fwl_editimp.cpp @@ -1194,8 +1194,8 @@ void CFWL_EditImp::UpdateEditParams() { if (!pLineHeight) return; params.fLineSpace = *pLineHeight; - IFX_Font* pFont = - static_cast<IFX_Font*>(GetThemeCapacity(CFWL_WidgetCapacity::Font)); + IFGAS_Font* pFont = + static_cast<IFGAS_Font*>(GetThemeCapacity(CFWL_WidgetCapacity::Font)); if (!pFont) return; params.pFont = pFont; |