commit 73db4cacb3746e5dc72df06789f894a2e5f699cb
author Lei Zhang <thestig@chromium.org> Fri Mar 25 22:13:24 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Mar 25 22:13:24 2022 +0000
tree 9a9da194d63a151abce513119fa75fd37d349307
parent bfc816604b3690ed812d8c60383e23f82c16b26a

Encapsulate CFX_Win32FontInfo.

Mark parts of the class as private. Use more C++ style casts along the
way.

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

core/fxge/win32/cwin32_platform.cpp

diff --git a/core/fxge/win32/cwin32_platform.cpp b/core/fxge/win32/cwin32_platform.cpp
index 4b027724b..a50fd0f 100644
--- a/core/fxge/win32/cwin32_platform.cpp
+++ b/core/fxge/win32/cwin32_platform.cpp
@@ -91,7 +91,7 @@
   CFX_Win32FontInfo();
   ~CFX_Win32FontInfo() override;
 
-  // SystemFontInfoIface
+  // SystemFontInfoIface:
   bool EnumFontList(CFX_FontMapper* pMapper) override;
   void* MapFont(int weight,
                 bool bItalic,
@@ -106,8 +106,10 @@
   bool GetFontCharset(void* hFont, FX_Charset* charset) override;
   void DeleteFont(void* hFont) override;
 
-  bool IsSupportedFont(const LOGFONTA* plf);
   void AddInstalledFont(const LOGFONTA* plf, uint32_t font_type);
+
+ private:
+  bool IsSupportedFont(const LOGFONTA* plf);
   void GetGBPreference(ByteString& face, int weight, int pitch_family);
   void GetJapanesePreference(ByteString& face, int weight, int pitch_family);
   ByteString FindFont(const ByteString& name);
@@ -183,8 +185,8 @@
   lf.lfCharSet = static_cast<int>(FX_Charset::kDefault);
   lf.lfFaceName[0] = 0;
   lf.lfPitchAndFamily = 0;
-  EnumFontFamiliesExA(m_hDC, &lf, (FONTENUMPROCA)FontEnumProc, (uintptr_t)this,
-                      0);
+  EnumFontFamiliesExA(m_hDC, &lf, reinterpret_cast<FONTENUMPROCA>(FontEnumProc),
+                      reinterpret_cast<uintptr_t>(this), 0);
   return true;
 }