commit 1a7df1251fc8b913b7ea6e21e4d2fd90b889007e
author Lei Zhang <thestig@chromium.org> Tue Aug 25 19:21:26 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Aug 25 19:21:26 2020 +0000
tree 45f014e6bd81e828c1d08e0f4f23b25359824707
parent 42aaf8bd7f23e39e85c843d36f5a041870726279

Simplify RetrieveSpecificFont().

One of its parameters is always the same.

Change-Id: I5ffb863fd9e30dc30a5afc1b7d58574033efa9e2
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/73070
Reviewed-by: Hui Yingst <nigi@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fpdfdoc/cpdf_interactiveform.cpp

diff --git a/core/fpdfdoc/cpdf_interactiveform.cpp b/core/fpdfdoc/cpdf_interactiveform.cpp
index ff84ef2..136a48e 100644
--- a/core/fpdfdoc/cpdf_interactiveform.cpp
+++ b/core/fpdfdoc/cpdf_interactiveform.cpp
@@ -372,13 +372,10 @@
   return fd.bFind;
 }
 
-bool RetrieveSpecificFont(uint8_t charSet,
-                          uint8_t pitchAndFamily,
-                          LPCSTR pcsFontName,
-                          LOGFONTA& lf) {
+bool RetrieveSpecificFont(uint8_t charSet, LPCSTR pcsFontName, LOGFONTA& lf) {
   memset(&lf, 0, sizeof(LOGFONTA));
   lf.lfCharSet = charSet;
-  lf.lfPitchAndFamily = pitchAndFamily;
+  lf.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
   if (pcsFontName) {
     // TODO(dsinclair): Should this be strncpy?
     // NOLINTNEXTLINE(runtime/printf)
@@ -629,28 +626,20 @@
   bool bRet = false;
   const ByteString default_font_name =
       CFX_Font::GetDefaultFontNameByCharset(charSet);
-  if (!default_font_name.IsEmpty()) {
-    bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE,
-                                default_font_name.c_str(), lf);
-  }
-  if (!bRet) {
-    bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE,
-                                CFX_Font::kUniversalDefaultFontName, lf);
-  }
-  if (!bRet) {
-    bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE,
-                                "Microsoft Sans Serif", lf);
-  }
+  if (!default_font_name.IsEmpty())
+    bRet = RetrieveSpecificFont(charSet, default_font_name.c_str(), lf);
   if (!bRet) {
     bRet =
-        RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE, nullptr, lf);
+        RetrieveSpecificFont(charSet, CFX_Font::kUniversalDefaultFontName, lf);
   }
+  if (!bRet)
+    bRet = RetrieveSpecificFont(charSet, "Microsoft Sans Serif", lf);
+  if (!bRet)
+    bRet = RetrieveSpecificFont(charSet, nullptr, lf);
   if (bRet) {
     if (pLogFont)
       memcpy(pLogFont, &lf, sizeof(LOGFONTA));
-
     csFontName = lf.lfFaceName;
-    return csFontName;
   }
 #endif
   return csFontName;