commit ef9fe9ed8a00be4a1788228cfa5df303e34d4d73
author Tom Sepez <tsepez@chromium.org> Tue Jun 12 20:26:56 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Jun 12 20:26:56 2018 +0000
tree 9fb70b7c990725d0e18fcffe58f88289e1ae79e4
parent 8128485d0169a8dcbe14289a868ff3c27440bfcf

FPDFPage_New(), FPDF_LoadPage(): Fallthru into PDF case if no XFA context.

Now that there is a consistent underlying page type, we can unify these
actions.

Change-Id: I13fdfe775c540baaa0cd8085f8a7999fa6a3d276
Reviewed-on: https://pdfium-review.googlesource.com/34970
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

fpdfsdk/fpdf_editpage.cpp

diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp
index 9dcd470..4acb5b6 100644
--- a/fpdfsdk/fpdf_editpage.cpp
+++ b/fpdfsdk/fpdf_editpage.cpp
@@ -199,13 +199,11 @@
     pXFAPage->LoadPDFPage(pPageDict);
     return FPDFPageFromIPDFPage(pXFAPage.Leak());  // Caller takes ownership.
   }
-  // Eventually, fallthru into non-XFA case once page type is consistent.
-  return nullptr;
-#else  // PDF_ENABLE_XFA
+#endif  // PDF_ENABLE_XFA
+
   auto pPage = pdfium::MakeRetain<CPDF_Page>(pDoc, pPageDict, true);
   pPage->ParseContent();
   return FPDFPageFromIPDFPage(pPage.Leak());  // Caller takes ownership.
-#endif  // PDF_ENABLE_XFA
 }
 
 FPDF_EXPORT int FPDF_CALLCONV FPDFPage_GetRotation(FPDF_PAGE page) {

fpdfsdk/fpdf_view.cpp

diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index bfaf537..0e76548 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -343,10 +343,8 @@
   auto* pContext = static_cast<CPDFXFA_Context*>(pDoc->GetExtension());
   if (pContext)
     return FPDFPageFromIPDFPage(pContext->GetXFAPage(page_index).Leak());
+#endif  // PDF_ENABLE_XFA
 
-  // Eventually, fallthrough into non-xfa case once page type made consistent.
-  return nullptr;
-#else   // PDF_ENABLE_XFA
   CPDF_Dictionary* pDict = pDoc->GetPageDictionary(page_index);
   if (!pDict)
     return nullptr;
@@ -354,7 +352,6 @@
   auto pPage = pdfium::MakeRetain<CPDF_Page>(pDoc, pDict, true);
   pPage->ParseContent();
   return FPDFPageFromIPDFPage(pPage.Leak());
-#endif  // PDF_ENABLE_XFA
 }
 
 FPDF_EXPORT double FPDF_CALLCONV FPDF_GetPageWidth(FPDF_PAGE page) {