summaryrefslogtreecommitdiff
path: root/fpdfsdk/fpdfxfa
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 /fpdfsdk/fpdfxfa
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 'fpdfsdk/fpdfxfa')
-rw-r--r--fpdfsdk/fpdfxfa/cpdfxfa_page.cpp12
-rw-r--r--fpdfsdk/fpdfxfa/cpdfxfa_page.h31
2 files changed, 13 insertions, 30 deletions
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
index ad0615528f..f4120896a8 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
@@ -22,18 +22,6 @@ CPDFXFA_Page::CPDFXFA_Page(CPDFXFA_Context* pContext, int page_index)
CPDFXFA_Page::~CPDFXFA_Page() {}
-CPDF_Page* CPDFXFA_Page::AsPDFPage() {
- return m_pPDFPage.Get();
-}
-
-CPDFXFA_Page* CPDFXFA_Page::AsXFAPage() {
- return this;
-}
-
-CPDF_Document* CPDFXFA_Page::GetDocument() const {
- return GetDocumentExtension()->GetPDFDoc();
-}
-
bool CPDFXFA_Page::LoadPDFPage() {
if (!m_pContext)
return false;
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.h b/fpdfsdk/fpdfxfa/cpdfxfa_page.h
index 76c425f82b..2573b9cebd 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_page.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.h
@@ -10,7 +10,6 @@
#include <memory>
#include "core/fpdfapi/page/cpdf_page.h"
-#include "core/fpdfapi/page/ipdf_page.h"
#include "core/fpdfapi/parser/cpdf_document.h"
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_system.h"
@@ -22,39 +21,35 @@ class CPDF_Dictionary;
class CPDFXFA_Context;
class CXFA_FFPageView;
-class CPDFXFA_Page : public IPDF_Page {
+class CPDFXFA_Page : public CPDF_Page::Extension {
public:
template <typename T, typename... Args>
friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
- // IPDF_Page:
- CPDF_Page* AsPDFPage() override;
- CPDFXFA_Page* AsXFAPage() override;
- CPDF_Document* GetDocument() const override;
- float GetPageWidth() const override;
- float GetPageHeight() const override;
- CFX_Matrix GetDisplayMatrix(const FX_RECT& rect, int iRotate) const override;
- Optional<CFX_PointF> DeviceToPage(
- const FX_RECT& rect,
- int rotate,
- const CFX_PointF& device_point) const override;
- Optional<CFX_PointF> PageToDevice(
- const FX_RECT& rect,
- int rotate,
- const CFX_PointF& page_point) const override;
-
bool LoadPage();
bool LoadPDFPage(CPDF_Dictionary* pageDict);
CPDF_Document::Extension* GetDocumentExtension() const;
int GetPageIndex() const { return m_iPageIndex; }
+ CPDF_Page* GetPDFPage() const { return m_pPDFPage.Get(); }
CXFA_FFPageView* GetXFAPageView() const { return m_pXFAPageView; }
void SetXFAPageView(CXFA_FFPageView* pPageView) {
m_pXFAPageView = pPageView;
}
+ float GetPageWidth() const;
+ float GetPageHeight() const;
+
+ Optional<CFX_PointF> DeviceToPage(const FX_RECT& rect,
+ int rotate,
+ const CFX_PointF& device_point) const;
+ Optional<CFX_PointF> PageToDevice(const FX_RECT& rect,
+ int rotate,
+ const CFX_PointF& page_point) const;
+
+ CFX_Matrix GetDisplayMatrix(const FX_RECT& rect, int iRotate) const;
protected:
// Refcounted class.