Clean up xfa_fontmgr.cpp.

xfa/fxfa/include/xfa_fontmgr.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 XFA_FXFA_INCLUDE_XFA_FONTMGR_H_
 #define XFA_FXFA_INCLUDE_XFA_FONTMGR_H_
 
 #include <map>
@@ skipping 33 matching lines @@
 };
 
 class CXFA_PDFFontMgr {
  public:
   explicit CXFA_PDFFontMgr(CXFA_FFDoc* pDoc);
   ~CXFA_PDFFontMgr();
 
   CFGAS_GEFont* GetFont(const CFX_WideStringC& wsFontFamily,
                         uint32_t dwFontStyles,
                         CPDF_Font** pPDFFont,
-                        FX_BOOL bStrictMatch = TRUE);
-  FX_BOOL GetCharWidth(CFGAS_GEFont* pFont,
-                       FX_WCHAR wUnicode,
-                       int32_t& iWidth,
-                       FX_BOOL bCharCode);
-  std::map<CFGAS_GEFont*, CPDF_Font*> m_FDE2PDFFont;
+                        bool bStrictMatch);
+  bool GetCharWidth(const CFGAS_GEFont* pFont,
+                    FX_WCHAR wUnicode,
+                    bool bCharCode,
+                    int32_t* pWidth);
+  void SetFont(const CFGAS_GEFont* pFont, CPDF_Font* pPDFFont);
 
  protected:
-  CFGAS_GEFont* FindFont(CFX_ByteString strFamilyName,
-                         FX_BOOL bBold,
-                         FX_BOOL bItalic,
+  CFGAS_GEFont* FindFont(const CFX_ByteString& strFamilyName,
+                         bool bBold,
+                         bool bItalic,
                          CPDF_Font** pPDFFont,
-                         FX_BOOL bStrictMatch = TRUE);
+                         bool bStrictMatch);
   CFX_ByteString PsNameToFontName(const CFX_ByteString& strPsName,
-                                  FX_BOOL bBold,
-                                  FX_BOOL bItalic);
-  FX_BOOL PsNameMatchDRFontName(const CFX_ByteStringC& bsPsName,
-                                FX_BOOL bBold,
-                                FX_BOOL bItalic,
-                                const CFX_ByteString& bsDRFontName,
-                                FX_BOOL bStrictMatch = TRUE);
+                                  bool bBold,
+                                  bool bItalic);
+  bool PsNameMatchDRFontName(const CFX_ByteStringC& bsPsName,
+                             bool bBold,
+                             bool bItalic,
+                             const CFX_ByteString& bsDRFontName,
+                             bool bStrictMatch);
 
-  CXFA_FFDoc* m_pDoc;
+  CXFA_FFDoc* const m_pDoc;
+  std::map<const CFGAS_GEFont*, CPDF_Font*> m_FDE2PDFFont;
   std::map<CFX_ByteString, CFGAS_GEFont*> m_FontMap;
 };
 
 class CXFA_FontMgr {
  public:
   CXFA_FontMgr();
   ~CXFA_FontMgr();
 
   CFGAS_GEFont* GetFont(CXFA_FFDoc* hDoc,
                         const CFX_WideStringC& wsFontFamily,
                         uint32_t dwFontStyles,
                         uint16_t wCodePage = 0xFFFF);
   void LoadDocFonts(CXFA_FFDoc* hDoc);
   void ReleaseDocFonts(CXFA_FFDoc* hDoc);
   void SetDefFontMgr(std::unique_ptr<CXFA_DefFontMgr> pFontMgr);
 
  protected:
   std::unique_ptr<CXFA_DefFontMgr> m_pDefFontMgr;
   std::map<CXFA_FFDoc*, std::unique_ptr<CXFA_PDFFontMgr>> m_PDFFontMgrMap;
   std::map<CFX_ByteString, CFGAS_GEFont*> m_FontMap;
 };
 
 #endif  //  XFA_FXFA_INCLUDE_XFA_FONTMGR_H_