From ec51ac3e4dfa8ee1da3d581b40f0b35af4563c9e Mon Sep 17 00:00:00 2001 From: thestig Date: Mon, 20 Jun 2016 10:38:52 -0700 Subject: 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 --- xfa/fgas/layout/fgas_rtfbreak.cpp | 2 ++ xfa/fgas/layout/fgas_textbreak.cpp | 2 ++ 2 files changed, 4 insertions(+) (limited to 'xfa/fgas') 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; -- cgit v1.2.3