diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-06-04 18:07:47 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-04 18:07:47 +0000 |
| commit | 168c763539e70bea450701470c47a8991f578336 (patch) | |
| tree | 61e053e549e5477919bcef5a39f79d74a666fcca /fpdfsdk/formfiller | |
| parent | 2491990f50f8ea48a509eb0ccc0193b4c1a3f776 (diff) | |
| download | pdfium-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 'fpdfsdk/formfiller')
| -rw-r--r-- | fpdfsdk/formfiller/cffl_formfiller.cpp | 6 | ||||
| -rw-r--r-- | fpdfsdk/formfiller/cffl_textfield.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp index 44e91d3334..261cb653e5 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.cpp +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp @@ -302,7 +302,7 @@ bool CFFL_FormFiller::Redo(CPDFSDK_Annot* pAnnot) { void CFFL_FormFiller::SetFocusForAnnot(CPDFSDK_Annot* pAnnot, uint32_t nFlag) { auto* pWidget = static_cast<CPDFSDK_Widget*>(pAnnot); - IPDF_Page* pPage = pWidget->GetPage(); + UnderlyingPageType* pPage = pWidget->GetUnderlyingPage(); CPDFSDK_PageView* pPageView = m_pFormFillEnv->GetPageView(pPage, true); if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, true)) pWnd->SetFocus(); @@ -479,7 +479,7 @@ CFX_FloatRect CFFL_FormFiller::GetPDFWindowRect() const { } CPDFSDK_PageView* CFFL_FormFiller::GetCurPageView(bool renew) { - IPDF_Page* pPage = m_pWidget->GetPage(); + UnderlyingPageType* pPage = m_pWidget->GetUnderlyingPage(); return m_pFormFillEnv->GetPageView(pPage, renew); } @@ -618,5 +618,5 @@ void CFFL_FormFiller::EscapeFiller(CPDFSDK_PageView* pPageView, } void CFFL_FormFiller::InvalidateRect(const FX_RECT& rect) { - m_pFormFillEnv->Invalidate(m_pWidget->GetPage(), rect); + m_pFormFillEnv->Invalidate(m_pWidget->GetUnderlyingPage(), rect); } diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp index da011e40ab..eeed266235 100644 --- a/fpdfsdk/formfiller/cffl_textfield.cpp +++ b/fpdfsdk/formfiller/cffl_textfield.cpp @@ -100,7 +100,7 @@ bool CFFL_TextField::OnChar(CPDFSDK_Annot* pAnnot, CPDFSDK_PageView* pPageView = GetCurPageView(true); ASSERT(pPageView); m_bValid = !m_bValid; - m_pFormFillEnv->Invalidate(pAnnot->GetPage(), + m_pFormFillEnv->Invalidate(pAnnot->GetUnderlyingPage(), pAnnot->GetRect().GetOuterRect()); if (m_bValid) { |