XFA: Manually apply changes to fpdf_text.h and fx_font.h from master

core/src/fxge/ge/fx_ge_font.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../include/fxge/fx_ge.h"
 #include "../../../include/fxge/fx_freetype.h"
 #include "text_int.h"
 
@@ skipping 16 matching lines @@
   FXFM_ENCODING_ADOBE_STANDARD,
   FXFM_ENCODING_ADOBE_EXPERT,
   FXFM_ENCODING_ADOBE_CUSTOM,
   FXFM_ENCODING_ADOBE_LATIN_1,
   FXFM_ENCODING_OLD_LATIN_2,
   FXFM_ENCODING_APPLE_ROMAN,
 };
 
 CFX_UnicodeEncodingEx* _FXFM_CreateFontEncoding(CFX_Font* pFont,
                                                 FX_DWORD nEncodingID) {
-  if (FXFT_Select_Charmap(pFont->m_Face, nEncodingID))
+  if (FXFT_Select_Charmap(pFont->GetFace(), nEncodingID))
     return nullptr;
   return new CFX_UnicodeEncodingEx(pFont, nEncodingID);
 }
 
 FXFT_Face FT_LoadFont(const uint8_t* pData, int size) {
   return CFX_GEModule::Get()->GetFontMgr()->GetFixedFace(pData, size, 0);
 }
 
 }  // namespace
 
@@ skipping 178 matching lines @@
 
 FX_BOOL CFX_Font::LoadEmbedded(const uint8_t* data, FX_DWORD size) {
   m_pFontDataAllocation = FX_Alloc(uint8_t, size);
   FXSYS_memcpy(m_pFontDataAllocation, data, size);
   m_Face = FT_LoadFont(m_pFontDataAllocation, size);
   m_pFontData = m_pFontDataAllocation;
   m_bEmbedded = TRUE;
   m_dwSize = size;
   return m_Face != NULL;
 }
-FX_BOOL CFX_Font::IsTTFont() {
+FX_BOOL CFX_Font::IsTTFont() const {
   if (m_Face == NULL) {
     return FALSE;
   }
   return FXFT_Is_Face_TT_OT(m_Face) == FXFT_FACE_FLAG_SFNT;
 }
 int CFX_Font::GetAscent() const {
   if (m_Face == NULL) {
     return 0;
   }
   int ascent = EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face),
@@ skipping 67 matching lines @@
     bbox.top =
         (FXFT_Get_Glyph_HoriBearingY(m_Face) - FXFT_Get_Glyph_Height(m_Face)) *
         1000 / em;
     bbox.right =
         (FXFT_Get_Glyph_HoriBearingX(m_Face) + FXFT_Get_Glyph_Width(m_Face)) *
         1000 / em;
     bbox.bottom = (FXFT_Get_Glyph_HoriBearingY(m_Face)) * 1000 / em;
   }
   return TRUE;
 }
-FX_BOOL CFX_Font::IsItalic() {
+FX_BOOL CFX_Font::IsItalic() const {
   if (m_Face == NULL) {
     return FALSE;
   }
   FX_BOOL ret = FXFT_Is_Face_Italic(m_Face) == FXFT_STYLE_FLAG_ITALIC;
   if (!ret) {
     CFX_ByteString str(FXFT_Get_Face_Style_Name(m_Face));
     str.MakeLower();
     if (str.Find("italic") != -1) {
       ret = TRUE;
     }
   }
   return ret;
 }
-FX_BOOL CFX_Font::IsBold() {
+FX_BOOL CFX_Font::IsBold() const {
   if (m_Face == NULL) {
     return FALSE;
   }
   return FXFT_Is_Face_Bold(m_Face) == FXFT_STYLE_FLAG_BOLD;
 }
-FX_BOOL CFX_Font::IsFixedWidth() {
+FX_BOOL CFX_Font::IsFixedWidth() const {
   if (m_Face == NULL) {
     return FALSE;
   }
   return FXFT_Is_Face_fixedwidth(m_Face);
 }
 CFX_WideString CFX_Font::GetPsName() const {
   if (m_Face == NULL) {
     return CFX_WideString();
   }
   CFX_WideString psName =
@@ skipping 41 matching lines @@
     bbox.top = FXFT_Get_Face_yMin(m_Face);
     bbox.right = FXFT_Get_Face_xMax(m_Face);
   } else {
     bbox.left = FXFT_Get_Face_xMin(m_Face) * 1000 / em;
     bbox.top = FXFT_Get_Face_yMin(m_Face) * 1000 / em;
     bbox.right = FXFT_Get_Face_xMax(m_Face) * 1000 / em;
     bbox.bottom = FXFT_Get_Face_yMax(m_Face) * 1000 / em;
   }
   return TRUE;
 }
-int CFX_Font::GetHeight() {
+int CFX_Font::GetHeight() const {
   if (m_Face == NULL) {
     return 0;
   }
   int height =
       EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face), FXFT_Get_Face_Height(m_Face));
   return height;
 }
-int CFX_Font::GetMaxAdvanceWidth() {
+int CFX_Font::GetMaxAdvanceWidth() const {
   if (m_Face == NULL) {
     return 0;
   }
   int width = EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face),
                         FXFT_Get_Face_MaxAdvanceWidth(m_Face));
   return width;
 }
-int CFX_Font::GetULPos() {
+int CFX_Font::GetULPos() const {
   if (m_Face == NULL) {
     return 0;
   }
   int pos = EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face),
                       FXFT_Get_Face_UnderLinePosition(m_Face));
   return pos;
 }
-int CFX_Font::GetULthickness() {
+int CFX_Font::GetULthickness() const {
   if (m_Face == NULL) {
     return 0;
   }
   int thickness = EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face),
                             FXFT_Get_Face_UnderLineThickness(m_Face));
   return thickness;
 }
 
 CFX_UnicodeEncoding::CFX_UnicodeEncoding(CFX_Font* pFont) : m_pFont(pFont) {
 }
 
 CFX_UnicodeEncoding::~CFX_UnicodeEncoding() {
 }
 
 FX_DWORD CFX_UnicodeEncoding::GlyphFromCharCode(FX_DWORD charcode) {
   FXFT_Face face = m_pFont->GetFace();
   if (!face)
     return charcode;
 
   if (FXFT_Select_Charmap(face, FXFT_ENCODING_UNICODE) == 0)
     return FXFT_Get_Char_Index(face, charcode);
 
-  if (m_pFont->m_pSubstFont && m_pFont->m_pSubstFont->m_Charset == 2) {
+  if (m_pFont->GetSubstFont() && m_pFont->GetSubstFont()->m_Charset == 2) {
     FX_DWORD index = 0;
     if (FXFT_Select_Charmap(face, FXFT_ENCODING_MS_SYMBOL) == 0)
       index = FXFT_Get_Char_Index(face, charcode);
     if (!index && !FXFT_Select_Charmap(face, FXFT_ENCODING_APPLE_ROMAN))
       return FXFT_Get_Char_Index(face, charcode);
   }
   return charcode;
 }
 
 CFX_UnicodeEncodingEx::CFX_UnicodeEncodingEx(CFX_Font* pFont,
@@ skipping 30 matching lines @@
   }
   FXFT_Select_Charmap(face, m_nEncodingID);
   return 0;
 }
 
 FX_DWORD CFX_UnicodeEncodingEx::CharCodeFromUnicode(FX_WCHAR Unicode) const {
   if (m_nEncodingID == FXFM_ENCODING_UNICODE ||
       m_nEncodingID == FXFM_ENCODING_MS_SYMBOL) {
     return Unicode;
   }
-  FXFT_Face face = m_pFont->m_Face;
+  FXFT_Face face = m_pFont->GetFace();
   int nmaps = FXFT_Get_Face_CharmapCount(face);
   for (int i = 0; i < nmaps; i++) {
     int nEncodingID =
         FXFT_Get_Charmap_Encoding(FXFT_Get_Face_Charmaps(face)[i]);
     if (nEncodingID == FXFM_ENCODING_UNICODE ||
         nEncodingID == FXFM_ENCODING_MS_SYMBOL) {
       return Unicode;
     }
   }
   return -1;
 }
 
 CFX_UnicodeEncodingEx* FX_CreateFontEncodingEx(CFX_Font* pFont,
                                                FX_DWORD nEncodingID) {
-  if (!pFont || !pFont->m_Face)
+  if (!pFont || !pFont->GetFace())
     return nullptr;
 
   if (nEncodingID != FXFM_ENCODING_NONE)
     return _FXFM_CreateFontEncoding(pFont, nEncodingID);
 
   for (size_t i = 0; i < FX_ArraySize(g_EncodingID); ++i) {
     CFX_UnicodeEncodingEx* pFontEncoding =
         _FXFM_CreateFontEncoding(pFont, g_EncodingID[i]);
     if (pFontEncoding) {
       return pFontEncoding;
     }
   }
   return NULL;
 }