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/cpdfsdk_pageview.h | |
| 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/cpdfsdk_pageview.h')
| -rw-r--r-- | fpdfsdk/cpdfsdk_pageview.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fpdfsdk/cpdfsdk_pageview.h b/fpdfsdk/cpdfsdk_pageview.h index cf2d9bf442..bfb6450ca8 100644 --- a/fpdfsdk/cpdfsdk_pageview.h +++ b/fpdfsdk/cpdfsdk_pageview.h @@ -22,7 +22,8 @@ class CPDF_RenderOptions; class CPDFSDK_PageView final : public CPDF_Page::View { public: - CPDFSDK_PageView(CPDFSDK_FormFillEnvironment* pFormFillEnv, IPDF_Page* page); + CPDFSDK_PageView(CPDFSDK_FormFillEnvironment* pFormFillEnv, + UnderlyingPageType* page); ~CPDFSDK_PageView(); void PageView_OnDraw(CFX_RenderDevice* pDevice, @@ -44,7 +45,8 @@ class CPDFSDK_PageView final : public CPDF_Page::View { bool DeleteAnnot(CPDFSDK_Annot* pAnnot); CPDFSDK_Annot* AddAnnot(CXFA_FFWidget* pPDFAnnot); CPDFSDK_Annot* GetAnnotByXFAWidget(CXFA_FFWidget* hWidget); - CPDFXFA_Page* GetPDFXFAPage() { return ToXFAPage(m_page); } + + CPDFXFA_Page* GetPDFXFAPage() { return m_page; } #endif // PDF_ENABLE_XFA CPDF_Page* GetPDFPage() const; @@ -94,7 +96,7 @@ class CPDFSDK_PageView final : public CPDF_Page::View { bool IsBeingDestroyed() const { return m_bBeingDestroyed; } #ifndef PDF_ENABLE_XFA - void TakePageOwnership() { m_pOwnsPage.Reset(ToPDFPage(m_page)); } + void TakePageOwnership() { m_pOwnsPage.Reset(m_page); } #endif // PDF_ENABLE_XFA private: @@ -111,7 +113,7 @@ class CPDFSDK_PageView final : public CPDF_Page::View { uint32_t nFlag); CFX_Matrix m_curMatrix; - IPDF_Page* const m_page; + UnderlyingPageType* const m_page; std::unique_ptr<CPDF_AnnotList> m_pAnnotList; std::vector<CPDFSDK_Annot*> m_SDKAnnotArray; UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; |