commit 55a5cdc1dccf8a801a9040dadec124c9b84453c4
author Tom Sepez <tsepez@chromium.org> Fri Sep 03 19:08:53 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Sep 03 19:08:53 2021 +0000
tree 14abe61766d8f17623b5658a1453772898fb1275
parent fc2941fee9b69c2822e6e0e823df1cca845c0c40

Simplify calls to CPVT_FontMap::GetAnnotSysPDFFont()

It is only called from within the class, passing the same members
as arguments and storing its result back to the same member. So it
can be a non-static void method with no arguments.

-- rename to SetupAnnotSysPDFFont() since return is now void.

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

core/fpdfdoc/cpvt_fontmap.cpp

diff --git a/core/fpdfdoc/cpvt_fontmap.cpp b/core/fpdfdoc/cpvt_fontmap.cpp
index c095200..f337fa3 100644
--- a/core/fpdfdoc/cpvt_fontmap.cpp
+++ b/core/fpdfdoc/cpvt_fontmap.cpp
@@ -6,6 +6,8 @@
 
 #include "core/fpdfdoc/cpvt_fontmap.h"
 
+#include <utility>
+
 #include "core/fpdfapi/font/cpdf_font.h"
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
 #include "core/fpdfapi/parser/cpdf_document.h"
@@ -27,29 +29,24 @@
 
 CPVT_FontMap::~CPVT_FontMap() = default;
 
-// static
-RetainPtr<CPDF_Font> CPVT_FontMap::GetAnnotSysPDFFont(
-    CPDF_Document* pDoc,
-    CPDF_Dictionary* pResDict,
-    ByteString* pSysFontAlias) {
-  DCHECK(pSysFontAlias);
-  if (!pDoc || !pResDict)
-    return nullptr;
+void CPVT_FontMap::SetupAnnotSysPDFFont() {
+  if (!m_pDocument || !m_pResDict)
+    return;
 
-  CPDF_Dictionary* pFormDict = pDoc->GetRoot()->GetDictFor("AcroForm");
+  CPDF_Dictionary* pFormDict = m_pDocument->GetRoot()->GetDictFor("AcroForm");
   RetainPtr<CPDF_Font> pPDFFont =
-      CPDF_InteractiveForm::AddNativeInteractiveFormFont(pFormDict, pDoc,
-                                                         pSysFontAlias);
+      CPDF_InteractiveForm::AddNativeInteractiveFormFont(
+          pFormDict, m_pDocument.Get(), &m_sSysFontAlias);
   if (!pPDFFont)
-    return nullptr;
+    return;
 
-  CPDF_Dictionary* pFontList = pResDict->GetDictFor("Font");
+  CPDF_Dictionary* pFontList = m_pResDict->GetDictFor("Font");
   if (ValidateFontResourceDict(pFontList) &&
-      !pFontList->KeyExist(*pSysFontAlias)) {
-    pFontList->SetNewFor<CPDF_Reference>(*pSysFontAlias, pDoc,
+      !pFontList->KeyExist(m_sSysFontAlias)) {
+    pFontList->SetNewFor<CPDF_Reference>(m_sSysFontAlias, m_pDocument.Get(),
                                          pPDFFont->GetFontDict()->GetObjNum());
   }
-  return pPDFFont;
+  m_pSysFont = std::move(pPDFFont);
 }
 
 RetainPtr<CPDF_Font> CPVT_FontMap::GetPDFFont(int32_t nFontIndex) {
@@ -57,10 +54,8 @@
     case 0:
       return m_pDefFont;
     case 1:
-      if (!m_pSysFont) {
-        m_pSysFont = GetAnnotSysPDFFont(m_pDocument.Get(), m_pResDict.Get(),
-                                        &m_sSysFontAlias);
-      }
+      if (!m_pSysFont)
+        SetupAnnotSysPDFFont();
       return m_pSysFont;
     default:
       return nullptr;
@@ -72,10 +67,8 @@
     case 0:
       return m_sDefFontAlias;
     case 1:
-      if (!m_pSysFont) {
-        m_pSysFont = GetAnnotSysPDFFont(m_pDocument.Get(), m_pResDict.Get(),
-                                        &m_sSysFontAlias);
-      }
+      if (!m_pSysFont)
+        SetupAnnotSysPDFFont();
       return m_sSysFontAlias;
     default:
       return ByteString();

core/fpdfdoc/cpvt_fontmap.h

diff --git a/core/fpdfdoc/cpvt_fontmap.h b/core/fpdfdoc/cpvt_fontmap.h
index d5dddb5..00b7d24 100644
--- a/core/fpdfdoc/cpvt_fontmap.h
+++ b/core/fpdfdoc/cpvt_fontmap.h
@@ -35,11 +35,9 @@
   int32_t CharCodeFromUnicode(int32_t nFontIndex, uint16_t word) override;
   FX_Charset CharSetFromUnicode(uint16_t word, FX_Charset nOldCharset) override;
 
-  static RetainPtr<CPDF_Font> GetAnnotSysPDFFont(CPDF_Document* pDoc,
-                                                 CPDF_Dictionary* pResDict,
-                                                 ByteString* pSysFontAlias);
-
  private:
+  void SetupAnnotSysPDFFont();
+
   UnownedPtr<CPDF_Document> const m_pDocument;
   RetainPtr<CPDF_Dictionary> const m_pResDict;
   RetainPtr<CPDF_Font> const m_pDefFont;