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.cpp | |
| 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.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 1ceecfe21f..2f42f146cd 100644 --- a/fpdfsdk/cpdfsdk_helpers.cpp +++ b/fpdfsdk/cpdfsdk_helpers.cpp @@ -144,11 +144,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); } @@ -161,11 +161,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) { |