summaryrefslogtreecommitdiff
path: root/fxjs
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-06-04 18:07:47 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-06-04 18:07:47 +0000
commit168c763539e70bea450701470c47a8991f578336 (patch)
tree61e053e549e5477919bcef5a39f79d74a666fcca /fxjs
parent2491990f50f8ea48a509eb0ccc0193b4c1a3f776 (diff)
downloadpdfium-168c763539e70bea450701470c47a8991f578336.tar.xz
Revert "Make common page base class for XFA and non-XFA."
This reverts commit d06cc38b76685b002c51b227ae43b8314d926ad8. Reason for revert: blocking previous revert Change-Id: I74f8b80852c671440cca5fabef30e69cde9e2063 Reviewed-on: https://pdfium-review.googlesource.com/33713 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs')
-rw-r--r--fxjs/cjs_document.cpp2
-rw-r--r--fxjs/cjs_field.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/fxjs/cjs_document.cpp b/fxjs/cjs_document.cpp
index e087e0eda9..b2cc1eb72c 100644
--- a/fxjs/cjs_document.cpp
+++ b/fxjs/cjs_document.cpp
@@ -442,7 +442,7 @@ CJS_Return CJS_Document::removeField(
++rcAnnot.top;
std::vector<CFX_FloatRect> aRefresh(1, rcAnnot);
- IPDF_Page* pPage = pWidget->GetPage();
+ UnderlyingPageType* pPage = pWidget->GetUnderlyingPage();
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 263585cde8..1e9e389d84 100644
--- a/fxjs/cjs_field.cpp
+++ b/fxjs/cjs_field.cpp
@@ -2530,7 +2530,8 @@ CJS_Return CJS_Field::setFocus(
if (nCount == 1) {
pWidget = pInterForm->GetWidget(pFormField->GetControl(0));
} else {
- IPDF_Page* pPage = IPDFPageFromFPDFPage(m_pFormFillEnv->GetCurrentPage());
+ UnderlyingPageType* pPage =
+ UnderlyingFromFPDFPage(m_pFormFillEnv->GetCurrentPage());
if (!pPage)
return CJS_Return(false);
if (CPDFSDK_PageView* pCurPageView =