commit f0729fffd192ca247dda242d60762cbc21656409
author Tom Sepez <tsepez@chromium.org> Sat Jan 11 00:35:20 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Sat Jan 11 00:35:20 2020 +0000
tree eeb15aad506229f93069c9a2d91b5d3c30225a10
parent 0583b29601136495ad4786d8cbb7f0e816a68c95

No need to pass |pDoc| in CBA_FontMap methods.

It's already available as |m_pDocument| member variable, and is
non-null.

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

core/fpdfdoc/cba_fontmap.cpp

diff --git a/core/fpdfdoc/cba_fontmap.cpp b/core/fpdfdoc/cba_fontmap.cpp
index ca806f2..f457b6a 100644
--- a/core/fpdfdoc/cba_fontmap.cpp
+++ b/core/fpdfdoc/cba_fontmap.cpp
@@ -372,7 +372,7 @@
       bFind ? FindFontSameCharset(&sAlias, nCharset) : nullptr;
   if (!pFont) {
     ByteString sTemp = sFontName;
-    pFont = AddFontToDocument(m_pDocument.Get(), sTemp, nCharset);
+    pFont = AddFontToDocument(sTemp, nCharset);
     sAlias = EncodeFontAlias(sTemp, nCharset);
   }
   AddFontToAnnotDict(pFont, sAlias);
@@ -441,13 +441,12 @@
   return sNew;
 }
 
-RetainPtr<CPDF_Font> CBA_FontMap::AddFontToDocument(CPDF_Document* pDoc,
-                                                    ByteString& sFontName,
+RetainPtr<CPDF_Font> CBA_FontMap::AddFontToDocument(ByteString sFontName,
                                                     uint8_t nCharset) {
   if (IsStandardFont(sFontName))
-    return AddStandardFont(pDoc, sFontName);
+    return AddStandardFont(sFontName);
 
-  return AddSystemFont(pDoc, sFontName, nCharset);
+  return AddSystemFont(sFontName, nCharset);
 }
 
 bool CBA_FontMap::IsStandardFont(const ByteString& sFontName) {
@@ -472,12 +471,8 @@
   return false;
 }
 
-RetainPtr<CPDF_Font> CBA_FontMap::AddStandardFont(CPDF_Document* pDoc,
-                                                  ByteString& sFontName) {
-  if (!pDoc)
-    return nullptr;
-
-  auto* pPageData = CPDF_DocPageData::FromDocument(pDoc);
+RetainPtr<CPDF_Font> CBA_FontMap::AddStandardFont(ByteString sFontName) {
+  auto* pPageData = CPDF_DocPageData::FromDocument(m_pDocument.Get());
   if (sFontName == "ZapfDingbats")
     return pPageData->AddStandardFont(sFontName.c_str(), nullptr);
 
@@ -485,17 +480,13 @@
   return pPageData->AddStandardFont(sFontName.c_str(), &fe);
 }
 
-RetainPtr<CPDF_Font> CBA_FontMap::AddSystemFont(CPDF_Document* pDoc,
-                                                ByteString& sFontName,
+RetainPtr<CPDF_Font> CBA_FontMap::AddSystemFont(ByteString sFontName,
                                                 uint8_t nCharset) {
-  if (!pDoc)
-    return nullptr;
-
   if (sFontName.IsEmpty())
     sFontName = GetNativeFontName(nCharset);
 
   if (nCharset == FX_CHARSET_Default)
     nCharset = GetNativeCharset();
 
-  return AddNativeTrueTypeFontToPDF(pDoc, sFontName, nCharset);
+  return AddNativeTrueTypeFontToPDF(m_pDocument.Get(), sFontName, nCharset);
 }

core/fpdfdoc/cba_fontmap.h

diff --git a/core/fpdfdoc/cba_fontmap.h b/core/fpdfdoc/cba_fontmap.h
index a975efc..7130064 100644
--- a/core/fpdfdoc/cba_fontmap.h
+++ b/core/fpdfdoc/cba_fontmap.h
@@ -79,14 +79,10 @@
   ByteString GetNativeFontName(int32_t nCharset);
   ByteString GetCachedNativeFontName(int32_t nCharset);
   bool IsStandardFont(const ByteString& sFontName);
-  RetainPtr<CPDF_Font> AddFontToDocument(CPDF_Document* pDoc,
-                                         ByteString& sFontName,
+  RetainPtr<CPDF_Font> AddFontToDocument(ByteString sFontName,
                                          uint8_t nCharset);
-  RetainPtr<CPDF_Font> AddStandardFont(CPDF_Document* pDoc,
-                                       ByteString& sFontName);
-  RetainPtr<CPDF_Font> AddSystemFont(CPDF_Document* pDoc,
-                                     ByteString& sFontName,
-                                     uint8_t nCharset);
+  RetainPtr<CPDF_Font> AddStandardFont(ByteString sFontName);
+  RetainPtr<CPDF_Font> AddSystemFont(ByteString sFontName, uint8_t nCharset);
 
   std::vector<std::unique_ptr<Data>> m_Data;
   std::vector<std::unique_ptr<Native>> m_NativeFont;