From d06cc38b76685b002c51b227ae43b8314d926ad8 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 30 May 2018 18:11:51 +0000 Subject: Make common page base class for XFA and non-XFA. Now that both are ref-counted, we can replace ifdef's with some polymorphism. Bug: pdfium:760 Change-Id: Ie22ea259c9af56fa569f0af268b8e7065789a3f2 Reviewed-on: https://pdfium-review.googlesource.com/32892 Commit-Queue: Tom Sepez Reviewed-by: dsinclair --- fxjs/cjs_document.cpp | 2 +- fxjs/cjs_field.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'fxjs') diff --git a/fxjs/cjs_document.cpp b/fxjs/cjs_document.cpp index 3a4ca2763f..24be12d370 100644 --- a/fxjs/cjs_document.cpp +++ b/fxjs/cjs_document.cpp @@ -442,7 +442,7 @@ CJS_Return CJS_Document::removeField( ++rcAnnot.top; std::vector aRefresh(1, rcAnnot); - UnderlyingPageType* pPage = pWidget->GetUnderlyingPage(); + IPDF_Page* pPage = pWidget->GetPage(); ASSERT(pPage); // If there is currently no pageview associated with the page being used diff --git a/fxjs/cjs_field.cpp b/fxjs/cjs_field.cpp index 1e9e389d84..263585cde8 100644 --- a/fxjs/cjs_field.cpp +++ b/fxjs/cjs_field.cpp @@ -2530,8 +2530,7 @@ CJS_Return CJS_Field::setFocus( if (nCount == 1) { pWidget = pInterForm->GetWidget(pFormField->GetControl(0)); } else { - UnderlyingPageType* pPage = - UnderlyingFromFPDFPage(m_pFormFillEnv->GetCurrentPage()); + IPDF_Page* pPage = IPDFPageFromFPDFPage(m_pFormFillEnv->GetCurrentPage()); if (!pPage) return CJS_Return(false); if (CPDFSDK_PageView* pCurPageView = -- cgit v1.2.3