Rename "pFace" instances to "face" Mass rename another variable name to follow Google C++ style via search and replace. Bug: 42271580 Change-Id: Icc723b6a1506ba2f13b59202dd14b62456ad048b Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/138150 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxge/cfx_fontmapper.cpp b/core/fxge/cfx_fontmapper.cpp index f19be3a..c35c6d4 100644 --- a/core/fxge/cfx_fontmapper.cpp +++ b/core/fxge/cfx_fontmapper.cpp
@@ -910,19 +910,19 @@ size_t font_offset = ttc_size - data_size; size_t face_index = GetTTCIndex(font_desc->FontData().first(ttc_size), font_offset); - RetainPtr<CFX_Face> pFace(font_desc->GetFace(face_index)); - if (pFace) { - return pFace; + RetainPtr<CFX_Face> face(font_desc->GetFace(face_index)); + if (face) { + return face; } - pFace = font_mgr_->NewFixedFace( + face = font_mgr_->NewFixedFace( font_desc, font_desc->FontData().first(ttc_size), face_index); - if (!pFace) { + if (!face) { return nullptr; } - font_desc->SetFace(face_index, pFace.Get()); - return pFace; + font_desc->SetFace(face_index, face.Get()); + return face; } RetainPtr<CFX_Face> CFX_FontMapper::GetCachedFace(void* font_handle, @@ -942,19 +942,19 @@ font_desc = font_mgr_->AddCachedFontDesc(subst_name, weight, is_italic, std::move(font_data)); } - RetainPtr<CFX_Face> pFace(font_desc->GetFace(0)); - if (pFace) { - return pFace; + RetainPtr<CFX_Face> face(font_desc->GetFace(0)); + if (face) { + return face; } - pFace = font_mgr_->NewFixedFace(font_desc, - font_desc->FontData().first(data_size), 0); - if (!pFace) { + face = font_mgr_->NewFixedFace(font_desc, + font_desc->FontData().first(data_size), 0); + if (!face) { return nullptr; } - font_desc->SetFace(0, pFace.Get()); - return pFace; + font_desc->SetFace(0, face.Get()); + return face; } // static
diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp index 9dda582..ffac5e8 100644 --- a/xfa/fgas/font/cfgas_fontmgr.cpp +++ b/xfa/fgas/font/cfgas_fontmgr.cpp
@@ -46,18 +46,18 @@ namespace { bool VerifyUnicode(const RetainPtr<CFGAS_GEFont>& font, wchar_t wcUnicode) { - RetainPtr<CFX_Face> pFace = font->GetDevFont()->GetFace(); - if (!pFace) { + RetainPtr<CFX_Face> face = font->GetDevFont()->GetFace(); + if (!face) { return false; } - CFX_Face::CharMap charmap = pFace->GetCurrentCharMap(); - if (!pFace->SelectCharMap(fxge::FontEncoding::kUnicode)) { + CFX_Face::CharMap charmap = face->GetCurrentCharMap(); + if (!face->SelectCharMap(fxge::FontEncoding::kUnicode)) { return false; } - if (pFace->GetCharIndex(wcUnicode) == 0) { - pFace->SetCharMap(charmap); + if (face->GetCharIndex(wcUnicode) == 0) { + face->SetCharMap(charmap); return false; } return true; @@ -705,17 +705,17 @@ return matched_fonts; } -void CFGAS_FontMgr::RegisterFace(RetainPtr<CFX_Face> pFace, +void CFGAS_FontMgr::RegisterFace(RetainPtr<CFX_Face> face, const WideString& wsFaceName) { - if (!pFace->IsScalable()) { + if (!face->IsScalable()) { return; } auto font = std::make_unique<CFGAS_FontDescriptor>(); - font->font_styles_ |= GetFlags(pFace); + font->font_styles_ |= GetFlags(face); std::optional<std::array<uint32_t, 4>> unicode_range = - pFace->GetOs2UnicodeRange(); + face->GetOs2UnicodeRange(); if (unicode_range.has_value()) { fxcrt::Copy(unicode_range.value(), font->usb_); } else { @@ -723,7 +723,7 @@ } std::optional<std::array<uint32_t, 2>> code_page_range = - pFace->GetOs2CodePageRange(); + face->GetOs2CodePageRange(); if (code_page_range.has_value()) { fxcrt::Copy(code_page_range.value(), font->csb_); } else { @@ -734,19 +734,18 @@ CFX_FontMapper::MakeTag('n', 'a', 'm', 'e'); DataVector<uint8_t> table; - size_t table_size = pFace->GetSfntTable(kNameTag, table); + size_t table_size = face->GetSfntTable(kNameTag, table); if (table_size) { table.resize(table_size); - if (!pFace->GetSfntTable(kNameTag, table)) { + if (!face->GetSfntTable(kNameTag, table)) { table.clear(); } } font->family_names_ = GetNames(table); font->family_names_.push_back( - WideString::FromUTF8(pFace->GetRec()->family_name)); + WideString::FromUTF8(face->GetRec()->family_name)); font->face_name_ = wsFaceName; - font->face_index_ = - pdfium::checked_cast<int32_t>(pFace->GetRec()->face_index); + font->face_index_ = pdfium::checked_cast<int32_t>(face->GetRec()->face_index); installed_fonts_.push_back(std::move(font)); }
diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h index fd39700..85b84f9 100644 --- a/xfa/fgas/font/cfgas_fontmgr.h +++ b/xfa/fgas/font/cfgas_fontmgr.h
@@ -121,7 +121,7 @@ #else // BUILDFLAG(IS_WIN) bool EnumFontsFromFontMapper(); - void RegisterFace(RetainPtr<CFX_Face> pFace, const WideString& wsFaceName); + void RegisterFace(RetainPtr<CFX_Face> face, const WideString& wsFaceName); void RegisterFaces(const RetainPtr<IFX_SeekableReadStream>& font_stream, const WideString& wsFaceName); std::vector<CFGAS_FontDescriptorInfo> MatchFonts(FX_CodePage wCodePage,