Banish CFX_ByteStringArray and CFX_WideStringArray to the XFA side.

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>
 #include <memory>
+#include <vector>
 
 #include "core/include/fxcrt/fx_system.h"
-#include "fx_dib.h"
+#include "core/include/fxge/fx_dib.h"
+#include "third_party/base/stl_util.h"

[Lei Zhang, 2016/02/17 02:17:21]

move GetFaceSize() impl to .cpp file instead?

[Tom Sepez, 2016/02/17 18:07:47]

Done.

 
 typedef struct FT_FaceRec_* FXFT_Face;
 typedef void* FXFT_Library;
 
 class CFX_FaceCache;
 class CFX_FontFaceInfo;
 class CFX_FontMapper;
 class CFX_PathData;
 class CFX_SizeGlyphCache;
 class CFX_SubstFont;
@@ skipping 274 matching lines @@
 
 class CFX_FontMapper {
  public:
   explicit CFX_FontMapper(CFX_FontMgr* mgr);
   ~CFX_FontMapper();
 
   void SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo);
   IFX_SystemFontInfo* GetSystemFontInfo() { return m_pFontInfo; }
   void AddInstalledFont(const CFX_ByteString& name, int charset);
   void LoadInstalledFonts();
-  CFX_ByteStringArray m_InstalledTTFonts;
+  std::vector<CFX_ByteString> m_InstalledTTFonts;
   void SetFontEnumerator(IFX_FontEnumerator* pFontEnumerator) {
     m_pFontEnumerator = pFontEnumerator;
   }
   IFX_FontEnumerator* GetFontEnumerator() const { return m_pFontEnumerator; }
   FXFT_Face FindSubstFont(const CFX_ByteString& face_name,
                           FX_BOOL bTrueType,
                           FX_DWORD flags,
                           int weight,
                           int italic_angle,
                           int CharsetCP,
                           CFX_SubstFont* pSubstFont);
 #ifdef PDF_ENABLE_XFA
   FXFT_Face FindSubstFontByUnicode(FX_DWORD dwUnicode,
                                    FX_DWORD flags,
                                    int weight,
                                    int italic_angle);
 #endif  // PDF_ENABLE_XFA
   FX_BOOL IsBuiltinFace(const FXFT_Face face) const;
-  int GetFaceSize() const { return m_FaceArray.GetSize(); }
+  int GetFaceSize() const { return pdfium::CollectionSize<int>(m_FaceArray); }
   CFX_ByteString GetFaceName(int index) const { return m_FaceArray[index]; }
 
  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);
 
   FX_BOOL m_bListLoaded;
   FXFT_Face m_MMFaces[MM_FACE_COUNT];
   CFX_ByteString m_LastFamily;
   CFX_DWordArray m_CharsetArray;
-  CFX_ByteStringArray m_FaceArray;
+  std::vector<CFX_ByteString> m_FaceArray;
   IFX_SystemFontInfo* m_pFontInfo;
   FXFT_Face m_FoxitFaces[FOXIT_FACE_COUNT];
   IFX_FontEnumerator* m_pFontEnumerator;
   CFX_FontMgr* const m_pFontMgr;
 };
 
 class IFX_SystemFontInfo {
  public:
   static IFX_SystemFontInfo* CreateDefault(const char** pUserPaths);
   virtual void Release() = 0;
@@ skipping 52 matching lines @@
   void* GetFont(const FX_CHAR* face) override;
   FX_DWORD GetFontData(void* hFont,
                        FX_DWORD table,
                        uint8_t* buffer,
                        FX_DWORD size) override;
   void DeleteFont(void* hFont) override;
   FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) override;
   FX_BOOL GetFontCharset(void* hFont, int& charset) override;
 
  protected:
-  std::map<CFX_ByteString, CFX_FontFaceInfo*> m_FontList;
-  CFX_ByteStringArray m_PathList;
-  CFX_FontMapper* m_pMapper;
-  void ScanPath(CFX_ByteString& path);
-  void ScanFile(CFX_ByteString& path);
-  void ReportFace(CFX_ByteString& path,
+  void ScanPath(const CFX_ByteString& path);
+  void ScanFile(const CFX_ByteString& path);
+  void ReportFace(const CFX_ByteString& path,
                   FXSYS_FILE* pFile,
                   FX_DWORD filesize,
                   FX_DWORD offset);
   void* GetSubstFont(const CFX_ByteString& face);
   void* FindFont(int weight,
                  FX_BOOL bItalic,
                  int charset,
                  int pitch_family,
                  const FX_CHAR* family,
                  FX_BOOL bMatchName);
+
+  std::map<CFX_ByteString, CFX_FontFaceInfo*> m_FontList;
+  std::vector<CFX_ByteString> m_PathList;
+  CFX_FontMapper* m_pMapper;
 };
+
 class CFX_CountedFaceCache {
  public:
   CFX_FaceCache* m_Obj;
   FX_DWORD m_nCount;
 };
 
 class CFX_FontCache {
  public:
   ~CFX_FontCache();
   CFX_FaceCache* GetCachedFace(CFX_Font* pFont);
@@ skipping 85 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_