Merge to XFA: Make CFX_FontMgr member variables private. (try 2)

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 21 matching lines @@
   FXFM_ENCODING_APPLE_ROMAN,
 };
 
 CFX_UnicodeEncodingEx* _FXFM_CreateFontEncoding(CFX_Font* pFont,
                                                 FX_DWORD nEncodingID) {
   if (FXFT_Select_Charmap(pFont->m_Face, 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
 
 CFX_Font::CFX_Font() {
   m_pSubstFont = NULL;
   m_Face = NULL;
   m_bEmbedded = FALSE;
   m_bVertical = FALSE;
   m_pFontData = NULL;
   m_pFontDataAllocation = NULL;
   m_dwSize = 0;
@@ skipping 122 matching lines @@
   args.stream = stream1;
   if (FXFT_Open_Face(library, &args, faceIndex, Face)) {
     FX_Free(stream1);
     return FALSE;
   }
   if (stream) {
     *stream = stream1;
   }
   return TRUE;
 }
+
 FX_BOOL CFX_Font::LoadFile(IFX_FileRead* pFile,
                            int nFaceIndex,
                            int* pFaceCount) {
   m_bEmbedded = FALSE;
-  FXFT_Library library;
-  if (CFX_GEModule::Get()->GetFontMgr()->m_FTLibrary == NULL)
-    FXFT_Init_FreeType(&CFX_GEModule::Get()->GetFontMgr()->m_FTLibrary);
-  library = CFX_GEModule::Get()->GetFontMgr()->m_FTLibrary;
-  FXFT_Stream stream = NULL;
+
+  CFX_FontMgr* pFontMgr = CFX_GEModule::Get()->GetFontMgr();
+  pFontMgr->InitFTLibrary();
+  FXFT_Library library = pFontMgr->GetFTLibrary();
+
+  FXFT_Stream stream = nullptr;
   if (!_LoadFile(library, &m_Face, pFile, &stream, nFaceIndex))
     return FALSE;
+
   if (pFaceCount)
     *pFaceCount = (int)m_Face->num_faces;
   m_pOwnedStream = stream;
   FXFT_Set_Pixel_Sizes(m_Face, 0, 64);
   return TRUE;
 }
+
 int CFX_Font::GetGlyphWidth(FX_DWORD glyph_index) {
   if (!m_Face) {
     return 0;
   }
   if (m_pSubstFont && (m_pSubstFont->m_SubstFlags & FXFONT_SUBST_MM)) {
     AdjustMMParams(glyph_index, 0, 0);
   }
   int err = FXFT_Load_Glyph(
       m_Face, glyph_index,
       FXFT_LOAD_NO_SCALE | FXFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH);
   if (err) {
     return 0;
   }
   int width = EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face),
                         FXFT_Get_Glyph_HoriAdvance(m_Face));
   return width;
 }
-static FXFT_Face FT_LoadFont(uint8_t* pData, int size) {
-  FXFT_Library library;
-  if (CFX_GEModule::Get()->GetFontMgr()->m_FTLibrary == NULL) {
-    FXFT_Init_FreeType(&CFX_GEModule::Get()->GetFontMgr()->m_FTLibrary);
-  }
-  library = CFX_GEModule::Get()->GetFontMgr()->m_FTLibrary;
-  FXFT_Face face = NULL;
-  int error = FXFT_New_Memory_Face(library, pData, size, 0, &face);
-  if (error) {
-    return NULL;
-  }
-  error = FXFT_Set_Pixel_Sizes(face, 64, 64);
-  if (error) {
-    return NULL;
-  }
-  return face;
-}
+
 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((uint8_t*)m_pFontDataAllocation, size);
-  m_pFontData = (uint8_t*)m_pFontDataAllocation;
+  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() {
   if (m_Face == NULL) {
     return FALSE;
   }
   return FXFT_Is_Face_TT_OT(m_Face) == FXFT_FACE_FLAG_SFNT;
 }
@@ skipping 282 matching lines @@
 
   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;
 }