Move parser out of IndirectObjectHolder

core/fpdfapi/fpdf_parser/cpdf_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/cpdf_document.h"
 
 #include <memory>
 #include <set>
@@ skipping 466 matching lines @@
       count++;
     }
   }
   pPages->SetAtInteger("Count", count);
   return count;
 }
 
 }  // namespace
 
 CPDF_Document::CPDF_Document(CPDF_Parser* pParser)
-    : CPDF_IndirectObjectHolder(pParser),
+    : CPDF_IndirectObjectHolder(),
+      m_pParser(pParser),
       m_pRootDict(nullptr),
       m_pInfoDict(nullptr),
       m_bLinearized(false),
       m_iFirstPageNo(0),
       m_dwFirstPageObjNum(0),
       m_pDocPage(new CPDF_DocPageData(this)),
-      m_pDocRender(new CPDF_DocRenderData(this)) {}
+      m_pDocRender(new CPDF_DocRenderData(this)) {
+  if (pParser)
+    SetLastObjNum(m_pParser->GetLastObjNum());
+}
 
 CPDF_Document::~CPDF_Document() {
   delete m_pDocPage;
   CPDF_ModuleMgr::Get()->GetPageModule()->ClearStockFont(this);
 }
 
+CPDF_Object* CPDF_Document::ParseIndirectObject(uint32_t objnum) {
+  return m_pParser ? m_pParser->ParseIndirectObject(this, objnum) : nullptr;
+}
+
 void CPDF_Document::LoadDocInternal() {
   SetLastObjNum(m_pParser->GetLastObjNum());
 
   CPDF_Object* pRootObj = GetOrParseIndirectObject(m_pParser->GetRootObjNum());
   if (!pRootObj)
     return;
 
   m_pRootDict = pRootObj->GetDict();
   if (!m_pRootDict)
     return;
@@ skipping 932 matching lines @@
     }
   }
   pFontDesc->SetAtInteger("StemV", fStemV);
   AddIndirectObject(pFontDesc);
   pFontDict->SetAtReference("FontDescriptor", this, pFontDesc);
   CFRelease(traits);
   CFRelease(languages);
   return LoadFont(pBaseDict);
 }
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_