From 101535f463dda5766f99b66f383672d5898556fe Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 12 Jun 2018 13:36:05 +0000 Subject: 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 Reviewed-by: dsinclair --- fpdfsdk/fpdf_view.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'fpdfsdk/fpdf_view.cpp') diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp index 96de5d56e1..535f1e5036 100644 --- a/fpdfsdk/fpdf_view.cpp +++ b/fpdfsdk/fpdf_view.cpp @@ -351,7 +351,7 @@ FPDF_EXPORT FPDF_PAGE FPDF_CALLCONV FPDF_LoadPage(FPDF_DOCUMENT document, #ifdef PDF_ENABLE_XFA auto* pContext = static_cast(pDoc->GetExtension()); if (pContext) - return FPDFPageFromUnderlying(pContext->GetXFAPage(page_index).Leak()); + return FPDFPageFromIPDFPage(pContext->GetXFAPage(page_index).Leak()); // Eventually, fallthrough into non-xfa case once page type made consistent. return nullptr; @@ -362,17 +362,17 @@ FPDF_EXPORT FPDF_PAGE FPDF_CALLCONV FPDF_LoadPage(FPDF_DOCUMENT document, auto pPage = pdfium::MakeRetain(pDoc, pDict, true); pPage->ParseContent(); - return FPDFPageFromUnderlying(pPage.Leak()); + return FPDFPageFromIPDFPage(pPage.Leak()); #endif // PDF_ENABLE_XFA } FPDF_EXPORT double FPDF_CALLCONV FPDF_GetPageWidth(FPDF_PAGE page) { - UnderlyingPageType* pPage = UnderlyingFromFPDFPage(page); + IPDF_Page* pPage = IPDFPageFromFPDFPage(page); return pPage ? pPage->GetPageWidth() : 0.0; } FPDF_EXPORT double FPDF_CALLCONV FPDF_GetPageHeight(FPDF_PAGE page) { - UnderlyingPageType* pPage = UnderlyingFromFPDFPage(page); + IPDF_Page* pPage = IPDFPageFromFPDFPage(page); return pPage ? pPage->GetPageHeight() : 0.0; } @@ -732,12 +732,12 @@ FPDF_EXPORT void FPDF_CALLCONV FPDF_ClosePage(FPDF_PAGE page) { return; // Take it back across the API and hold for duration of this function. - RetainPtr pPage; - pPage.Unleak(UnderlyingFromFPDFPage(page)); + RetainPtr pPage; + pPage.Unleak(IPDFPageFromFPDFPage(page)); #ifndef PDF_ENABLE_XFA CPDFSDK_PageView* pPageView = - static_cast(pPage->GetView()); + static_cast(pPage->AsPDFPage()->GetView()); if (!pPageView || pPageView->IsBeingDestroyed()) return; @@ -775,7 +775,7 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDF_DeviceToPage(FPDF_PAGE page, if (!page || !page_x || !page_y) return false; - UnderlyingPageType* pPage = UnderlyingFromFPDFPage(page); + IPDF_Page* pPage = IPDFPageFromFPDFPage(page); const FX_RECT rect(start_x, start_y, start_x + size_x, start_y + size_y); Optional pos = pPage->DeviceToPage(rect, rotate, CFX_PointF(device_x, device_y)); @@ -800,7 +800,7 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDF_PageToDevice(FPDF_PAGE page, if (!page || !device_x || !device_y) return false; - UnderlyingPageType* pPage = UnderlyingFromFPDFPage(page); + IPDF_Page* pPage = IPDFPageFromFPDFPage(page); const FX_RECT rect(start_x, start_y, start_x + size_x, start_y + size_y); CFX_PointF page_point(static_cast(page_x), static_cast(page_y)); Optional pos = pPage->PageToDevice(rect, rotate, page_point); -- cgit v1.2.3