Move parser pointer to CPDF_Document

core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h

Index: core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h
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 c29746fdd79d8d4554713686fc00e69d0ed61a13..ba555a39ff6befcad10ec77dcbbb4e4980b67402 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,29 @@ 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;
+  virtual CPDF_Object* GetIndirectObjectIfValid(uint32_t objnum);

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

Does this need to be virtual? Can it be const?

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

It does need to be virtual as we have to override it in the CPDF_Document case.
It can't be const since in the CPDF_Document override calls the Emplace method
to add something to m_IndirectObjs.

[Tom Sepez, 2016/08/17 17:15:31]

Alternatively, we could have a virtual ParseIndirectObject() method, that
returns nullptr in this base class, but gets overriden in document.  Then the
duplicated logic in document gets avoided as the non-virtual ..IfValid() then
goes on to call the parse method.

Or, we could add a CPDF_IndirectObjectHolder::Delegate class that implements a
virtual Parse method, and CPDF_IOH ctor takes a delegate or a nullptr as an
argument, and document implements CPDF_IOH::Delegate.

Or ... jeez.

[dsinclair, 2016/08/17 18:16:44]

Done.

 
-  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|.
+  bool InsertIndirectObjectIfHigherGeneration(uint32_t objnum,
+                                              CPDF_Object* pObj);
+  uint32_t AddIndirectObject(CPDF_Object* pObj);
+  void EmplaceIndirectObject(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;
+ private:
   uint32_t m_LastObjNum;
   std::map<uint32_t, CPDF_Object*> m_IndirectObjs;
 };