Fix some nits in CFX_FontMgr.

- Put |m_pBuiltinMapper| in the initializer list.
- Make GetBuiltinFont() static.

Change-Id: I23333160cd0a8bd463835426795e8e770b6389bd
Reviewed-on: https://pdfium-review.googlesource.com/c/50231
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxge/cfx_fontmgr.cpp

diff --git a/core/fxge/cfx_fontmgr.cpp b/core/fxge/cfx_fontmgr.cpp
index f3d74c3..ce52ce3 100644
--- a/core/fxge/cfx_fontmgr.cpp
+++ b/core/fxge/cfx_fontmgr.cpp
@@ -76,9 +76,8 @@
 
 }  // namespace
 
-CFX_FontMgr::CFX_FontMgr() {
-  m_pBuiltinMapper = pdfium::MakeUnique<CFX_FontMapper>(this);
-}
+CFX_FontMgr::CFX_FontMgr()
+    : m_pBuiltinMapper(pdfium::MakeUnique<CFX_FontMapper>(this)) {}
 
 CFX_FontMgr::~CFX_FontMgr() {
   // |m_FaceMap| and |m_pBuiltinMapper| reference |m_FTLibrary|, so they must
@@ -217,6 +216,7 @@
     FXFT_Done_Face(face);
 }
 
+// static
 Optional<pdfium::span<const uint8_t>> CFX_FontMgr::GetBuiltinFont(
     size_t index) {
   if (index < FX_ArraySize(g_FoxitFonts)) {

core/fxge/cfx_fontmgr.h

diff --git a/core/fxge/cfx_fontmgr.h b/core/fxge/cfx_fontmgr.h
index 27f69a8..6e9ced8 100644
--- a/core/fxge/cfx_fontmgr.h
+++ b/core/fxge/cfx_fontmgr.h
@@ -23,6 +23,8 @@
 
 class CFX_FontMgr {
  public:
+  static Optional<pdfium::span<const uint8_t>> GetBuiltinFont(size_t index);
+
   CFX_FontMgr();
   ~CFX_FontMgr();
 
@@ -57,7 +59,6 @@
                           int italic_angle,
                           int CharsetCP,
                           CFX_SubstFont* pSubstFont);
-  Optional<pdfium::span<const uint8_t>> GetBuiltinFont(size_t index);
 
   // Always present.
   CFX_FontMapper* GetBuiltinMapper() const { return m_pBuiltinMapper.get(); }