Record all fonts, not just one per charset.

core/fxge/include/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_FXGE_INCLUDE_FX_FONT_H_
 #define CORE_FXGE_INCLUDE_FX_FONT_H_
 
 #include <map>
@@ skipping 303 matching lines @@
                           int CharsetCP,
                           CFX_SubstFont* pSubstFont);
 #ifdef PDF_ENABLE_XFA
   FXFT_Face FindSubstFontByUnicode(uint32_t dwUnicode,
                                    uint32_t flags,
                                    int weight,
                                    int italic_angle);
 #endif  // PDF_ENABLE_XFA
   FX_BOOL IsBuiltinFace(const FXFT_Face face) const;
   int GetFaceSize() const;
-  CFX_ByteString GetFaceName(int index) const { return m_FaceArray[index]; }
+  CFX_ByteString GetFaceName(int index) const {
+    return m_FaceArray[index].name;
+  }
 
   std::vector<CFX_ByteString> m_InstalledTTFonts;
 
  private:
   static const size_t MM_FACE_COUNT = 2;
   static const size_t FOXIT_FACE_COUNT = 14;
 
   CFX_ByteString GetPSNameFromTT(void* hFont);
   CFX_ByteString MatchInstalledFonts(const CFX_ByteString& norm_name);
   FXFT_Face UseInternalSubst(CFX_SubstFont* pSubstFont,
                              int iBaseFont,
                              int italic_angle,
                              int weight,
                              int picthfamily);
 
+  struct FaceData {
+    CFX_ByteString name;
+    uint32_t charset;
+  };
+
   FX_BOOL m_bListLoaded;
   FXFT_Face m_MMFaces[MM_FACE_COUNT];
   CFX_ByteString m_LastFamily;
-  CFX_ArrayTemplate<uint32_t> m_CharsetArray;
-  std::vector<CFX_ByteString> m_FaceArray;
+  std::vector<FaceData> m_FaceArray;
   IFX_SystemFontInfo* m_pFontInfo;
   FXFT_Face m_FoxitFaces[FOXIT_FACE_COUNT];
   CFX_FontMgr* const m_pFontMgr;
 };
 
 class IFX_SystemFontInfo {
  public:
   static IFX_SystemFontInfo* CreateDefault(const char** pUserPaths);
   virtual void Release() = 0;
 
@@ skipping 189 matching lines @@
   virtual ~IFX_GSUBTable() {}
 };
 
 CFX_ByteString GetNameFromTT(const uint8_t* name_table,
                              uint32_t name_table_size,
                              uint32_t name);
 
 int PDF_GetStandardFontName(CFX_ByteString* name);
 
 #endif  // CORE_FXGE_INCLUDE_FX_FONT_H_