Move parser pointer to CPDF_Document

core/fpdfapi/fpdf_edit/fpdf_edit_create.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 "core/fpdfapi/fpdf_edit/editint.h"
 
 #include <vector>
 
@@ skipping 1215 matching lines @@
       break;
     }
   }
   return 1;
 }
 int32_t CPDF_Creator::WriteOldIndirectObject(uint32_t objnum) {
   if (m_pParser->IsObjectFreeOrNull(objnum))
     return 0;
 
   m_ObjectOffset[objnum] = m_Offset;
-  FX_BOOL bExistInMap =
-      pdfium::ContainsKey(m_pDocument->m_IndirectObjs, objnum);
+  FX_BOOL bExistInMap = !!m_pDocument->GetIndirectObject(objnum);
   const uint8_t object_type = m_pParser->GetObjectType(objnum);
   bool bObjStm = (object_type == 2) && m_pEncryptDict && !m_pXRefStream;
   if (m_pParser->IsVersionUpdated() || m_bSecurityChanged || bExistInMap ||
       bObjStm) {
-    CPDF_Object* pObj = m_pDocument->GetIndirectObject(objnum);
+    CPDF_Object* pObj = m_pDocument->GetIndirectObjectIfValid(objnum);
     if (!pObj) {
       m_ObjectOffset[objnum] = 0;
       return 0;
     }
     if (WriteIndirectObj(pObj)) {
       return -1;
     }
     if (!bExistInMap) {
       m_pDocument->ReleaseIndirectObject(objnum);
     }
@@ skipping 60 matching lines @@
       return 1;
     }
   }
   return 0;
 }
 int32_t CPDF_Creator::WriteNewObjs(FX_BOOL bIncremental, IFX_Pause* pPause) {
   int32_t iCount = m_NewObjNumArray.GetSize();
   int32_t index = (int32_t)(uintptr_t)m_Pos;
   while (index < iCount) {
     uint32_t objnum = m_NewObjNumArray.ElementAt(index);
-    auto it = m_pDocument->m_IndirectObjs.find(objnum);
-    if (it == m_pDocument->m_IndirectObjs.end()) {
+    CPDF_Object* pObj = m_pDocument->GetIndirectObject(objnum);
+    if (!pObj) {
       ++index;
       continue;
     }
     m_ObjectOffset[objnum] = m_Offset;
-    if (WriteIndirectObj(it->second)) {
+    if (WriteIndirectObj(pObj)) {
       return -1;
     }
     index++;
     if (pPause && pPause->NeedToPauseNow()) {
       m_Pos = (FX_POSITION)(uintptr_t)index;
       return 1;
     }
   }
   return 0;
 }
@@ skipping 16 matching lines @@
       j++;
 
     m_ObjectOffset.Add(dwStart, j - dwStart);
     dwStart = j;
   }
 }
 
 void CPDF_Creator::InitNewObjNumOffsets() {
   FX_BOOL bIncremental = (m_dwFlags & FPDFCREATE_INCREMENTAL) != 0;
   FX_BOOL bNoOriginal = (m_dwFlags & FPDFCREATE_NO_ORIGINAL) != 0;
-  for (const auto& pair : m_pDocument->m_IndirectObjs) {
-    const uint32_t objnum = pair.first;
-    const CPDF_Object* pObj = pair.second;
+  for (auto it = m_pDocument->begin(); it != m_pDocument->end(); it++) {
+    const uint32_t objnum = it->first;
+    const CPDF_Object* pObj = it->second;
     if (bIncremental || pObj->GetObjNum() == CPDF_Object::kInvalidObjNum)
       continue;
     if (m_pParser && m_pParser->IsValidObjectNumber(objnum) &&
         m_pParser->GetObjectType(objnum)) {
       continue;
     }
     AppendNewObjNum(objnum);
   }
 
   int32_t iCount = m_NewObjNumArray.GetSize();
@@ skipping 317 matching lines @@
 int32_t CPDF_Creator::WriteDoc_Stage4(IFX_Pause* pPause) {
   ASSERT(m_iStage >= 90);
   if ((m_dwFlags & FPDFCREATE_OBJECTSTREAM) == 0) {
     FX_BOOL bXRefStream =
         (m_dwFlags & FPDFCREATE_INCREMENTAL) != 0 && m_pParser->IsXRefStream();
     if (!bXRefStream) {
       if (m_File.AppendString("trailer\r\n<<") < 0) {
         return -1;
       }
     } else {
-      if (m_File.AppendDWord(m_pDocument->m_LastObjNum + 1) < 0) {
+      if (m_File.AppendDWord(m_pDocument->GetLastObjNum() + 1) < 0) {
         return -1;
       }
       if (m_File.AppendString(" 0 obj <<") < 0) {
         return -1;
       }
     }
     if (m_pParser) {
       CPDF_Dictionary* p = m_pParser->GetTrailer();
       for (const auto& it : *p) {
         const CFX_ByteString& key = it.first;
@@ skipping 299 matching lines @@
   m_pCryptoHandler = nullptr;
 }
 void CPDF_Creator::ResetStandardSecurity() {
   if (!m_bLocalCryptoHandler)
     return;
 
   delete m_pCryptoHandler;
   m_pCryptoHandler = nullptr;
   m_bLocalCryptoHandler = FALSE;
 }