Move parser pointer to CPDF_Document

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 464 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)
+    m_LastObjNum = m_pParser->GetLastObjNum();
+}
 
 CPDF_Document::~CPDF_Document() {
   delete m_pDocPage;
   CPDF_ModuleMgr::Get()->GetPageModule()->ClearStockFont(this);
 }
 
+CPDF_Object* CPDF_Document::GetIndirectObject(uint32_t objnum) {
+  if (objnum == 0)
+    return nullptr;
+
+  auto it = m_IndirectObjs.find(objnum);

[Tom Sepez, 2016/08/16 21:15:48]

This part (507 - 509) should still be a method on the indirect object holder.   

[dsinclair, 2016/08/17 15:57:46]

Done.

+  if (it != m_IndirectObjs.end())
+    return it->second->GetObjNum() != CPDF_Object::kInvalidObjNum ? it->second
+                                                                  : nullptr;
+
+  if (!m_pParser)
+    return nullptr;
+
+  CPDF_Object* pObj = m_pParser->ParseIndirectObject(this, objnum);
+  if (!pObj)
+    return nullptr;
+
+  pObj->m_ObjNum = objnum;
+  m_LastObjNum = std::max(m_LastObjNum, objnum);

[Tom Sepez, 2016/08/16 21:15:48]

This section feels like a method as well.  Document shouldn't be playing with
the holder's members.

[dsinclair, 2016/08/17 15:57:46]

Done.

+  if (m_IndirectObjs[objnum])
+    m_IndirectObjs[objnum]->Destroy();
+
+  m_IndirectObjs[objnum] = pObj;
+  return pObj;
+}
+
 void CPDF_Document::LoadDocInternal() {
   m_LastObjNum = m_pParser->GetLastObjNum();
 
   CPDF_Object* pRootObj = GetIndirectObject(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_