Rename MaybeCreateFontMap() to GetOrCreateFontMap() Straight rename, since "Maybe" methods might or might not return a result. This one always does, either pre-existing or newly created. Change-Id: I3631395b325f5f7f3848aa56e78067b56768bab3 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/81232 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp index 77f3685..030f65f 100644 --- a/fpdfsdk/formfiller/cffl_combobox.cpp +++ b/fpdfsdk/formfiller/cffl_combobox.cpp
@@ -35,7 +35,7 @@ if (m_pWidget->GetFieldFlags() & pdfium::form_flags::kChoiceEdit) cp.dwFlags |= PCBS_ALLOWCUSTOMTEXT; - cp.pFontMap = MaybeCreateFontMap(); + cp.pFontMap = GetOrCreateFontMap(); cp.pFocusHandler = this; return cp; }
diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp index 546eb3c..ac9362c 100644 --- a/fpdfsdk/formfiller/cffl_listbox.cpp +++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -35,7 +35,7 @@ cp.fFontSize = kDefaultListBoxFontSize; } - cp.pFontMap = MaybeCreateFontMap(); + cp.pFontMap = GetOrCreateFontMap(); return cp; }
diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp index 28236ce..5f5a84f 100644 --- a/fpdfsdk/formfiller/cffl_textfield.cpp +++ b/fpdfsdk/formfiller/cffl_textfield.cpp
@@ -77,7 +77,7 @@ cp.dwFlags |= PES_RIGHT; break; } - cp.pFontMap = MaybeCreateFontMap(); + cp.pFontMap = GetOrCreateFontMap(); cp.pFocusHandler = this; return cp; }
diff --git a/fpdfsdk/formfiller/cffl_textobject.cpp b/fpdfsdk/formfiller/cffl_textobject.cpp index cc58b8f..2f76f65 100644 --- a/fpdfsdk/formfiller/cffl_textobject.cpp +++ b/fpdfsdk/formfiller/cffl_textobject.cpp
@@ -35,7 +35,7 @@ return pRet.Get(); } -CPDF_BAFontMap* CFFL_TextObject::MaybeCreateFontMap() { +CPDF_BAFontMap* CFFL_TextObject::GetOrCreateFontMap() { if (!m_pFontMap) { m_pFontMap = std::make_unique<CPDF_BAFontMap>( m_pWidget->GetPDFPage()->GetDocument(),
diff --git a/fpdfsdk/formfiller/cffl_textobject.h b/fpdfsdk/formfiller/cffl_textobject.h index b5d3785..f564886 100644 --- a/fpdfsdk/formfiller/cffl_textobject.h +++ b/fpdfsdk/formfiller/cffl_textobject.h
@@ -25,7 +25,7 @@ CFFL_TextObject(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Widget* pWidget); ~CFFL_TextObject() override; - CPDF_BAFontMap* MaybeCreateFontMap(); + CPDF_BAFontMap* GetOrCreateFontMap(); private: std::unique_ptr<CPDF_BAFontMap> m_pFontMap;