From 168c763539e70bea450701470c47a8991f578336 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 4 Jun 2018 18:07:47 +0000 Subject: 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 Commit-Queue: Tom Sepez --- fpdfsdk/cpdfsdk_helpers.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'fpdfsdk/cpdfsdk_helpers.cpp') diff --git a/fpdfsdk/cpdfsdk_helpers.cpp b/fpdfsdk/cpdfsdk_helpers.cpp index f7a875a3e9..e96b09f3a1 100644 --- a/fpdfsdk/cpdfsdk_helpers.cpp +++ b/fpdfsdk/cpdfsdk_helpers.cpp @@ -143,11 +143,11 @@ bool FPDF_FileHandlerContext::Flush() { } // namespace -IPDF_Page* IPDFPageFromFPDFPage(FPDF_PAGE page) { - return reinterpret_cast(page); +UnderlyingPageType* UnderlyingFromFPDFPage(FPDF_PAGE page) { + return reinterpret_cast(page); } -FPDF_PAGE FPDFPageFromIPDFPage(IPDF_Page* page) { +FPDF_PAGE FPDFPageFromUnderlying(UnderlyingPageType* page) { return reinterpret_cast(page); } @@ -160,7 +160,11 @@ FPDF_DOCUMENT FPDFDocumentFromCPDFDocument(CPDF_Document* doc) { } CPDF_Page* CPDFPageFromFPDFPage(FPDF_PAGE page) { - return page ? IPDFPageFromFPDFPage(page)->AsPDFPage() : nullptr; +#ifdef PDF_ENABLE_XFA + return page ? UnderlyingFromFPDFPage(page)->GetPDFPage() : nullptr; +#else // PDF_ENABLE_XFA + return UnderlyingFromFPDFPage(page); +#endif // PDF_ENABLE_XFA } ByteString CFXByteStringFromFPDFWideString(FPDF_WIDESTRING wide_string) { -- cgit v1.2.3