Splitting fx_ge_fontmap.cpp

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 53 matching lines @@
 #define FXFONT_FW_NORMAL 400
 #define FXFONT_FW_BOLD 700
 
 #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
 
+#define GET_TT_SHORT(w) (uint16_t)(((w)[0] << 8) | (w)[1])
+#define GET_TT_LONG(w) \
+  (uint32_t)(((w)[0] << 24) | ((w)[1] << 16) | ((w)[2] << 8) | (w)[3])
+
 class CFX_Font {
  public:
   CFX_Font();
   ~CFX_Font();
 
   void LoadSubst(const CFX_ByteString& face_name,
                  FX_BOOL bTrueType,
                  uint32_t flags,
                  int weight,
                  int italic_angle,
@@ skipping 331 matching lines @@
 
   const CFX_ByteString m_FilePath;
   const CFX_ByteString m_FaceName;
   const CFX_ByteString m_FontTables;
   const uint32_t m_FontOffset;
   const uint32_t m_FileSize;
   uint32_t m_Styles;
   uint32_t m_Charsets;
 };
 
 class CFX_FolderFontInfo : public IFX_SystemFontInfo {

[dsinclair, 2016/07/27 14:17:40]

Can you also split the headers out to their own files for each of the classes
you split?

  public:
   CFX_FolderFontInfo();
   ~CFX_FolderFontInfo() override;
 
   void AddPath(const CFX_ByteStringC& path);
 
   // IFX_SytemFontInfo:
   FX_BOOL EnumFontList(CFX_FontMapper* pMapper) override;
   void* MapFont(int weight,
                 FX_BOOL bItalic,
@@ skipping 138 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_