Use FXFONT defines in place of integers.

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 25 matching lines @@
 #define FXFONT_SERIF 0x02
 #define FXFONT_SYMBOLIC 0x04
 #define FXFONT_SCRIPT 0x08
 #define FXFONT_ITALIC 0x40
 #define FXFONT_BOLD 0x40000
 #define FXFONT_USEEXTERNATTR 0x80000
 #define FXFONT_CIDFONT 0x100000
 #ifdef PDF_ENABLE_XFA
 #define FXFONT_EXACTMATCH 0x80000000
 #endif  // PDF_ENABLE_XFA
 #define FXFONT_ANSI_CHARSET 0

[Lei Zhang, 2016/06/21 20:32:32]

A follow up CL will replace these with an enum, and consolidate redundant
#defines.

[dsinclair, 2016/06/21 20:43:38]

Can they be an enum class instead of a plain enum?

[Lei Zhang, 2016/06/21 20:46:36]

That is the plan.

 #define FXFONT_DEFAULT_CHARSET 1
 #define FXFONT_SYMBOL_CHARSET 2
 #define FXFONT_SHIFTJIS_CHARSET 128
 #define FXFONT_HANGEUL_CHARSET 129
 #define FXFONT_GB2312_CHARSET 134
 #define FXFONT_CHINESEBIG5_CHARSET 136
 #define FXFONT_THAI_CHARSET 222
 #define FXFONT_EASTEUROPE_CHARSET 238
 #define FXFONT_RUSSIAN_CHARSET 204
 #define FXFONT_GREEK_CHARSET 161
@@ skipping 154 matching lines @@
 #define FXFONT_SUBST_TRANSFORM 0x10
 #define FXFONT_SUBST_NONSYMBOL 0x20
 #define FXFONT_SUBST_EXACT 0x40
 #define FXFONT_SUBST_STANDARD 0x80
 
 class CFX_SubstFont {
  public:
   CFX_SubstFont();
 
   void* m_ExtHandle;
+  CFX_ByteString m_Family;
+  int m_Charset;
+  uint32_t m_SubstFlags;
+  int m_Weight;
+  int m_ItalicAngle;
+  bool m_bSubstCJK;
+  int m_WeightCJK;
+  bool m_bItalicCJK;
+};
 
-  CFX_ByteString m_Family;
-
-  int m_Charset;
-
-  uint32_t m_SubstFlags;
-
-  int m_Weight;
-
-  int m_ItalicAngle;
-
-  FX_BOOL m_bSubstOfCJK;
-
-  int m_WeightCJK;
-
-  FX_BOOL m_bItlicCJK;
-};
 #define FX_FONT_FLAG_SERIF 0x01
 #define FX_FONT_FLAG_FIXEDPITCH 0x02
 #define FX_FONT_FLAG_ITALIC 0x04
 #define FX_FONT_FLAG_BOLD 0x08
 #define FX_FONT_FLAG_SYMBOLIC_SYMBOL 0x10
 #define FX_FONT_FLAG_SYMBOLIC_DINGBATS 0x20
 #define FX_FONT_FLAG_MULTIPLEMASTER 0x40
 
 class CFX_FontMgr {
  public:
@@ skipping 336 matching lines @@
                            FX_FLOAT retinaScaleX = 1.0f,
                            FX_FLOAT retinaScaleY = 1.0f);
 
 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_