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.cpp | |
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.cpp')
-rw-r--r-- | fpdfsdk/cpdfsdk_helpers.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fpdfsdk/cpdfsdk_helpers.cpp b/fpdfsdk/cpdfsdk_helpers.cpp index 76e544961b..c6861bc05a 100644 --- a/fpdfsdk/cpdfsdk_helpers.cpp +++ b/fpdfsdk/cpdfsdk_helpers.cpp @@ -143,11 +143,11 @@ bool FPDF_FileHandlerContext::Flush() { } // namespace -UnderlyingPageType* UnderlyingFromFPDFPage(FPDF_PAGE page) { - return reinterpret_cast<UnderlyingPageType*>(page); +IPDF_Page* IPDFPageFromFPDFPage(FPDF_PAGE page) { + return reinterpret_cast<IPDF_Page*>(page); } -FPDF_PAGE FPDFPageFromUnderlying(UnderlyingPageType* page) { +FPDF_PAGE FPDFPageFromIPDFPage(IPDF_Page* page) { return reinterpret_cast<FPDF_PAGE>(page); } @@ -164,11 +164,7 @@ FPDF_DOCUMENT FPDFDocumentFromCPDFDocument(CPDF_Document* doc) { } CPDF_Page* CPDFPageFromFPDFPage(FPDF_PAGE page) { -#ifdef PDF_ENABLE_XFA - return page ? UnderlyingFromFPDFPage(page)->GetPDFPage() : nullptr; -#else // PDF_ENABLE_XFA - return UnderlyingFromFPDFPage(page); -#endif // PDF_ENABLE_XFA + return page ? IPDFPageFromFPDFPage(page)->AsPDFPage() : nullptr; } ByteString CFXByteStringFromFPDFWideString(FPDF_WIDESTRING wide_string) { |