Mege to XFA: Redo CPDF_PageObjects - part 1

core/src/fpdfapi/fpdf_page/fpdf_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 "pageint.h"
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
@@ skipping 648 matching lines @@
   m_FormMatrix = pSrcObj->m_FormMatrix;
 }
 void CPDF_FormObject::CalcBoundingBox() {
   CFX_FloatRect form_rect = m_pForm->CalcBoundingBox();
   form_rect.Transform(&m_FormMatrix);
   m_Left = form_rect.left;
   m_Bottom = form_rect.bottom;
   m_Right = form_rect.right;
   m_Top = form_rect.top;
 }
-CPDF_PageObjects::CPDF_PageObjects(FX_BOOL bReleaseMembers)
+CPDF_PageObjects::CPDF_PageObjects()
     : m_pFormDict(nullptr),
       m_pFormStream(nullptr),
       m_pDocument(nullptr),
       m_pPageResources(nullptr),
       m_pResources(nullptr),
       m_Transparency(0),
-      m_ObjectList(128),
       m_bBackgroundAlphaNeeded(FALSE),
       m_bHasImageMask(FALSE),
-      m_bReleaseMembers(bReleaseMembers),
-      m_pParser(nullptr),
-      m_ParseState(CONTENT_NOT_PARSED) {}
+      m_ParseState(CONTENT_NOT_PARSED),
+      m_ObjectList(128) {}
 CPDF_PageObjects::~CPDF_PageObjects() {
-  delete m_pParser;
-  if (!m_bReleaseMembers) {
-    return;
-  }
   FX_POSITION pos = m_ObjectList.GetHeadPosition();
   while (pos) {
     delete (CPDF_PageObject*)m_ObjectList.GetNext(pos);
   }
 }
 void CPDF_PageObjects::ContinueParse(IFX_Pause* pPause) {
   if (!m_pParser) {
     return;
   }
   m_pParser->Continue(pPause);
   if (m_pParser->GetStatus() == CPDF_ContentParser::Done) {
     m_ParseState = CONTENT_PARSED;
-    delete m_pParser;
-    m_pParser = NULL;
+    m_pParser.reset();
   }
 }
 FX_POSITION CPDF_PageObjects::InsertObject(FX_POSITION posInsertAfter,
                                            CPDF_PageObject* pNewObject) {
   if (!posInsertAfter) {
     return m_ObjectList.AddHead(pNewObject);
   }
   return m_ObjectList.InsertAfter(posInsertAfter, pNewObject);
 }
 int CPDF_PageObjects::GetObjectIndex(CPDF_PageObject* pObj) const {
@@ skipping 56 matching lines @@
     return;
   }
   m_Transparency |= PDFTRANS_GROUP;
   if (pGroup->GetInteger("I")) {
     m_Transparency |= PDFTRANS_ISOLATED;
   }
   if (pGroup->GetInteger("K")) {
     m_Transparency |= PDFTRANS_KNOCKOUT;
   }
 }
-void CPDF_PageObjects::ClearCacheObjects() {
-  m_ParseState = CONTENT_NOT_PARSED;
-  delete m_pParser;
-  m_pParser = NULL;
-  if (m_bReleaseMembers) {
-    FX_POSITION pos = m_ObjectList.GetHeadPosition();
-    while (pos) {
-      delete (CPDF_PageObject*)m_ObjectList.GetNext(pos);
-    }
-  }
-  m_ObjectList.RemoveAll();
-}
-CPDF_Page::CPDF_Page() {
-  m_pPageRender = NULL;
-}
+
+CPDF_Page::CPDF_Page() : m_pPageRender(nullptr) {}
+
 void CPDF_Page::Load(CPDF_Document* pDocument,
                      CPDF_Dictionary* pPageDict,
                      FX_BOOL bPageCache) {
   m_pDocument = (CPDF_Document*)pDocument;
   m_pFormDict = pPageDict;
   if (bPageCache) {
     m_pPageRender =
         CPDF_ModuleMgr::Get()->GetRenderModule()->CreatePageCache(this);
   }
   if (!pPageDict) {
@@ skipping 49 matching lines @@
     case 2:
       m_PageMatrix.Set(-1.0f, 0, 0, -1.0f, m_BBox.right, m_BBox.top);
       break;
     case 3:
       m_PageMatrix.Set(0, 1.0f, -1.0f, 0, m_BBox.top, -m_BBox.left);
       break;
   }
   m_Transparency = PDFTRANS_ISOLATED;
   LoadTransInfo();
 }
-void CPDF_Page::StartParse(CPDF_ParseOptions* pOptions, FX_BOOL bReParse) {
-  if (bReParse) {
-    ClearCacheObjects();
-  }
+void CPDF_Page::StartParse(CPDF_ParseOptions* pOptions) {
   if (m_ParseState == CONTENT_PARSED || m_ParseState == CONTENT_PARSING) {
     return;
   }
-  m_pParser = new CPDF_ContentParser;
+  m_pParser.reset(new CPDF_ContentParser);
   m_pParser->Start(this, pOptions);
   m_ParseState = CONTENT_PARSING;
 }
-void CPDF_Page::ParseContent(CPDF_ParseOptions* pOptions, FX_BOOL bReParse) {
-  StartParse(pOptions, bReParse);
-  ContinueParse(NULL);
+void CPDF_Page::ParseContent(CPDF_ParseOptions* pOptions) {
+  StartParse(pOptions);
+  ContinueParse(nullptr);
 }
 CPDF_Page::~CPDF_Page() {
   if (m_pPageRender) {
     IPDF_RenderModule* pModule = CPDF_ModuleMgr::Get()->GetRenderModule();
     pModule->DestroyPageCache(m_pPageRender);
   }
 }
 CPDF_Object* FPDFAPI_GetPageAttr(CPDF_Dictionary* pPageDict,
                                  const CFX_ByteStringC& name) {
   int level = 0;
@@ skipping 36 matching lines @@
 }
 CPDF_Form::~CPDF_Form() {}
 void CPDF_Form::StartParse(CPDF_AllStates* pGraphicStates,
                            CFX_Matrix* pParentMatrix,
                            CPDF_Type3Char* pType3Char,
                            CPDF_ParseOptions* pOptions,
                            int level) {
   if (m_ParseState == CONTENT_PARSED || m_ParseState == CONTENT_PARSING) {
     return;
   }
-  m_pParser = new CPDF_ContentParser;
+  m_pParser.reset(new CPDF_ContentParser);
   m_pParser->Start(this, pGraphicStates, pParentMatrix, pType3Char, pOptions,
                    level);
   m_ParseState = CONTENT_PARSING;
 }
 void CPDF_Form::ParseContent(CPDF_AllStates* pGraphicStates,
                              CFX_Matrix* pParentMatrix,
                              CPDF_Type3Char* pType3Char,
                              CPDF_ParseOptions* pOptions,
                              int level) {
   StartParse(pGraphicStates, pParentMatrix, pType3Char, pOptions, level);
@@ skipping 62 matching lines @@
                      (FX_FLOAT)y0);
   matrix = m_PageMatrix;
   matrix.Concat(display_matrix);
 }
 CPDF_ParseOptions::CPDF_ParseOptions() {
   m_bTextOnly = FALSE;
   m_bMarkedContent = TRUE;
   m_bSeparateForm = TRUE;
   m_bDecodeInlineImage = FALSE;
 }