diff options
| author | thestig <thestig@chromium.org> | 2016-06-07 17:33:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-07 17:33:37 -0700 |
| commit | a4fdfc5ed0e8d2e6acc52cc34eac42c6072f0ccc (patch) | |
| tree | 255d0e11679bd1f54f94dd717e74db5827f967e9 /xfa/fgas/layout/fgas_textbreak.cpp | |
| parent | 759de3828419522e8ecd7cdaee469e55061a7c08 (diff) | |
| download | pdfium-a4fdfc5ed0e8d2e6acc52cc34eac42c6072f0ccc.tar.xz | |
Replace IFGAS_Font with underlying concrete type
Review-Url: https://codereview.chromium.org/2037563002
Diffstat (limited to 'xfa/fgas/layout/fgas_textbreak.cpp')
| -rw-r--r-- | xfa/fgas/layout/fgas_textbreak.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp index 85cff44349..8ba3ae818d 100644 --- a/xfa/fgas/layout/fgas_textbreak.cpp +++ b/xfa/fgas/layout/fgas_textbreak.cpp @@ -11,6 +11,7 @@ #include "core/fxcrt/include/fx_arabic.h" #include "core/fxcrt/include/fx_arb.h" #include "core/fxcrt/include/fx_memory.h" +#include "xfa/fgas/font/fgas_gefont.h" #include "xfa/fgas/layout/fgas_linebreak.h" #include "xfa/fgas/layout/fgas_unicode.h" @@ -93,7 +94,7 @@ void CFX_TxtBreak::SetLayoutStyles(uint32_t dwLayoutStyles) { m_iRotation = m_iLineRotation + m_iCharRotation; m_iRotation %= 4; } -void CFX_TxtBreak::SetFont(IFGAS_Font* pFont) { +void CFX_TxtBreak::SetFont(CFGAS_GEFont* pFont) { if (pFont == NULL) { return; } @@ -1174,7 +1175,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; - IFGAS_Font* pFont = pTxtRun->pFont; + CFGAS_GEFont* pFont = pTxtRun->pFont; uint32_t dwStyles = pTxtRun->dwStyles; CFX_RectF rtText(*pTxtRun->pRect); FX_BOOL bRTLPiece = @@ -1565,7 +1566,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; - IFGAS_Font* pFont = pTxtRun->pFont; + CFGAS_GEFont* pFont = pTxtRun->pFont; if (pFont == NULL) { bCharBBox = FALSE; } |