From 3caa6537663e85ad6874c4420907d2ab885c80ea Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 25 Nov 2015 14:54:12 -0800 Subject: master: more underlying types Precursor to https://codereview.chromium.org/1477583002/ Also: merge where possible. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1481523004 . --- fpdfsdk/src/formfiller/FFL_FormFiller.cpp | 6 +++--- fpdfsdk/src/formfiller/FFL_TextField.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'fpdfsdk/src/formfiller') diff --git a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp index 0dab3076f4..31e6cd691a 100644 --- a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp @@ -243,7 +243,7 @@ FX_BOOL CFFL_FormFiller::OnChar(CPDFSDK_Annot* pAnnot, void CFFL_FormFiller::SetFocusForAnnot(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) { CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot; - CPDF_Page* pPage = pWidget->GetPDFPage(); + UnderlyingPageType* pPage = pWidget->GetUnderlyingPage(); CPDFSDK_Document* pDoc = m_pApp->GetSDKDocument(); CPDFSDK_PageView* pPageView = pDoc->GetPageView(pPage); if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, TRUE)) @@ -461,7 +461,7 @@ CPDF_Rect CFFL_FormFiller::GetPDFWindowRect() const { } CPDFSDK_PageView* CFFL_FormFiller::GetCurPageView() { - CPDF_Page* pPage = m_pAnnot->GetPDFPage(); + UnderlyingPageType* pPage = m_pAnnot->GetUnderlyingPage(); CPDFSDK_Document* pSDKDoc = m_pApp->GetSDKDocument(); return pSDKDoc ? pSDKDoc->GetPageView(pPage) : nullptr; } @@ -612,7 +612,7 @@ void CFFL_FormFiller::InvalidateRect(double left, double top, double right, double bottom) { - CPDF_Page* pPage = m_pWidget->GetPDFPage(); + UnderlyingPageType* pPage = m_pWidget->GetUnderlyingPage(); m_pApp->FFI_Invalidate(pPage, left, top, right, bottom); } diff --git a/fpdfsdk/src/formfiller/FFL_TextField.cpp b/fpdfsdk/src/formfiller/FFL_TextField.cpp index f5cde16813..2dc82a892e 100644 --- a/fpdfsdk/src/formfiller/FFL_TextField.cpp +++ b/fpdfsdk/src/formfiller/FFL_TextField.cpp @@ -119,8 +119,8 @@ FX_BOOL CFFL_TextField::OnChar(CPDFSDK_Annot* pAnnot, ASSERT(pPageView != NULL); m_bValid = !m_bValid; CPDF_Rect rcAnnot = pAnnot->GetRect(); - m_pApp->FFI_Invalidate(pAnnot->GetPDFPage(), rcAnnot.left, rcAnnot.top, - rcAnnot.right, rcAnnot.bottom); + m_pApp->FFI_Invalidate(pAnnot->GetUnderlyingPage(), rcAnnot.left, + rcAnnot.top, rcAnnot.right, rcAnnot.bottom); if (m_bValid) { if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, TRUE)) -- cgit v1.2.3