Add CFX_FontFaceInfo constructor.

core/src/fxge/ge/text_int.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_SRC_FXGE_GE_TEXT_INT_H_
 #define CORE_SRC_FXGE_GE_TEXT_INT_H_
 
 struct _CFX_UniqueKeyGen {
@@ skipping 46 matching lines @@
     return Unicode;
   }
   virtual FX_BOOL IsUnicodeCompatible() const { return TRUE; }
 };
 #define CHARSET_FLAG_ANSI 1
 #define CHARSET_FLAG_SYMBOL 2
 #define CHARSET_FLAG_SHIFTJIS 4
 #define CHARSET_FLAG_BIG5 8
 #define CHARSET_FLAG_GB 16
 #define CHARSET_FLAG_KOREAN 32
-class CFontFaceInfo {
+
+class CFX_FontFaceInfo {
  public:
-  CFX_ByteString m_FilePath;
-  CFX_ByteString m_FaceName;
+  CFX_FontFaceInfo(CFX_ByteString filePath, CFX_ByteString faceName,
+                   CFX_ByteString fontTables, FX_DWORD fontOffset,
+                   FX_DWORD fileSize)
+      : m_FilePath(filePath),
+        m_FaceName(faceName),
+        m_FontTables(fontTables),
+        m_Styles(0),
+        m_Charsets(0),
+        m_FontOffset(fontOffset),
+        m_FileSize(fileSize) {}
+
+  const CFX_ByteString m_FilePath;
+  const CFX_ByteString m_FaceName;
+  const CFX_ByteString m_FontTables;
   FX_DWORD m_Styles;
   FX_DWORD m_Charsets;
-  FX_DWORD m_FontOffset;
-  FX_DWORD m_FileSize;
-  CFX_ByteString m_FontTables;
+  const FX_DWORD m_FontOffset;

[Lei Zhang, 2015/08/06 18:29:44]

maybe put all the constants together?

[Tom Sepez, 2015/08/06 18:40:42]

Sure.  But I'm more interested in putting like-types together, since they may
pack better (the lost art of struct packing).

+  const FX_DWORD m_FileSize;
 };
+
 class CFontFileFaceInfo {
  public:
   CFontFileFaceInfo();
   ~CFontFileFaceInfo();
+
   IFX_FileStream* m_pFile;
   FXFT_Face m_Face;
   CFX_ByteString m_FaceName;
   FX_DWORD m_Charsets;
   FX_DWORD m_FileSize;
   FX_DWORD m_FontOffset;
   int m_Weight;
   FX_BOOL m_bItalic;
   int m_PitchFamily;
   CFX_ByteString m_FontTables;
 };
 
 #endif  // CORE_SRC_FXGE_GE_TEXT_INT_H_