1 files changed, 4 insertions, 6 deletions
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp
index 8c0d6bbf98..22c8f995f2 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp
@@ -46,9 +46,8 @@ FX_BOOL CPDFXFA_Page::LoadPDFPage() {
     return FALSE;
 
   if (!m_pPDFPage || m_pPDFPage->m_pFormDict != pDict) {
-    m_pPDFPage.reset(new CPDF_Page);
-    m_pPDFPage->Load(pPDFDoc, pDict);
-    m_pPDFPage->ParseContent(nullptr);
+    m_pPDFPage.reset(new CPDF_Page(pPDFDoc, pDict, true));
+    m_pPDFPage->ParseContent();
   }
   return TRUE;
 }
@@ -95,9 +94,8 @@ FX_BOOL CPDFXFA_Page::LoadPDFPage(CPDF_Dictionary* pageDict) {
   if (!m_pDocument || m_iPageIndex < 0 || !pageDict)
     return FALSE;
 
-  m_pPDFPage.reset(new CPDF_Page());
-  m_pPDFPage->Load(m_pDocument->GetPDFDoc(), pageDict);
-  m_pPDFPage->ParseContent(nullptr);
+  m_pPDFPage.reset(new CPDF_Page(m_pDocument->GetPDFDoc(), pageDict, true));
+  m_pPDFPage->ParseContent();
   return TRUE;
 }