commit 8422489746e3e04387c33105f15cfbd9a475ce88
author Lei Zhang <thestig@chromium.org> Fri Jul 15 20:38:19 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jul 15 20:38:19 2022 +0000
tree 146f3953f7049b662036385b707d89341adf0ef3
parent 97d28dc9f1ef53457d46474d0012275ab42ae828

Reuse CFX_Win32FontInfo::GetFaceName().

Replace a snippet of code that looks very similar to GetFaceName() with
a GetFaceName() call. i.e. Consolidate callers to GetTextFaceA(). Also
fix some nits along the way.

Change-Id: Ic61c6e9dcc460d407d141e99f24c1ad3170dfcd8
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/95351
Reviewed-by: Nigi <nigi@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 2001247..1f3f7b7 100644
--- a/core/fxge/win32/cwin32_platform.cpp
+++ b/core/fxge/win32/cwin32_platform.cpp
@@ -334,21 +334,19 @@
   }
   HFONT hFont = Win32CreateFont(weight, bItalic, charset, subst_pitch_family,
                                 new_face.c_str());
-  char facebuf[100];
-  {
-    ScopedSelectObject select_object(m_hDC, hFont);
-    ::GetTextFaceA(m_hDC, std::size(facebuf), facebuf);
-  }
-  if (new_face.EqualNoCase(facebuf))
+  ByteString actual_new_face;
+  if (GetFaceName(hFont, &actual_new_face) &&
+      new_face.EqualNoCase(actual_new_face.AsStringView())) {
     return hFont;
+  }
 
-  WideString wsFace = WideString::FromDefANSI(facebuf);
-  for (size_t i = 0; i < std::size(kVariantNames); ++i) {
-    if (new_face != kVariantNames[i].m_pFaceName)
+  WideString wsFace = WideString::FromDefANSI(actual_new_face.AsStringView());
+  for (const Variant& variant : kVariantNames) {
+    if (new_face != variant.m_pFaceName)
       continue;
 
-    const unsigned short* pName = reinterpret_cast<const unsigned short*>(
-        kVariantNames[i].m_pVariantName);
+    const auto* pName =
+        reinterpret_cast<const unsigned short*>(variant.m_pVariantName);
     size_t len = WideString::WStringLength(pName);
     WideString wsName = WideString::FromUTF16LE(pName, len);
     if (wsFace == wsName)
@@ -397,7 +395,7 @@
 bool CFX_Win32FontInfo::GetFaceName(void* hFont, ByteString* name) {
   ScopedSelectObject select_object(m_hDC, static_cast<HFONT>(hFont));
   char facebuf[100];
-  if (::GetTextFaceA(m_hDC, 100, facebuf) == 0)
+  if (::GetTextFaceA(m_hDC, std::size(facebuf), facebuf) == 0)
     return false;
 
   *name = facebuf;