summaryrefslogtreecommitdiff
path: root/fxjs
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-06-12 13:36:05 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-06-12 13:36:05 +0000
commit101535f463dda5766f99b66f383672d5898556fe (patch)
tree04ca2226b850756c67dd29444545f4b91682835c /fxjs
parent755b0e5f71518488456e7cffc64fd7ba89692e68 (diff)
downloadpdfium-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 'fxjs')
-rw-r--r--fxjs/cjs_document.cpp2
-rw-r--r--fxjs/cjs_field.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/fxjs/cjs_document.cpp b/fxjs/cjs_document.cpp
index f5629913c0..74304bba1d 100644
--- a/fxjs/cjs_document.cpp
+++ b/fxjs/cjs_document.cpp
@@ -437,7 +437,7 @@ CJS_Return CJS_Document::removeField(
++rcAnnot.top;
std::vector<CFX_FloatRect> 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 2ed88efa1e..e9aa777df8 100644
--- a/fxjs/cjs_field.cpp
+++ b/fxjs/cjs_field.cpp
@@ -2583,8 +2583,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(JSMessage::kBadObjectError);
if (CPDFSDK_PageView* pCurPageView =