From 456e9703276d803f633d5e8a6b5ee485f4e4207a Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 29 Aug 2018 19:35:37 +0000 Subject: Remove FPDFDOC_ prefix from non-public functions Second CL for naming consistency. Bug: pdfium:1141 Change-Id: Idf0a0da52abd68648ab709997e0523ee3240c247 Reviewed-on: https://pdfium-review.googlesource.com/41531 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fpdfdoc/cpdf_annot.cpp | 20 ++++++++++---------- core/fpdfdoc/cpdf_annot.h | 10 +++++----- core/fpdfdoc/cpdf_formcontrol.cpp | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'core') diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp index 13bceab695..961da82d37 100644 --- a/core/fpdfdoc/cpdf_annot.cpp +++ b/core/fpdfdoc/cpdf_annot.cpp @@ -61,9 +61,9 @@ CPDF_Form* AnnotGetMatrix(const CPDF_Page* pPage, return pForm; } -CPDF_Stream* FPDFDOC_GetAnnotAPInternal(CPDF_Dictionary* pAnnotDict, - CPDF_Annot::AppearanceMode eMode, - bool bFallbackToNormal) { +CPDF_Stream* GetAnnotAPInternal(CPDF_Dictionary* pAnnotDict, + CPDF_Annot::AppearanceMode eMode, + bool bFallbackToNormal) { CPDF_Dictionary* pAP = pAnnotDict->GetDictFor("AP"); if (!pAP) return nullptr; @@ -177,18 +177,18 @@ uint32_t CPDF_Annot::GetFlags() const { return m_pAnnotDict->GetIntegerFor("F"); } -CPDF_Stream* FPDFDOC_GetAnnotAP(CPDF_Dictionary* pAnnotDict, - CPDF_Annot::AppearanceMode eMode) { - return FPDFDOC_GetAnnotAPInternal(pAnnotDict, eMode, true); +CPDF_Stream* GetAnnotAP(CPDF_Dictionary* pAnnotDict, + CPDF_Annot::AppearanceMode eMode) { + return GetAnnotAPInternal(pAnnotDict, eMode, true); } -CPDF_Stream* FPDFDOC_GetAnnotAPNoFallback(CPDF_Dictionary* pAnnotDict, - CPDF_Annot::AppearanceMode eMode) { - return FPDFDOC_GetAnnotAPInternal(pAnnotDict, eMode, false); +CPDF_Stream* GetAnnotAPNoFallback(CPDF_Dictionary* pAnnotDict, + CPDF_Annot::AppearanceMode eMode) { + return GetAnnotAPInternal(pAnnotDict, eMode, false); } CPDF_Form* CPDF_Annot::GetAPForm(const CPDF_Page* pPage, AppearanceMode mode) { - CPDF_Stream* pStream = FPDFDOC_GetAnnotAP(m_pAnnotDict.Get(), mode); + CPDF_Stream* pStream = GetAnnotAP(m_pAnnotDict.Get(), mode); if (!pStream) return nullptr; diff --git a/core/fpdfdoc/cpdf_annot.h b/core/fpdfdoc/cpdf_annot.h index df9f773521..d24e49777c 100644 --- a/core/fpdfdoc/cpdf_annot.h +++ b/core/fpdfdoc/cpdf_annot.h @@ -128,12 +128,12 @@ class CPDF_Annot { // Get the AP in an annotation dict for a given appearance mode. // If |eMode| is not Normal and there is not AP for that mode, falls back to // the Normal AP. -CPDF_Stream* FPDFDOC_GetAnnotAP(CPDF_Dictionary* pAnnotDict, - CPDF_Annot::AppearanceMode eMode); +CPDF_Stream* GetAnnotAP(CPDF_Dictionary* pAnnotDict, + CPDF_Annot::AppearanceMode eMode); // Get the AP in an annotation dict for a given appearance mode. -// No fallbacks to Normal like in FPDFDOC_GetAnnotAP. -CPDF_Stream* FPDFDOC_GetAnnotAPNoFallback(CPDF_Dictionary* pAnnotDict, - CPDF_Annot::AppearanceMode eMode); +// No fallbacks to Normal like in GetAnnotAP. +CPDF_Stream* GetAnnotAPNoFallback(CPDF_Dictionary* pAnnotDict, + CPDF_Annot::AppearanceMode eMode); #endif // CORE_FPDFDOC_CPDF_ANNOT_H_ diff --git a/core/fpdfdoc/cpdf_formcontrol.cpp b/core/fpdfdoc/cpdf_formcontrol.cpp index a80b0294c1..d644ba9a64 100644 --- a/core/fpdfdoc/cpdf_formcontrol.cpp +++ b/core/fpdfdoc/cpdf_formcontrol.cpp @@ -166,7 +166,7 @@ void CPDF_FormControl::DrawControl(CFX_RenderDevice* pDevice, if (m_pWidgetDict->GetIntegerFor("F") & ANNOTFLAG_HIDDEN) return; - CPDF_Stream* pStream = FPDFDOC_GetAnnotAP(m_pWidgetDict.Get(), mode); + CPDF_Stream* pStream = GetAnnotAP(m_pWidgetDict.Get(), mode); if (!pStream) return; -- cgit v1.2.3