commit d50b640e42d46ab0f4d69cc58b3ba54e6137749c
author Tom Sepez <tsepez@chromium.org> Mon Oct 26 15:26:34 2015 -0700
committer Tom Sepez <tsepez@chromium.org> Mon Oct 26 15:26:34 2015 -0700
tree c3233d5418de27e68aeee8b06a0da4078d5bab91
parent bf551e3f70124ec9ccd5cf5bfeb8a562823db76e

Take FOXIT_FACE_COUNT and MM_FACE_COUNT constants from xfa

Make master closer to XFA and eliminate some magic numbers.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1410823005 .

core/include/fxge/fx_font.h

diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 36a739f..0ab529e 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -262,6 +262,9 @@
                           CFX_SubstFont* pSubstFont);
 
  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,
@@ -271,12 +274,12 @@
                              int picthfamily);
 
   FX_BOOL m_bListLoaded;
-  FXFT_Face m_MMFaces[2];
+  FXFT_Face m_MMFaces[MM_FACE_COUNT];
   CFX_ByteString m_LastFamily;
   CFX_DWordArray m_CharsetArray;
   CFX_ByteStringArray m_FaceArray;
   IFX_SystemFontInfo* m_pFontInfo;
-  FXFT_Face m_FoxitFaces[14];
+  FXFT_Face m_FoxitFaces[FOXIT_FACE_COUNT];
   IFX_FontEnumerator* m_pFontEnumerator;
   CFX_FontMgr* const m_pFontMgr;
 };

core/src/fxge/ge/fx_ge_fontmap.cpp

diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp
index 08e9d46..af0a9ef 100644
--- a/core/src/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/src/fxge/ge/fx_ge_fontmap.cpp
@@ -413,10 +413,10 @@
   FXSYS_memset(m_FoxitFaces, 0, sizeof(m_FoxitFaces));
 }
 CFX_FontMapper::~CFX_FontMapper() {
-  for (int i = 0; i < 14; i++)
-    if (m_FoxitFaces[i]) {
+  for (size_t i = 0; i < FX_ArraySize(m_FoxitFaces); ++i) {
+    if (m_FoxitFaces[i])
       FXFT_Done_Face(m_FoxitFaces[i]);
-    }
+  }
   if (m_MMFaces[0]) {
     FXFT_Done_Face(m_MMFaces[0]);
   }