From 8779fa8578cf3336ddd4473f833900aba2e595fb Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 12 Oct 2016 12:05:44 -0700 Subject: Cleanup env variable names This CL cleans up any old m_pEnv variables to be correctly named m_pFormFillEnv. Review-Url: https://codereview.chromium.org/2412523002 --- fpdfsdk/cfx_systemhandler.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'fpdfsdk/cfx_systemhandler.cpp') diff --git a/fpdfsdk/cfx_systemhandler.cpp b/fpdfsdk/cfx_systemhandler.cpp index 62bad46ba0..541ef2ba64 100644 --- a/fpdfsdk/cfx_systemhandler.cpp +++ b/fpdfsdk/cfx_systemhandler.cpp @@ -57,7 +57,8 @@ void CFX_SystemHandler::InvalidateRect(CPDFSDK_Widget* widget, FX_RECT rect) { CFX_FloatRect rcPDF(left, bottom, right, top); rcPDF.Normalize(); - m_pEnv->Invalidate(pPage, rcPDF.left, rcPDF.top, rcPDF.right, rcPDF.bottom); + m_pFormFillEnv->Invalidate(pPage, rcPDF.left, rcPDF.top, rcPDF.right, + rcPDF.bottom); } void CFX_SystemHandler::OutputSelectedRect(CFFL_FormFiller* pFormFiller, @@ -74,19 +75,19 @@ void CFX_SystemHandler::OutputSelectedRect(CFFL_FormFiller* pFormFiller, UnderlyingPageType* pPage = pAnnot->GetUnderlyingPage(); ASSERT(pPage); - m_pEnv->OutputSelectedRect(pPage, ptA.x, ptB.y, ptB.x, ptA.y); + m_pFormFillEnv->OutputSelectedRect(pPage, ptA.x, ptB.y, ptB.x, ptA.y); } bool CFX_SystemHandler::IsSelectionImplemented() const { - if (!m_pEnv) + if (!m_pFormFillEnv) return false; - FPDF_FORMFILLINFO* pInfo = m_pEnv->GetFormFillInfo(); + FPDF_FORMFILLINFO* pInfo = m_pFormFillEnv->GetFormFillInfo(); return pInfo && pInfo->FFI_OutputSelectedRect; } void CFX_SystemHandler::SetCursor(int32_t nCursorType) { - m_pEnv->SetCursor(nCursorType); + m_pFormFillEnv->SetCursor(nCursorType); } bool CFX_SystemHandler::FindNativeTrueTypeFont(CFX_ByteString sFontFaceName) { @@ -126,21 +127,21 @@ CPDF_Font* CFX_SystemHandler::AddNativeTrueTypeFontToPDF( int32_t CFX_SystemHandler::SetTimer(int32_t uElapse, TimerCallback lpTimerFunc) { - return m_pEnv->SetTimer(uElapse, lpTimerFunc); + return m_pFormFillEnv->SetTimer(uElapse, lpTimerFunc); } void CFX_SystemHandler::KillTimer(int32_t nID) { - m_pEnv->KillTimer(nID); + m_pFormFillEnv->KillTimer(nID); } bool CFX_SystemHandler::IsSHIFTKeyDown(uint32_t nFlag) const { - return !!m_pEnv->IsSHIFTKeyDown(nFlag); + return !!m_pFormFillEnv->IsSHIFTKeyDown(nFlag); } bool CFX_SystemHandler::IsCTRLKeyDown(uint32_t nFlag) const { - return !!m_pEnv->IsCTRLKeyDown(nFlag); + return !!m_pFormFillEnv->IsCTRLKeyDown(nFlag); } bool CFX_SystemHandler::IsALTKeyDown(uint32_t nFlag) const { - return !!m_pEnv->IsALTKeyDown(nFlag); + return !!m_pFormFillEnv->IsALTKeyDown(nFlag); } -- cgit v1.2.3