Move parser pointer to CPDF_Document

core/fpdfapi/fpdf_parser/cfdf_document.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_parser/include/cfdf_document.h"
 
 #include "core/fpdfapi/fpdf_edit/include/cpdf_creator.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
 
-CFDF_Document::CFDF_Document() : CPDF_IndirectObjectHolder(nullptr) {
-  m_pRootDict = nullptr;
-  m_pFile = nullptr;
-  m_bOwnFile = FALSE;
+CFDF_Document::CFDF_Document()
+    : CPDF_IndirectObjectHolder(),
+      m_pRootDict(nullptr),
+      m_pFile(nullptr),
+      m_bOwnFile(FALSE) {}
+
+CFDF_Document::~CFDF_Document() {
+  if (m_bOwnFile && m_pFile)
+    m_pFile->Release();
 }
-CFDF_Document::~CFDF_Document() {
-  if (m_bOwnFile && m_pFile) {
-    m_pFile->Release();
-  }
-}
+
 CFDF_Document* CFDF_Document::CreateNewDoc() {
   CFDF_Document* pDoc = new CFDF_Document;
   pDoc->m_pRootDict = new CPDF_Dictionary;
   pDoc->AddIndirectObject(pDoc->m_pRootDict);
   CPDF_Dictionary* pFDFDict = new CPDF_Dictionary;
   pDoc->m_pRootDict->SetAt("FDF", pFDFDict);
   return pDoc;
 }
 
 CFDF_Document* CFDF_Document::ParseFile(IFX_FileRead* pFile, FX_BOOL bOwnFile) {
@@ skipping 25 matching lines @@
         break;
 
       word = parser.GetNextWord(nullptr);
       if (word != "obj")
         break;
 
       CPDF_Object* pObj = parser.GetObject(this, objnum, 0, true);
       if (!pObj)
         break;
 
-      InsertIndirectObject(objnum, pObj);
+      InsertIndirectObjectIfHigherGeneration(objnum, pObj);
       word = parser.GetNextWord(nullptr);
       if (word != "endobj")
         break;
     } else {
       if (word != "trailer")
         break;
 
       if (CPDF_Dictionary* pMainDict =
               ToDictionary(parser.GetObject(this, 0, 0, true))) {
         m_pRootDict = pMainDict->GetDictBy("Root");
         pMainDict->Release();
       }
       break;
     }
   }
 }
 
 FX_BOOL CFDF_Document::WriteBuf(CFX_ByteTextBuf& buf) const {
   if (!m_pRootDict) {
     return FALSE;
   }
   buf << "%FDF-1.2\r\n";
-  for (const auto& pair : m_IndirectObjs) {
-    buf << pair.first << " 0 obj\r\n" << pair.second << "\r\nendobj\r\n\r\n";
-  }
+  for (auto it = begin(); it != end(); it++)

[Tom Sepez, 2016/08/17 16:46:44]

nit: can we write this as 

  for (const auto& pair : *this) 

[dsinclair, 2016/08/17 16:59:25]

Done.

+    buf << it->first << " 0 obj\r\n" << it->second << "\r\nendobj\r\n\r\n";
+
   buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum()
       << " 0 R>>\r\n%%EOF\r\n";
   return TRUE;
 }