Make CFX_FontMgr member variables private. (try 2)

core/src/fxge/ge/fx_ge_fontmap.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 <limits>
 
 #include "../../../include/fxge/fx_ge.h"
 #include "../../../include/fxge/fx_freetype.h"
@@ skipping 62 matching lines @@
       return FALSE;
     }
   }
   m_RefCount--;
   if (m_RefCount) {
     return FALSE;
   }
   delete this;
   return TRUE;
 }
+
 CFX_FontMgr::CFX_FontMgr() : m_FTLibrary(nullptr) {
   m_pBuiltinMapper = new CFX_FontMapper(this);
-  FXSYS_memset(m_ExternalFonts, 0, sizeof m_ExternalFonts);
 }
+
 CFX_FontMgr::~CFX_FontMgr() {
   delete m_pBuiltinMapper;

[Tom Sepez, 2015/10/20 18:58:24]

Do we want to do this after the FXFT_DoneFreetype?

[Lei Zhang, 2015/10/20 19:13:57]

Ya, I was thinking about this on the commute. Maybe it's just being deleted in
the wrong order with the unique_ptr. I'll stare at this some more.

-  FreeCache();
-  if (m_FTLibrary) {
-    FXFT_Done_FreeType(m_FTLibrary);
-  }
+  for (const auto& pair : m_FaceMap)
+    delete pair.second;
+  FXFT_Done_FreeType(m_FTLibrary);

[Lei Zhang, 2015/10/20 18:13:31]

FT_Done_FreeType() checks its input already.

 }
+
 void CFX_FontMgr::InitFTLibrary() {
-  if (m_FTLibrary == NULL) {
-    FXFT_Init_FreeType(&m_FTLibrary);
-  }
+  if (m_FTLibrary)
+    return;
+  FXFT_Init_FreeType(&m_FTLibrary);
 }
-void CFX_FontMgr::FreeCache() {
-  for (const auto& pair : m_FaceMap) {
-    delete pair.second;
-  }
-  m_FaceMap.clear();
-}
+
 void CFX_FontMgr::SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo) {
   m_pBuiltinMapper->SetSystemFontInfo(pFontInfo);
 }
+
 FXFT_Face CFX_FontMgr::FindSubstFont(const CFX_ByteString& face_name,
                                      FX_BOOL bTrueType,
                                      FX_DWORD flags,
                                      int weight,
                                      int italic_angle,
                                      int CharsetCP,
                                      CFX_SubstFont* pSubstFont) {
-  if (!m_FTLibrary) {
-    FXFT_Init_FreeType(&m_FTLibrary);
-  }
+  InitFTLibrary();
   return m_pBuiltinMapper->FindSubstFont(face_name, bTrueType, flags, weight,
                                          italic_angle, CharsetCP, pSubstFont);
 }
+
 FXFT_Face CFX_FontMgr::GetCachedFace(const CFX_ByteString& face_name,
                                      int weight,
                                      FX_BOOL bItalic,
                                      uint8_t*& pFontData) {
   auto it = m_FaceMap.find(KeyNameFromFace(face_name, weight, bItalic));
   if (it == m_FaceMap.end())
     return nullptr;
 
   CTTFontDesc* pFontDesc = it->second;
   pFontData = pFontDesc->m_pFontData;
   pFontDesc->m_RefCount++;
   return pFontDesc->m_SingleFace.m_pFace;
 }
 FXFT_Face CFX_FontMgr::AddCachedFace(const CFX_ByteString& face_name,
                                      int weight,
                                      FX_BOOL bItalic,
                                      uint8_t* pData,
                                      FX_DWORD size,
                                      int face_index) {
   CTTFontDesc* pFontDesc = new CTTFontDesc;
   pFontDesc->m_Type = 1;
   pFontDesc->m_SingleFace.m_pFace = NULL;
   pFontDesc->m_SingleFace.m_bBold = weight;
   pFontDesc->m_SingleFace.m_bItalic = bItalic;
   pFontDesc->m_pFontData = pData;
   pFontDesc->m_RefCount = 1;
-  FXFT_Library library;
-  if (m_FTLibrary == NULL) {
-    FXFT_Init_FreeType(&m_FTLibrary);
-  }
-  library = m_FTLibrary;
+
+  InitFTLibrary();
+  FXFT_Library library = m_FTLibrary;
   int ret = FXFT_New_Memory_Face(library, pData, size, face_index,
                                  &pFontDesc->m_SingleFace.m_pFace);
   if (ret) {
     delete pFontDesc;
     return NULL;
   }
   ret = FXFT_Set_Pixel_Sizes(pFontDesc->m_SingleFace.m_pFace, 64, 64);
   if (ret) {
     delete pFontDesc;
     return NULL;
@@ skipping 166 matching lines @@
   for (int i = 0; i < 16; i++) {
     pFontDesc->m_TTCFace.m_pFaces[i] = NULL;
   }
   pFontDesc->m_RefCount++;
   m_FaceMap[KeyNameFromSize(ttc_size, checksum)] = pFontDesc;
   int face_index = GetTTCIndex(pFontDesc->m_pFontData, ttc_size, font_offset);
   pFontDesc->m_TTCFace.m_pFaces[face_index] =
       GetFixedFace(pFontDesc->m_pFontData, ttc_size, face_index);
   return pFontDesc->m_TTCFace.m_pFaces[face_index];
 }
+
 FXFT_Face CFX_FontMgr::GetFixedFace(const uint8_t* pData,
                                     FX_DWORD size,
                                     int face_index) {
-  FXFT_Library library;
-  if (m_FTLibrary == NULL) {
-    FXFT_Init_FreeType(&m_FTLibrary);
-  }
-  library = m_FTLibrary;
-  FXFT_Face face = NULL;
-  int ret = FXFT_New_Memory_Face(library, pData, size, face_index, &face);
-  if (ret) {
-    return NULL;
-  }
-  ret = FXFT_Set_Pixel_Sizes(face, 64, 64);
-  if (ret) {
-    return NULL;
-  }
-  return face;
+  InitFTLibrary();
+  FXFT_Library library = m_FTLibrary;
+  FXFT_Face face = nullptr;
+  if (FXFT_New_Memory_Face(library, pData, size, face_index, &face))
+    return nullptr;
+  return FXFT_Set_Pixel_Sizes(face, 64, 64) ? nullptr : face;
 }
+
 FXFT_Face CFX_FontMgr::GetFileFace(const FX_CHAR* filename, int face_index) {
-  FXFT_Library library;
-  if (m_FTLibrary == NULL) {
-    FXFT_Init_FreeType(&m_FTLibrary);
-  }
-  library = m_FTLibrary;
-  FXFT_Face face = NULL;
-  int ret = FXFT_New_Face(library, filename, face_index, &face);
-  if (ret) {
-    return NULL;
-  }
-  ret = FXFT_Set_Pixel_Sizes(face, 64, 64);
-  if (ret) {
-    return NULL;
-  }
-  return face;
+  InitFTLibrary();
+  FXFT_Library library = m_FTLibrary;
+  FXFT_Face face = nullptr;
+  if (FXFT_New_Face(library, filename, face_index, &face))
+    return nullptr;
+  return FXFT_Set_Pixel_Sizes(face, 64, 64) ? nullptr : face;
 }
+
 void CFX_FontMgr::ReleaseFace(FXFT_Face face) {
   if (!face) {
     return;
   }
   auto it = m_FaceMap.begin();
   while (it != m_FaceMap.end()) {
     auto temp = it++;
     if (temp->second->ReleaseFace(face)) {
       m_FaceMap.erase(temp);
     }
@@ skipping 667 matching lines @@
         if ((nStyle & 0x3) == 1) {
           iBaseFont += 1;
         }
         if ((nStyle & 0x3) == 2) {
           iBaseFont += 3;
         }
         if ((nStyle & 0x3) == 3) {
           iBaseFont += 2;
         }
       }
-      if (m_pFontMgr->m_ExternalFonts[iBaseFont].m_pFontData) {
-        if (m_FoxitFaces[iBaseFont]) {
-          return m_FoxitFaces[iBaseFont];
-        }
-        m_FoxitFaces[iBaseFont] = m_pFontMgr->GetFixedFace(
-            m_pFontMgr->m_ExternalFonts[iBaseFont].m_pFontData,
-            m_pFontMgr->m_ExternalFonts[iBaseFont].m_dwSize, 0);
-        if (m_FoxitFaces[iBaseFont]) {
-          return m_FoxitFaces[iBaseFont];
-        }
-      } else {
-        family = g_Base14FontNames[iBaseFont];
-      }
+      family = g_Base14FontNames[iBaseFont];
       pSubstFont->m_SubstFlags |= FXFONT_SUBST_STANDARD;
     }
   } else {
     if (flags & FXFONT_ITALIC) {
       bItalic = TRUE;
     }
   }
   iExact = !match.IsEmpty();
   void* hFont = m_pFontInfo->MapFont(weight, bItalic, Charset, PitchFamily,
                                      family, iExact);
@@ skipping 480 matching lines @@
 int PDF_GetStandardFontName(CFX_ByteString* name) {
   AltFontName* found = static_cast<AltFontName*>(
       FXSYS_bsearch(name->c_str(), g_AltFontNames, FX_ArraySize(g_AltFontNames),
                     sizeof(AltFontName), compareString));
   if (!found)
     return -1;
 
   *name = g_Base14FontNames[found->m_Index];
   return found->m_Index;
 }