diff options
| author | thestig <thestig@chromium.org> | 2016-06-20 10:38:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-20 10:38:52 -0700 |
| commit | ec51ac3e4dfa8ee1da3d581b40f0b35af4563c9e (patch) | |
| tree | 856b76dfb372807aaa984acedecff66984ec84b0 /xfa/fgas | |
| parent | 54d027dbbff8a0270531855082e4f61cb457c173 (diff) | |
| download | pdfium-ec51ac3e4dfa8ee1da3d581b40f0b35af4563c9e.tar.xz | |
Another round of fx_ge cleanup.
- Clean up CFX_GEModule.
- Remove duplicate #defines in fx_ge.h
- Remove IsFontStyleFromCharCode() that always returns true.
- Mark a FXTEXT_CHARPOS field as Mac only.
Review-Url: https://codereview.chromium.org/2075333002
Diffstat (limited to 'xfa/fgas')
| -rw-r--r-- | xfa/fgas/layout/fgas_rtfbreak.cpp | 2 | ||||
| -rw-r--r-- | xfa/fgas/layout/fgas_textbreak.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/fgas_rtfbreak.cpp index 848f7f4e93..80591f1714 100644 --- a/xfa/fgas/layout/fgas_rtfbreak.cpp +++ b/xfa/fgas/layout/fgas_rtfbreak.cpp @@ -1285,7 +1285,9 @@ int32_t CFX_RTFBreak::GetDisplayPos(const FX_RTFTEXTOBJ* pText, pCharPos->m_GlyphIndex = pFont->GetGlyphIndex(wch, bMBCSCode); } } +#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ pCharPos->m_ExtGID = pCharPos->m_GlyphIndex; +#endif pCharPos->m_FontCharWidth = iCharWidth; if (pWSForms) { *pWSForms += wForm; diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp index 8eebbed76a..a272d0cfc7 100644 --- a/xfa/fgas/layout/fgas_textbreak.cpp +++ b/xfa/fgas/layout/fgas_textbreak.cpp @@ -1395,7 +1395,9 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun, if (!bEmptyChar || (bEmptyChar && !bSkipSpace)) { pCharPos->m_GlyphIndex = bCharCode ? wch : pFont->GetGlyphIndex(wForm, FALSE); +#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ pCharPos->m_ExtGID = pCharPos->m_GlyphIndex; +#endif pCharPos->m_FontCharWidth = iCharWidth; if (pWSForms) { *pWSForms += wForm; |