From 1f2489023f2b808c41071d992abceb646ade8e1b Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 14 Sep 2016 10:38:17 -0700 Subject: Remove FFI_ from CPDFSDK_Environment method names The prefix doesn't add anything when used in CPDFSDK_Environment, remove. Review-Url: https://codereview.chromium.org/2338303002 --- fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp | 44 ++++++++++++++---------------- fpdfsdk/fpdfxfa/fpdfxfa_app.cpp | 35 ++++++------------------ fpdfsdk/fpdfxfa/fpdfxfa_util.cpp | 4 +-- fpdfsdk/fpdfxfa/include/fpdfxfa_app.h | 3 -- 4 files changed, 31 insertions(+), 55 deletions(-) (limited to 'fpdfsdk/fpdfxfa') diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp index f6332cdc86..17e94ff8e2 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp @@ -70,8 +70,8 @@ void CPDFXFA_DocEnvironment::InvalidateRect(CXFA_FFPageView* pPageView, return; CFX_FloatRect rcPage = CFX_FloatRect::FromCFXRectF(rt); - pEnv->FFI_Invalidate((FPDF_PAGE)pPage, rcPage.left, rcPage.bottom, - rcPage.right, rcPage.top); + pEnv->Invalidate((FPDF_PAGE)pPage, rcPage.left, rcPage.bottom, rcPage.right, + rcPage.top); } void CPDFXFA_DocEnvironment::DisplayCaret(CXFA_FFWidget* hWidget, @@ -102,8 +102,8 @@ void CPDFXFA_DocEnvironment::DisplayCaret(CXFA_FFWidget* hWidget, return; CFX_FloatRect rcCaret = CFX_FloatRect::FromCFXRectF(*pRtAnchor); - pEnv->FFI_DisplayCaret((FPDF_PAGE)pPage, bVisible, rcCaret.left, rcCaret.top, - rcCaret.right, rcCaret.bottom); + pEnv->DisplayCaret((FPDF_PAGE)pPage, bVisible, rcCaret.left, rcCaret.top, + rcCaret.right, rcCaret.bottom); } FX_BOOL CPDFXFA_DocEnvironment::GetPopupPos(CXFA_FFWidget* hWidget, @@ -129,7 +129,7 @@ FX_BOOL CPDFXFA_DocEnvironment::GetPopupPos(CXFA_FFWidget* hWidget, return FALSE; FS_RECTF pageViewRect = {0.0f, 0.0f, 0.0f, 0.0f}; - pEnv->FFI_GetPageViewRect(pPage, pageViewRect); + pEnv->GetPageViewRect(pPage, pageViewRect); int t1; int t2; @@ -253,7 +253,7 @@ FX_BOOL CPDFXFA_DocEnvironment::PopupMenu(CXFA_FFWidget* hWidget, if (hWidget->CanSelectAll()) menuFlag |= FXFA_MENU_SELECTALL; - return pEnv->FFI_PopupMenu(pPage, hWidget, menuFlag, ptPopup, nullptr); + return pEnv->PopupMenu(pPage, hWidget, menuFlag, ptPopup, nullptr); } void CPDFXFA_DocEnvironment::PageViewEvent(CXFA_FFPageView* pPageView, @@ -290,7 +290,7 @@ void CPDFXFA_DocEnvironment::PageViewEvent(CXFA_FFPageView* pPageView, : FXFA_PAGEVIEWEVENT_POSTADDED; int count = FXSYS_abs(nNewCount - m_pDocument->GetOriginalPageCount()); m_pDocument->SetOriginalPageCount(nNewCount); - pEnv->FFI_PageEvent(count, flag); + pEnv->PageEvent(count, flag); } void CPDFXFA_DocEnvironment::WidgetPostAdd(CXFA_FFWidget* hWidget, @@ -344,7 +344,7 @@ int32_t CPDFXFA_DocEnvironment::GetCurrentPage(CXFA_FFDoc* hDoc) { if (!pEnv) return -1; - return pEnv->FFI_GetCurrentPageIndex(this); + return pEnv->GetCurrentPageIndex(this); } void CPDFXFA_DocEnvironment::SetCurrentPage(CXFA_FFDoc* hDoc, @@ -358,7 +358,7 @@ void CPDFXFA_DocEnvironment::SetCurrentPage(CXFA_FFDoc* hDoc, CPDFSDK_Environment* pEnv = m_pDocument->GetSDKDoc()->GetEnv(); if (!pEnv) return; - pEnv->FFI_SetCurrentPage(this, iCurPage); + pEnv->SetCurrentPage(this, iCurPage); } FX_BOOL CPDFXFA_DocEnvironment::IsCalculationsEnabled(CXFA_FFDoc* hDoc) { @@ -425,8 +425,8 @@ void CPDFXFA_DocEnvironment::ExportData(CXFA_FFDoc* hDoc, } int len = bs.GetLength(); FPDF_FILEHANDLER* pFileHandler = - pEnv->FFI_OpenFile(bXDP ? FXFA_SAVEAS_XDP : FXFA_SAVEAS_XML, - (FPDF_WIDESTRING)bs.GetBuffer(len), "wb"); + pEnv->OpenFile(bXDP ? FXFA_SAVEAS_XDP : FXFA_SAVEAS_XML, + (FPDF_WIDESTRING)bs.GetBuffer(len), "wb"); bs.ReleaseBuffer(len); if (!pFileHandler) return; @@ -514,7 +514,7 @@ void CPDFXFA_DocEnvironment::GotoURL(CXFA_FFDoc* hDoc, CFX_WideStringC str(bsURL.c_str()); - pEnv->FFI_GotoURL(this, str, bAppend); + pEnv->GotoURL(this, str, bAppend); } FX_BOOL CPDFXFA_DocEnvironment::IsValidationsEnabled(CXFA_FFDoc* hDoc) { @@ -640,8 +640,8 @@ FX_BOOL CPDFXFA_DocEnvironment::OnBeforeNotifySubmit() { ws.FromLocal(IDS_XFA_Validate_Input); CFX_ByteString bs = ws.UTF16LE_Encode(); int len = bs.GetLength(); - pEnv->FFI_Alert((FPDF_WIDESTRING)bs.GetBuffer(len), (FPDF_WIDESTRING)L"", - 0, 1); + pEnv->Alert((FPDF_WIDESTRING)bs.GetBuffer(len), (FPDF_WIDESTRING)L"", 0, + 1); bs.ReleaseBuffer(len); return FALSE; } @@ -701,7 +701,7 @@ IFX_FileRead* CPDFXFA_DocEnvironment::OpenLinkedFile( CFX_ByteString bs = wsLink.UTF16LE_Encode(); int len = bs.GetLength(); FPDF_FILEHANDLER* pFileHandler = - pEnv->FFI_OpenFile(0, (FPDF_WIDESTRING)bs.GetBuffer(len), "rb"); + pEnv->OpenFile(0, (FPDF_WIDESTRING)bs.GetBuffer(len), "rb"); bs.ReleaseBuffer(len); if (!pFileHandler) @@ -900,8 +900,7 @@ FX_BOOL CPDFXFA_DocEnvironment::SubmitDataInternal(CXFA_FFDoc* hDoc, ws.FromLocal("Submit cancelled."); CFX_ByteString bs = ws.UTF16LE_Encode(); int len = bs.GetLength(); - pEnv->FFI_Alert((FPDF_WIDESTRING)bs.GetBuffer(len), (FPDF_WIDESTRING)L"", 0, - 4); + pEnv->Alert((FPDF_WIDESTRING)bs.GetBuffer(len), (FPDF_WIDESTRING)L"", 0, 4); bs.ReleaseBuffer(len); return FALSE; } @@ -925,20 +924,20 @@ FX_BOOL CPDFXFA_DocEnvironment::SubmitDataInternal(CXFA_FFDoc* hDoc, flag |= FXFA_PDF; ToXFAContentFlags(csContent, flag); - pFileHandler = pEnv->FFI_OpenFile(FXFA_SAVEAS_XDP, nullptr, "wb"); + pFileHandler = pEnv->OpenFile(FXFA_SAVEAS_XDP, nullptr, "wb"); fileFlag = FXFA_SAVEAS_XDP; ExportSubmitFile(pFileHandler, FXFA_SAVEAS_XDP, 0, flag); break; } case XFA_ATTRIBUTEENUM_Xml: - pFileHandler = pEnv->FFI_OpenFile(FXFA_SAVEAS_XML, nullptr, "wb"); + pFileHandler = pEnv->OpenFile(FXFA_SAVEAS_XML, nullptr, "wb"); fileFlag = FXFA_SAVEAS_XML; ExportSubmitFile(pFileHandler, FXFA_SAVEAS_XML, 0, FXFA_XFA_ALL); break; case XFA_ATTRIBUTEENUM_Pdf: break; case XFA_ATTRIBUTEENUM_Urlencoded: - pFileHandler = pEnv->FFI_OpenFile(FXFA_SAVEAS_XML, nullptr, "wb"); + pFileHandler = pEnv->OpenFile(FXFA_SAVEAS_XML, nullptr, "wb"); fileFlag = FXFA_SAVEAS_XML; ExportSubmitFile(pFileHandler, FXFA_SAVEAS_XML, 0, FXFA_XFA_ALL); break; @@ -969,7 +968,7 @@ FX_BOOL CPDFXFA_DocEnvironment::SubmitDataInternal(CXFA_FFDoc* hDoc, FPDF_WIDESTRING pSubject = (FPDF_WIDESTRING)bsSubject.GetBuffer(bsSubject.GetLength()); FPDF_WIDESTRING pMsg = (FPDF_WIDESTRING)bsMsg.GetBuffer(bsMsg.GetLength()); - pEnv->FFI_EmailTo(pFileHandler, pTo, pSubject, pCC, pBcc, pMsg); + pEnv->EmailTo(pFileHandler, pTo, pSubject, pCC, pBcc, pMsg); bsTo.ReleaseBuffer(); bsCC.ReleaseBuffer(); bsBcc.ReleaseBuffer(); @@ -980,8 +979,7 @@ FX_BOOL CPDFXFA_DocEnvironment::SubmitDataInternal(CXFA_FFDoc* hDoc, CFX_WideString ws; CFX_ByteString bs = csURL.UTF16LE_Encode(); int len = bs.GetLength(); - pEnv->FFI_UploadTo(pFileHandler, fileFlag, - (FPDF_WIDESTRING)bs.GetBuffer(len)); + pEnv->UploadTo(pFileHandler, fileFlag, (FPDF_WIDESTRING)bs.GetBuffer(len)); bs.ReleaseBuffer(len); } return bRet; diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp index 5cdd903877..6295494621 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp @@ -99,15 +99,14 @@ void CPDFXFA_App::SetAppType(const CFX_WideStringC& wsAppType) { void CPDFXFA_App::GetLanguage(CFX_WideString& wsLanguage) { CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0); - if (pEnv) { - wsLanguage = pEnv->FFI_GetLanguage(); - } + if (pEnv) + wsLanguage = pEnv->GetLanguage(); } void CPDFXFA_App::GetPlatform(CFX_WideString& wsPlatform) { CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0); if (pEnv) { - wsPlatform = pEnv->FFI_GetPlatform(); + wsPlatform = pEnv->GetPlatform(); } } @@ -204,26 +203,9 @@ CFX_WideString CPDFXFA_App::Response(const CFX_WideString& wsQuestion, return wsAnswer; } -int32_t CPDFXFA_App::GetCurDocumentInBatch() { - CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0); - if (pEnv) { - return pEnv->FFI_GetCurDocument(); - } - return 0; -} - -int32_t CPDFXFA_App::GetDocumentCountInBatch() { - CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0); - if (pEnv) { - return pEnv->FFI_GetDocumentCount(); - } - - return 0; -} - IFX_FileRead* CPDFXFA_App::DownloadURL(const CFX_WideString& wsURL) { CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0); - return pEnv ? pEnv->FFI_DownloadFromURL(wsURL.c_str()) : nullptr; + return pEnv ? pEnv->DownloadFromURL(wsURL.c_str()) : nullptr; } FX_BOOL CPDFXFA_App::PostRequestURL(const CFX_WideString& wsURL, @@ -236,9 +218,9 @@ FX_BOOL CPDFXFA_App::PostRequestURL(const CFX_WideString& wsURL, if (!pEnv) return FALSE; - wsResponse = pEnv->FFI_PostRequestURL(wsURL.c_str(), wsData.c_str(), - wsContentType.c_str(), wsEncode.c_str(), - wsHeader.c_str()); + wsResponse = + pEnv->PostRequestURL(wsURL.c_str(), wsData.c_str(), wsContentType.c_str(), + wsEncode.c_str(), wsHeader.c_str()); return TRUE; } @@ -247,8 +229,7 @@ FX_BOOL CPDFXFA_App::PutRequestURL(const CFX_WideString& wsURL, const CFX_WideString& wsEncode) { CPDFSDK_Environment* pEnv = m_pEnvList.GetAt(0); return pEnv && - pEnv->FFI_PutRequestURL(wsURL.c_str(), wsData.c_str(), - wsEncode.c_str()); + pEnv->PutRequestURL(wsURL.c_str(), wsData.c_str(), wsEncode.c_str()); } void CPDFXFA_App::LoadString(int32_t iStringID, CFX_WideString& wsString) { diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp index aa6c2d4e9d..5b050afa35 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp @@ -20,7 +20,7 @@ FWL_Error CXFA_FWLAdapterTimerMgr::Start(IFWL_Timer* pTimer, if (!m_pEnv) return FWL_Error::Indefinite; - int32_t id_event = m_pEnv->FFI_SetTimer(dwElapse, TimerProc); + int32_t id_event = m_pEnv->SetTimer(dwElapse, TimerProc); if (!s_TimerArray) s_TimerArray = new std::vector; @@ -34,7 +34,7 @@ FWL_Error CXFA_FWLAdapterTimerMgr::Stop(IFWL_TimerInfo* pTimerInfo) { return FWL_Error::Indefinite; CFWL_TimerInfo* pInfo = static_cast(pTimerInfo); - m_pEnv->FFI_KillTimer(pInfo->idEvent); + m_pEnv->KillTimer(pInfo->idEvent); if (s_TimerArray) { auto it = std::find(s_TimerArray->begin(), s_TimerArray->end(), pInfo); if (it != s_TimerArray->end()) { diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h index 0274acb2cc..fefe088507 100644 --- a/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h +++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h @@ -53,9 +53,6 @@ class CPDFXFA_App : public IXFA_AppProvider { const CFX_WideString& wsDefaultAnswer, FX_BOOL bMark) override; - int32_t GetDocumentCountInBatch() override; - int32_t GetCurDocumentInBatch() override; - IFX_FileRead* DownloadURL(const CFX_WideString& wsURL) override; FX_BOOL PostRequestURL(const CFX_WideString& wsURL, const CFX_WideString& wsData, -- cgit v1.2.3