diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-06-12 13:36:05 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-12 13:36:05 +0000 |
| commit | 101535f463dda5766f99b66f383672d5898556fe (patch) | |
| tree | 04ca2226b850756c67dd29444545f4b91682835c /fpdfsdk/cpdfsdk_helpers.h | |
| parent | 755b0e5f71518488456e7cffc64fd7ba89692e68 (diff) | |
| download | pdfium-101535f463dda5766f99b66f383672d5898556fe.tar.xz | |
Rework "Make common page base class."
Re-landing of https://pdfium-review.googlesource.com/c/pdfium/+/32892
This time, however, we do not build on the previous CL which cached
pages. This CL by itself should be OK but was reverted only because
it was blocking earlier reverts.
Change-Id: I067d5f07373eeac6cced5d0c113ea40e5f8dcd15
Reviewed-on: https://pdfium-review.googlesource.com/34910
Commit-Queue: dsinclair <dsinclair@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); |