Clean up CPDF_Page.

fpdfsdk/fpdfxfa/fpdfxfa_page.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h"
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
@@ skipping 28 matching lines @@
 
   CPDF_Document* pPDFDoc = m_pDocument->GetPDFDoc();
   if (!pPDFDoc)
     return FALSE;
 
   CPDF_Dictionary* pDict = pPDFDoc->GetPage(m_iPageIndex);
   if (!pDict)
     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;
 }
 
 FX_BOOL CPDFXFA_Page::LoadXFAPageView() {
   if (!m_pDocument)
     return FALSE;
 
   CXFA_FFDoc* pXFADoc = m_pDocument->GetXFADoc();
   if (!pXFADoc)
@@ skipping 26 matching lines @@
     }
     default:
       return FALSE;
   }
 }
 
 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;
 }
 
 FX_FLOAT CPDFXFA_Page::GetPageWidth() const {
   if (!m_pPDFPage && !m_pXFAPageView)
     return 0.0f;
 
   int nDocType = m_pDocument->GetDocType();
   switch (nDocType) {
     case DOCTYPE_DYNAMIC_XFA: {
@@ skipping 111 matching lines @@
     case DOCTYPE_PDF:
     case DOCTYPE_STATIC_XFA: {
       if (m_pPDFPage) {
         m_pPDFPage->GetDisplayMatrix(matrix, xPos, yPos, xSize, ySize, iRotate);
       }
     } break;
     default:
       return;
   }
 }