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/cpdfsdk_helpers.h | |
| 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/cpdfsdk_helpers.h')
| -rw-r--r-- | fpdfsdk/cpdfsdk_helpers.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/fpdfsdk/cpdfsdk_helpers.h b/fpdfsdk/cpdfsdk_helpers.h index fae7ef0782..98d7e45e5f 100644 --- a/fpdfsdk/cpdfsdk_helpers.h +++ b/fpdfsdk/cpdfsdk_helpers.h @@ -7,6 +7,7 @@ #ifndef FPDFSDK_CPDFSDK_HELPERS_H_ #define FPDFSDK_CPDFSDK_HELPERS_H_ +#include "core/fpdfapi/page/cpdf_page.h" #include "core/fpdfapi/parser/cpdf_parser.h" #include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/fx_dib.h" @@ -29,7 +30,6 @@ class CPDF_ContentMarkItem; class CPDF_Object; class CPDF_Font; class CPDF_LinkExtract; -class CPDF_Page; class CPDF_PageObject; class CPDF_PageRenderContext; class CPDF_PathObject; @@ -47,18 +47,9 @@ class CPDFXFA_Page; class CXFA_FFWidget; #endif // PDF_ENABLE_XFA -// Object types for public FPDF_ types; these correspond to next layer down -// from fpdfsdk. For master, these are CPDF_ types, but for XFA, these are -// CPDFXFA_ types. -#ifdef PDF_ENABLE_XFA -using UnderlyingPageType = CPDFXFA_Page; -#else // PDF_ENABLE_XFA -using UnderlyingPageType = CPDF_Page; -#endif // PDF_ENABLE_XFA - // Conversions to/from underlying types. -UnderlyingPageType* UnderlyingFromFPDFPage(FPDF_PAGE page); -FPDF_PAGE FPDFPageFromUnderlying(UnderlyingPageType* page); +IPDF_Page* IPDFPageFromFPDFPage(FPDF_PAGE page); +FPDF_PAGE FPDFPageFromIPDFPage(IPDF_Page* page); CPDF_Page* CPDFPageFromFPDFPage(FPDF_PAGE page); FPDF_DOCUMENT FPDFDocumentFromCPDFDocument(CPDF_Document* doc); CPDF_Document* CPDFDocumentFromFPDFDocument(FPDF_DOCUMENT doc); |