diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-06-12 13:36:05 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-12 13:36:05 +0000 |
commit | 101535f463dda5766f99b66f383672d5898556fe (patch) | |
tree | 04ca2226b850756c67dd29444545f4b91682835c /fpdfsdk/cpdfsdk_formfillenvironment.cpp | |
parent | 755b0e5f71518488456e7cffc64fd7ba89692e68 (diff) | |
download | pdfium-101535f463dda5766f99b66f383672d5898556fe.tar.xz |
Rework "Make common page base class."
Re-landing of https://pdfium-review.googlesource.com/c/pdfium/+/32892
This time, however, we do not build on the previous CL which cached
pages. This CL by itself should be OK but was reverted only because
it was blocking earlier reverts.
Change-Id: I067d5f07373eeac6cced5d0c113ea40e5f8dcd15
Reviewed-on: https://pdfium-review.googlesource.com/34910
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/cpdfsdk_formfillenvironment.cpp')
-rw-r--r-- | fpdfsdk/cpdfsdk_formfillenvironment.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp index a0859a225a..44807fdc0c 100644 --- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp +++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp @@ -231,19 +231,19 @@ CPDFSDK_FormFillEnvironment::GetInteractiveFormFiller() { return m_pFormFiller.get(); } -void CPDFSDK_FormFillEnvironment::Invalidate(UnderlyingPageType* page, +void CPDFSDK_FormFillEnvironment::Invalidate(IPDF_Page* page, const FX_RECT& rect) { if (m_pInfo && m_pInfo->FFI_Invalidate) { - m_pInfo->FFI_Invalidate(m_pInfo, FPDFPageFromUnderlying(page), rect.left, + m_pInfo->FFI_Invalidate(m_pInfo, FPDFPageFromIPDFPage(page), rect.left, rect.top, rect.right, rect.bottom); } } void CPDFSDK_FormFillEnvironment::OutputSelectedRect( - UnderlyingPageType* page, + IPDF_Page* page, const CFX_FloatRect& rect) { if (m_pInfo && m_pInfo->FFI_OutputSelectedRect) { - m_pInfo->FFI_OutputSelectedRect(m_pInfo, FPDFPageFromUnderlying(page), + m_pInfo->FFI_OutputSelectedRect(m_pInfo, FPDFPageFromIPDFPage(page), rect.left, rect.top, rect.right, rect.bottom); } @@ -332,7 +332,7 @@ void CPDFSDK_FormFillEnvironment::DisplayCaret(CPDFXFA_Page* page, double right, double bottom) { if (m_pInfo && m_pInfo->FFI_DisplayCaret) { - m_pInfo->FFI_DisplayCaret(m_pInfo, FPDFPageFromUnderlying(page), bVisible, + m_pInfo->FFI_DisplayCaret(m_pInfo, FPDFPageFromIPDFPage(page), bVisible, left, top, right, bottom); } } @@ -387,8 +387,8 @@ void CPDFSDK_FormFillEnvironment::GetPageViewRect(CPDFXFA_Page* page, double top; double right; double bottom; - m_pInfo->FFI_GetPageViewRect(m_pInfo, FPDFPageFromUnderlying(page), &left, - &top, &right, &bottom); + m_pInfo->FFI_GetPageViewRect(m_pInfo, FPDFPageFromIPDFPage(page), &left, &top, + &right, &bottom); dstRect.left = static_cast<float>(left); dstRect.top = static_cast<float>(top); @@ -401,7 +401,7 @@ bool CPDFSDK_FormFillEnvironment::PopupMenu(CPDFXFA_Page* page, int menuFlag, CFX_PointF pt) { return m_pInfo && m_pInfo->FFI_PopupMenu && - m_pInfo->FFI_PopupMenu(m_pInfo, FPDFPageFromUnderlying(page), hWidget, + m_pInfo->FFI_PopupMenu(m_pInfo, FPDFPageFromIPDFPage(page), hWidget, menuFlag, pt.x, pt.y); } @@ -531,7 +531,7 @@ void CPDFSDK_FormFillEnvironment::ClearAllFocusedAnnots() { } CPDFSDK_PageView* CPDFSDK_FormFillEnvironment::GetPageView( - UnderlyingPageType* pUnderlyingPage, + IPDF_Page* pUnderlyingPage, bool renew) { auto it = m_PageMap.find(pUnderlyingPage); if (it != m_PageMap.end()) @@ -550,12 +550,12 @@ CPDFSDK_PageView* CPDFSDK_FormFillEnvironment::GetPageView( } CPDFSDK_PageView* CPDFSDK_FormFillEnvironment::GetCurrentView() { - UnderlyingPageType* pPage = UnderlyingFromFPDFPage(GetCurrentPage()); + IPDF_Page* pPage = IPDFPageFromFPDFPage(GetCurrentPage()); return pPage ? GetPageView(pPage, true) : nullptr; } CPDFSDK_PageView* CPDFSDK_FormFillEnvironment::GetPageView(int nIndex) { - UnderlyingPageType* pTempPage = GetPage(nIndex); + IPDF_Page* pTempPage = GetPage(nIndex); if (!pTempPage) return nullptr; @@ -599,8 +599,7 @@ bool CPDFSDK_FormFillEnvironment::ProcOpenAction() { return true; } -void CPDFSDK_FormFillEnvironment::RemovePageView( - UnderlyingPageType* pUnderlyingPage) { +void CPDFSDK_FormFillEnvironment::RemovePageView(IPDF_Page* pUnderlyingPage) { auto it = m_PageMap.find(pUnderlyingPage); if (it == m_PageMap.end()) return; @@ -626,10 +625,10 @@ void CPDFSDK_FormFillEnvironment::RemovePageView( m_PageMap.erase(it); } -UnderlyingPageType* CPDFSDK_FormFillEnvironment::GetPage(int nIndex) { +IPDF_Page* CPDFSDK_FormFillEnvironment::GetPage(int nIndex) { if (!m_pInfo || !m_pInfo->FFI_GetPage) return nullptr; - return UnderlyingFromFPDFPage(m_pInfo->FFI_GetPage( + return IPDFPageFromFPDFPage(m_pInfo->FFI_GetPage( m_pInfo, FPDFDocumentFromCPDFDocument(m_pCPDFDoc.Get()), nIndex)); } |