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/fgas/layout/fgas_textbreak.cpp | |
| 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/fgas/layout/fgas_textbreak.cpp')
| -rw-r--r-- | xfa/fgas/layout/fgas_textbreak.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp index d30d105253..e09b5c8abf 100644 --- a/xfa/fgas/layout/fgas_textbreak.cpp +++ b/xfa/fgas/layout/fgas_textbreak.cpp @@ -93,7 +93,7 @@ void CFX_TxtBreak::SetLayoutStyles(uint32_t dwLayoutStyles) { m_iRotation = m_iLineRotation + m_iCharRotation; m_iRotation %= 4; } -void CFX_TxtBreak::SetFont(IFX_Font* pFont) { +void CFX_TxtBreak::SetFont(IFGAS_Font* pFont) { if (pFont == NULL) { return; } @@ -1174,7 +1174,7 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun, const FX_WCHAR* pStr = pTxtRun->wsStr.c_str(); int32_t* pWidths = pTxtRun->pWidths; int32_t iLength = pTxtRun->iLength - 1; - IFX_Font* pFont = pTxtRun->pFont; + IFGAS_Font* pFont = pTxtRun->pFont; uint32_t dwStyles = pTxtRun->dwStyles; CFX_RectF rtText(*pTxtRun->pRect); FX_BOOL bRTLPiece = @@ -1565,7 +1565,7 @@ int32_t CFX_TxtBreak::GetCharRects(const FX_TXTRUN* pTxtRun, FX_FLOAT fFontSize = pTxtRun->fFontSize; int32_t iFontSize = FXSYS_round(fFontSize * 20.0f); FX_FLOAT fScale = fFontSize / 1000.0f; - IFX_Font* pFont = pTxtRun->pFont; + IFGAS_Font* pFont = pTxtRun->pFont; if (pFont == NULL) { bCharBBox = FALSE; } |