Move parser pointer to CPDF_Document

The CPDF_IndirectObjectHolder has two subclasses, CPDF_Document and
CFDF_Document. The CPDF document requires the parser and the CFDF document
does not. This cl moves the parser pointer up to CPDF_Document.

Review-Url: https://codereview.chromium.org/2253723002

1 files changed, 15 insertions, 7 deletions

diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h b/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h
index c29746fdd7..63fadf19d6 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h
@@ -19,24 +19,32 @@ class CPDF_IndirectObjectHolder {
   using iterator = std::map<uint32_t, CPDF_Object*>::iterator;
   using const_iterator = std::map<uint32_t, CPDF_Object*>::const_iterator;
 
-  explicit CPDF_IndirectObjectHolder(CPDF_Parser* pParser);
-  ~CPDF_IndirectObjectHolder();
+  CPDF_IndirectObjectHolder();
+  virtual ~CPDF_IndirectObjectHolder();
+
+  CPDF_Object* GetIndirectObject(uint32_t objnum) const;
+  CPDF_Object* GetOrParseIndirectObject(uint32_t objnum);
 
-  CPDF_Object* GetIndirectObject(uint32_t objnum);
-  uint32_t AddIndirectObject(CPDF_Object* pObj);
   void ReleaseIndirectObject(uint32_t objnum);
 
-  // Takes ownership of |pObj|.
-  bool InsertIndirectObject(uint32_t objnum, CPDF_Object* pObj);
+  // The following take ownership of |pObj|.
+  uint32_t AddIndirectObject(CPDF_Object* pObj);
+  void ReplaceIndirectObject(CPDF_Object* pObj);
+  bool ReplaceIndirectObjectIfHigherGeneration(uint32_t objnum,
+                                               CPDF_Object* pObj);
 
   uint32_t GetLastObjNum() const { return m_LastObjNum; }
+  void SetLastObjNum(uint32_t objnum) { m_LastObjNum = objnum; }
+
   iterator begin() { return m_IndirectObjs.begin(); }
   const_iterator begin() const { return m_IndirectObjs.begin(); }
   iterator end() { return m_IndirectObjs.end(); }
   const_iterator end() const { return m_IndirectObjs.end(); }
 
  protected:
-  CPDF_Parser* m_pParser;
+  virtual CPDF_Object* ParseIndirectObject(uint32_t objnum);
+
+ private:
   uint32_t m_LastObjNum;
   std::map<uint32_t, CPDF_Object*> m_IndirectObjs;
 };