Rename CPDF_Font::GetBaseFont() to GetBaseFontName().
It returns a string naming the font, not a font object itself.
Similarly, rename member variable to m_BaseFontName.
Straight rename, no functional change.
Change-Id: If1c83acca4ef7ca170823edc3257980b84c4bacb
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/58610
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
index 984569e..6743137 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
@@ -511,7 +511,7 @@
} else {
return;
}
- data.baseFont = pFont->GetBaseFont();
+ data.baseFont = pFont->GetBaseFontName();
auto it = m_pObjHolder->m_FontsMap.find(data);
ByteString dictName;
if (it != m_pObjHolder->m_FontsMap.end()) {
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
index cf1194c..b2619f0 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
@@ -324,11 +324,11 @@
pDict->SetNewFor<CPDF_Name>("Subtype", "TrueType");
RetainPtr<CPDF_Font> pFont = CPDF_Font::GetStockFont(pDoc.get(), "Arial");
- pDict->SetNewFor<CPDF_Name>("BaseFont", pFont->GetBaseFont());
+ pDict->SetNewFor<CPDF_Name>("BaseFont", pFont->GetBaseFontName());
CPDF_Dictionary* pDesc = pDoc->NewIndirect<CPDF_Dictionary>();
pDesc->SetNewFor<CPDF_Name>("Type", "FontDescriptor");
- pDesc->SetNewFor<CPDF_Name>("FontName", pFont->GetBaseFont());
+ pDesc->SetNewFor<CPDF_Name>("FontName", pFont->GetBaseFontName());
pDict->SetNewFor<CPDF_Reference>("FontDescriptor", pDoc.get(),
pDesc->GetObjNum());
diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp
index 3aaad30..63fcffb 100644
--- a/core/fpdfapi/font/cpdf_cidfont.cpp
+++ b/core/fpdfapi/font/cpdf_cidfont.cpp
@@ -337,11 +337,11 @@
if (!pCIDFontDict)
return false;
- m_BaseFont = pCIDFontDict->GetStringFor("BaseFont");
- if ((m_BaseFont.Compare("CourierStd") == 0 ||
- m_BaseFont.Compare("CourierStd-Bold") == 0 ||
- m_BaseFont.Compare("CourierStd-BoldOblique") == 0 ||
- m_BaseFont.Compare("CourierStd-Oblique") == 0) &&
+ m_BaseFontName = pCIDFontDict->GetStringFor("BaseFont");
+ if ((m_BaseFontName.Compare("CourierStd") == 0 ||
+ m_BaseFontName.Compare("CourierStd-Bold") == 0 ||
+ m_BaseFontName.Compare("CourierStd-BoldOblique") == 0 ||
+ m_BaseFontName.Compare("CourierStd-Oblique") == 0) &&
!IsEmbedded()) {
m_bAdobeCourierStd = true;
}
@@ -756,7 +756,7 @@
void CPDF_CIDFont::LoadSubstFont() {
pdfium::base::CheckedNumeric<int> safeStemV(m_StemV);
safeStemV *= 5;
- m_Font.LoadSubst(m_BaseFont, !m_bType1, m_Flags,
+ m_Font.LoadSubst(m_BaseFontName, !m_bType1, m_Flags,
safeStemV.ValueOrDefault(FXFONT_FW_NORMAL), m_ItalicAngle,
g_CharsetCPs[m_Charset], IsVertWriting());
}
@@ -818,7 +818,7 @@
}
void CPDF_CIDFont::LoadGB2312() {
- m_BaseFont = m_pFontDict->GetStringFor("BaseFont");
+ m_BaseFontName = m_pFontDict->GetStringFor("BaseFont");
const CPDF_Dictionary* pFontDesc = m_pFontDict->GetDictFor("FontDescriptor");
if (pFontDesc)
LoadFontDescriptor(pFontDesc);
diff --git a/core/fpdfapi/font/cpdf_font.cpp b/core/fpdfapi/font/cpdf_font.cpp
index 4a22d73..e075484 100644
--- a/core/fpdfapi/font/cpdf_font.cpp
+++ b/core/fpdfapi/font/cpdf_font.cpp
@@ -48,7 +48,7 @@
CPDF_Font::CPDF_Font(CPDF_Document* pDocument, CPDF_Dictionary* pFontDict)
: m_pDocument(pDocument),
m_pFontDict(pFontDict),
- m_BaseFont(pFontDict->GetStringFor("BaseFont")) {}
+ m_BaseFontName(pFontDict->GetStringFor("BaseFont")) {}
CPDF_Font::~CPDF_Font() {
if (m_pFontFile) {
diff --git a/core/fpdfapi/font/cpdf_font.h b/core/fpdfapi/font/cpdf_font.h
index 028fb3e..1641bb3 100644
--- a/core/fpdfapi/font/cpdf_font.h
+++ b/core/fpdfapi/font/cpdf_font.h
@@ -95,7 +95,7 @@
virtual uint32_t CharCodeFromUnicode(wchar_t Unicode) const;
virtual bool HasFontWidths() const;
- ByteString GetBaseFont() const { return m_BaseFont; }
+ ByteString GetBaseFontName() const { return m_BaseFontName; }
CFX_SubstFont* GetSubstFont() const { return m_Font.GetSubstFont(); }
bool IsEmbedded() const { return IsType3Font() || m_pFontFile != nullptr; }
CPDF_Dictionary* GetFontDict() const { return m_pFontDict.Get(); }
@@ -146,7 +146,7 @@
std::vector<std::unique_ptr<CFX_Font>> m_FontFallbacks;
RetainPtr<CPDF_StreamAcc> m_pFontFile;
RetainPtr<CPDF_Dictionary> m_pFontDict;
- ByteString m_BaseFont;
+ ByteString m_BaseFontName;
mutable std::unique_ptr<CPDF_ToUnicodeMap> m_pToUnicodeMap;
mutable bool m_bToUnicodeLoaded = false;
int m_Flags = 0;
diff --git a/core/fpdfapi/font/cpdf_simplefont.cpp b/core/fpdfapi/font/cpdf_simplefont.cpp
index 06672f2..546ed28 100644
--- a/core/fpdfapi/font/cpdf_simplefont.cpp
+++ b/core/fpdfapi/font/cpdf_simplefont.cpp
@@ -101,7 +101,7 @@
void CPDF_SimpleFont::LoadPDFEncoding(bool bEmbedded, bool bTrueType) {
const CPDF_Object* pEncoding = m_pFontDict->GetDirectObjectFor("Encoding");
if (!pEncoding) {
- if (m_BaseFont == "Symbol") {
+ if (m_BaseFontName == "Symbol") {
m_BaseEncoding = bTrueType ? PDFFONT_ENCODING_MS_SYMBOL
: PDFFONT_ENCODING_ADOBE_SYMBOL;
} else if (!bEmbedded && m_BaseEncoding == PDFFONT_ENCODING_BUILTIN) {
@@ -114,7 +114,7 @@
m_BaseEncoding == PDFFONT_ENCODING_ZAPFDINGBATS) {
return;
}
- if (FontStyleIsSymbolic(m_Flags) && m_BaseFont == "Symbol") {
+ if (FontStyleIsSymbolic(m_Flags) && m_BaseFontName == "Symbol") {
if (!bTrueType)
m_BaseEncoding = PDFFONT_ENCODING_ADOBE_SYMBOL;
return;
@@ -212,8 +212,8 @@
}
}
if (m_pFontFile) {
- if (m_BaseFont.GetLength() > 8 && m_BaseFont[7] == '+')
- m_BaseFont = m_BaseFont.Right(m_BaseFont.GetLength() - 8);
+ if (m_BaseFontName.GetLength() > 8 && m_BaseFontName[7] == '+')
+ m_BaseFontName = m_BaseFontName.Right(m_BaseFontName.GetLength() - 8);
} else {
LoadSubstFont();
}
@@ -267,7 +267,7 @@
safeStemV *= 5;
else
safeStemV = safeStemV * 4 + 140;
- m_Font.LoadSubst(m_BaseFont, IsTrueTypeFont(), m_Flags,
+ m_Font.LoadSubst(m_BaseFontName, IsTrueTypeFont(), m_Flags,
safeStemV.ValueOrDefault(FXFONT_FW_NORMAL), m_ItalicAngle, 0,
false);
}
diff --git a/core/fpdfapi/font/cpdf_type1font.cpp b/core/fpdfapi/font/cpdf_type1font.cpp
index 4660458..04dd7c2 100644
--- a/core/fpdfapi/font/cpdf_type1font.cpp
+++ b/core/fpdfapi/font/cpdf_type1font.cpp
@@ -86,7 +86,7 @@
}
bool CPDF_Type1Font::Load() {
- m_Base14Font = CFX_FontMapper::GetStandardFontName(&m_BaseFont);
+ m_Base14Font = CFX_FontMapper::GetStandardFontName(&m_BaseFontName);
if (!IsBase14Font())
return LoadCommon();
diff --git a/core/fpdfapi/page/cpdf_docpagedata.cpp b/core/fpdfapi/page/cpdf_docpagedata.cpp
index 0c97af3..bf7b462 100644
--- a/core/fpdfapi/page/cpdf_docpagedata.cpp
+++ b/core/fpdfapi/page/cpdf_docpagedata.cpp
@@ -201,7 +201,7 @@
CPDF_Font* pFont = it.second.Get();
if (!pFont)
continue;
- if (pFont->GetBaseFont() != fontName)
+ if (pFont->GetBaseFontName() != fontName)
continue;
if (pFont->IsEmbedded())
continue;
diff --git a/core/fpdfdoc/cpdf_interactiveform.cpp b/core/fpdfdoc/cpdf_interactiveform.cpp
index e810383..2883503 100644
--- a/core/fpdfdoc/cpdf_interactiveform.cpp
+++ b/core/fpdfdoc/cpdf_interactiveform.cpp
@@ -247,7 +247,7 @@
if (!pFont)
continue;
- ByteString csBaseFont = pFont->GetBaseFont();
+ ByteString csBaseFont = pFont->GetBaseFontName();
csBaseFont.Remove(' ');
if (csBaseFont == csFontName) {
*csNameTag = csKey;
@@ -283,7 +283,7 @@
pFonts = pDR->SetNewFor<CPDF_Dictionary>("Font");
if (csNameTag->IsEmpty())
- *csNameTag = pFont->GetBaseFont();
+ *csNameTag = pFont->GetBaseFontName();
csNameTag->Remove(' ');
*csNameTag = GenerateNewFontResourceName(pDR, *csNameTag);
diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp
index 4bd50db..0c2143b 100644
--- a/core/fpdfdoc/cpvt_generateap.cpp
+++ b/core/fpdfdoc/cpvt_generateap.cpp
@@ -63,8 +63,8 @@
if (!pPDFFont)
return ByteString();
- if (pPDFFont->GetBaseFont().Compare("Symbol") == 0 ||
- pPDFFont->GetBaseFont().Compare("ZapfDingbats") == 0) {
+ if (pPDFFont->GetBaseFontName().Compare("Symbol") == 0 ||
+ pPDFFont->GetBaseFontName().Compare("ZapfDingbats") == 0) {
return ByteString::Format("%c", Word);
}
diff --git a/fpdfsdk/fpdf_text.cpp b/fpdfsdk/fpdf_text.cpp
index 21aec91..aa22f69 100644
--- a/fpdfsdk/fpdf_text.cpp
+++ b/fpdfsdk/fpdf_text.cpp
@@ -115,7 +115,7 @@
if (flags)
*flags = font->GetFontFlags();
- ByteString basefont = font->GetBaseFont();
+ ByteString basefont = font->GetBaseFontName();
unsigned long length = basefont.GetLength() + 1;
if (buffer && buflen >= length)
memcpy(buffer, basefont.c_str(), length);
diff --git a/fxjs/cjs_field.cpp b/fxjs/cjs_field.cpp
index 4399d30..a15781c 100644
--- a/fxjs/cjs_field.cpp
+++ b/fxjs/cjs_field.cpp
@@ -1989,7 +1989,7 @@
return CJS_Result::Failure(JSMessage::kBadObjectError);
return CJS_Result::Success(pRuntime->NewString(
- WideString::FromDefANSI(pFont->GetBaseFont().AsStringView())
+ WideString::FromDefANSI(pFont->GetBaseFontName().AsStringView())
.AsStringView()));
}
