From d06cc38b76685b002c51b227ae43b8314d926ad8 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 30 May 2018 18:11:51 +0000 Subject: 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 Reviewed-by: dsinclair --- core/fpdfapi/page/cpdf_page.cpp | 20 ++++++++++++++++ core/fpdfapi/page/cpdf_page.h | 39 ++++++++++++++++++------------- core/fpdfapi/page/ipdf_page.h | 52 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 16 deletions(-) create mode 100644 core/fpdfapi/page/ipdf_page.h (limited to 'core/fpdfapi/page') diff --git a/core/fpdfapi/page/cpdf_page.cpp b/core/fpdfapi/page/cpdf_page.cpp index c5c85635b2..918c55ef5e 100644 --- a/core/fpdfapi/page/cpdf_page.cpp +++ b/core/fpdfapi/page/cpdf_page.cpp @@ -74,6 +74,26 @@ CPDF_Page::CPDF_Page(CPDF_Document* pDocument, CPDF_Page::~CPDF_Page() {} +CPDF_Page* CPDF_Page::AsPDFPage() { + return this; +} + +CPDFXFA_Page* CPDF_Page::AsXFAPage() { + return nullptr; +} + +CPDF_Document* CPDF_Page::GetDocument() const { + return GetPDFDocument(); +} + +float CPDF_Page::GetPageWidth() const { + return m_PageSize.width; +} + +float CPDF_Page::GetPageHeight() const { + return m_PageSize.height; +} + bool CPDF_Page::IsPage() const { return true; } diff --git a/core/fpdfapi/page/cpdf_page.h b/core/fpdfapi/page/cpdf_page.h index b94326e47b..f1d6f2124f 100644 --- a/core/fpdfapi/page/cpdf_page.h +++ b/core/fpdfapi/page/cpdf_page.h @@ -10,6 +10,7 @@ #include #include "core/fpdfapi/page/cpdf_pageobjectholder.h" +#include "core/fpdfapi/page/ipdf_page.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/observable.h" @@ -20,41 +21,50 @@ class CPDF_Dictionary; class CPDF_Document; class CPDF_Object; +class CPDF_Page; class CPDF_PageRenderCache; class CPDF_PageRenderContext; -class CPDF_Page : public Retainable, +// Small layering violation, incomplete type and always null if non-XFA. +class CPDFXFA_Page; + +class CPDF_Page : public IPDF_Page, public Observable, public CPDF_PageObjectHolder { public: class View {}; // Caller implements as desired, empty here due to layering. - class Extension : public Retainable {}; // XFA page parent class, layering. template friend RetainPtr 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 DeviceToPage( + const FX_RECT& rect, + int rotate, + const CFX_PointF& device_point) const override; + Optional PageToDevice( + const FX_RECT& rect, + int rotate, + const CFX_PointF& page_point) const override; + // CPDF_PageObjectHolder: bool IsPage() const override; void ParseContent(); - Optional DeviceToPage(const FX_RECT& rect, - int rotate, - const CFX_PointF& device_point) const; - Optional PageToDevice(const FX_RECT& rect, - int rotate, - const CFX_PointF& page_point) const; - CFX_Matrix GetDisplayMatrix(const FX_RECT& rect, int iRotate) const; - float GetPageWidth() const { return m_PageSize.width; } - float GetPageHeight() const { return m_PageSize.height; } const CFX_SizeF& GetPageSize() const { return m_PageSize; } - const CFX_FloatRect& GetPageBBox() const { return m_BBox; } int GetPageRotation() const; - CPDF_PageRenderCache* GetRenderCache() const { return m_pPageRender.get(); } + CPDF_PageRenderCache* GetRenderCache() const { return m_pPageRender.get(); } CPDF_PageRenderContext* GetRenderContext() const { return m_pRenderContext.get(); } @@ -63,8 +73,6 @@ class CPDF_Page : public Retainable, CPDF_Document* GetPDFDocument() const { return m_pPDFDocument.Get(); } View* GetView() const { return m_pView.Get(); } void SetView(View* pView) { m_pView = pView; } - Extension* GetPageExtension() const { return m_pPageExtension.Get(); } - void SetPageExtension(Extension* pExt) { m_pPageExtension = pExt; } private: CPDF_Page(CPDF_Document* pDocument, @@ -80,7 +88,6 @@ class CPDF_Page : public Retainable, CFX_SizeF m_PageSize; CFX_Matrix m_PageMatrix; UnownedPtr m_pPDFDocument; - UnownedPtr m_pPageExtension; std::unique_ptr m_pPageRender; std::unique_ptr m_pRenderContext; UnownedPtr m_pView; diff --git a/core/fpdfapi/page/ipdf_page.h b/core/fpdfapi/page/ipdf_page.h new file mode 100644 index 0000000000..929cba7583 --- /dev/null +++ b/core/fpdfapi/page/ipdf_page.h @@ -0,0 +1,52 @@ +// Copyright 2018 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + +#ifndef CORE_FPDFAPI_PAGE_IPDF_PAGE_H_ +#define CORE_FPDFAPI_PAGE_IPDF_PAGE_H_ + +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/retain_ptr.h" +#include "third_party/base/optional.h" + +class CPDF_Document; +class CPDF_Page; + +// Small layering violation, incomplete type and always null if non-XFA. +class CPDFXFA_Page; + +// Interface implented by both page types (CPDF_Page and CPDFXFA_Page). +class IPDF_Page : public Retainable { + public: + virtual CPDF_Page* AsPDFPage() = 0; + virtual CPDFXFA_Page* AsXFAPage() = 0; + + virtual CPDF_Document* GetDocument() const = 0; + + virtual float GetPageWidth() const = 0; + virtual float GetPageHeight() const = 0; + virtual CFX_Matrix GetDisplayMatrix(const FX_RECT& rect, + int iRotate) const = 0; + + virtual Optional DeviceToPage( + const FX_RECT& rect, + int rotate, + const CFX_PointF& device_point) const = 0; + + virtual Optional PageToDevice( + const FX_RECT& rect, + int rotate, + const CFX_PointF& page_point) const = 0; +}; + +inline CPDF_Page* ToPDFPage(IPDF_Page* pBase) { + return pBase ? pBase->AsPDFPage() : nullptr; +} + +inline CPDFXFA_Page* ToXFAPage(IPDF_Page* pBase) { + return pBase ? pBase->AsXFAPage() : nullptr; +} + +#endif // CORE_FPDFAPI_PAGE_IPDF_PAGE_H_ -- cgit v1.2.3