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 <tsepez@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

1 files changed, 8 insertions, 4 deletions

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<IPDF_Page*>(page);
+UnderlyingPageType* UnderlyingFromFPDFPage(FPDF_PAGE page) {
+  return reinterpret_cast<UnderlyingPageType*>(page);
 }
 
-FPDF_PAGE FPDFPageFromIPDFPage(IPDF_Page* page) {
+FPDF_PAGE FPDFPageFromUnderlying(UnderlyingPageType* page) {
   return reinterpret_cast<FPDF_PAGE>(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) {