Make CFX_FontMgr member variables private. (try 2)

core/include/fxge/fx_font.h

 // 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
 
 #ifndef CORE_INCLUDE_FXGE_FX_FONT_H_
 #define CORE_INCLUDE_FXGE_FX_FONT_H_
 
 #include <map>
@@ skipping 158 matching lines @@
 #define FX_FONT_FLAG_SYMBOLIC_DINGBATS 0x20
 #define FX_FONT_FLAG_MULTIPLEMASTER 0x40
 typedef struct {
   const uint8_t* m_pFontData;
   FX_DWORD m_dwSize;
 } FoxitFonts;
 class CFX_FontMgr {
  public:
   CFX_FontMgr();
   ~CFX_FontMgr();
-  void InitFTLibrary();
+
   FXFT_Face GetCachedFace(const CFX_ByteString& face_name,
                           int weight,
                           FX_BOOL bItalic,
                           uint8_t*& pFontData);
   FXFT_Face AddCachedFace(const CFX_ByteString& face_name,
                           int weight,
                           FX_BOOL bItalic,
                           uint8_t* pData,
                           FX_DWORD size,
                           int face_index);
@@ skipping 10 matching lines @@
   FXFT_Face GetFixedFace(const uint8_t* pData, FX_DWORD size, int face_index);
   void ReleaseFace(FXFT_Face face);
   void SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo);
   FXFT_Face FindSubstFont(const CFX_ByteString& face_name,
                           FX_BOOL bTrueType,
                           FX_DWORD flags,
                           int weight,
                           int italic_angle,
                           int CharsetCP,
                           CFX_SubstFont* pSubstFont);
-  void FreeCache();
   FX_BOOL GetStandardFont(const uint8_t*& pFontData, FX_DWORD& size, int index);
+  CFX_FontMapper* GetBuiltinMapper() const { return m_pBuiltinMapper; }
+  FXFT_Library GetFTLibrary() const { return m_FTLibrary; }
 
+ private:
+  void InitFTLibrary();
+
+  // TODO(thestig): Figure out why making this a unique_ptr does not work.
   CFX_FontMapper* m_pBuiltinMapper;

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

I bet someone is abusing GetBuiltinMapper(). Will figure that out separately.

[Lei Zhang, 2015/10/20 22:12:15]

Well, I lost that bet. Good thing I didn't go all in.

   std::map<CFX_ByteString, CTTFontDesc*> m_FaceMap;
   FXFT_Library m_FTLibrary;
-  FoxitFonts m_ExternalFonts[16];
 };
 
 class IFX_FontEnumerator {
  public:
   virtual void HitFont() = 0;
 
   virtual void Finish() = 0;
 
  protected:
   virtual ~IFX_FontEnumerator() {}
@@ skipping 214 matching lines @@
 
  protected:
   virtual ~IFX_GSUBTable() {}
 };
 
 CFX_ByteString GetNameFromTT(const uint8_t* name_table, FX_DWORD name);
 
 int PDF_GetStandardFontName(CFX_ByteString* name);
 
 #endif  // CORE_INCLUDE_FXGE_FX_FONT_H_