Mege to XFA: Redo CPDF_PageObjects - part 1

fpdfsdk/src/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/include/fsdk_define.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h"
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
@@ skipping 35 matching lines @@
     if (m_pPDFPage) {
       if (m_pPDFPage->m_pFormDict == pDict)
         return TRUE;
 
       delete m_pPDFPage;
       m_pPDFPage = NULL;
     }
 
     m_pPDFPage = new CPDF_Page;
     m_pPDFPage->Load(pPDFDoc, pDict);
-    m_pPDFPage->ParseContent();
+    m_pPDFPage->ParseContent(nullptr);
     return TRUE;
   }
 
   return FALSE;
 }
 
 FX_BOOL CPDFXFA_Page::LoadXFAPageView() {
   if (!m_pDocument)
     return FALSE;
   IXFA_Doc* pXFADoc = m_pDocument->GetXFADoc();
@@ skipping 38 matching lines @@
 
 FX_BOOL CPDFXFA_Page::LoadPDFPage(CPDF_Dictionary* pageDict) {
   if (!m_pDocument || m_iPageIndex < 0 || !pageDict)
     return FALSE;
 
   if (m_pPDFPage)
     delete m_pPDFPage;
 
   m_pPDFPage = new CPDF_Page();
   m_pPDFPage->Load(m_pDocument->GetPDFDoc(), pageDict);
-  m_pPDFPage->ParseContent();
+  m_pPDFPage->ParseContent(nullptr);
 
   return TRUE;
 }
 
 FX_FLOAT CPDFXFA_Page::GetPageWidth() {
   ASSERT(m_pDocument != NULL);
 
   if (!m_pPDFPage && !m_pXFAPageView)
     return 0.0f;
 
@@ skipping 120 matching lines @@
     case DOCTYPE_PDF:
     case DOCTYPE_STATIC_XFA: {
       if (m_pPDFPage) {
         m_pPDFPage->GetDisplayMatrix(matrix, xPos, yPos, xSize, ySize, iRotate);
       }
     } break;
     default:
       return;
   }
 }