diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-05-30 18:11:51 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-30 18:11:51 +0000 |
| commit | d06cc38b76685b002c51b227ae43b8314d926ad8 (patch) | |
| tree | 89413c48e3de57f3e09043310598eaf219b78bca /fpdfsdk/formfiller | |
| parent | 0789714191b4b3109f7d5c415663090018e27577 (diff) | |
| download | pdfium-d06cc38b76685b002c51b227ae43b8314d926ad8.tar.xz | |
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 <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@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 261cb653e5..44e91d3334 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); - UnderlyingPageType* pPage = pWidget->GetUnderlyingPage(); + IPDF_Page* pPage = pWidget->GetPage(); 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) { - UnderlyingPageType* pPage = m_pWidget->GetUnderlyingPage(); + IPDF_Page* pPage = m_pWidget->GetPage(); 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->GetUnderlyingPage(), rect); + m_pFormFillEnv->Invalidate(m_pWidget->GetPage(), rect); } diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp index eeed266235..da011e40ab 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->GetUnderlyingPage(), + m_pFormFillEnv->Invalidate(pAnnot->GetPage(), pAnnot->GetRect().GetOuterRect()); if (m_bValid) { |