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)
+    SetLastObjNum(m_pParser->GetLastObjNum());
+}
 
 CPDF_Document::~CPDF_Document() {
   delete m_pDocPage;
   CPDF_ModuleMgr::Get()->GetPageModule()->ClearStockFont(this);
 }
 
+CPDF_Object* CPDF_Document::GetIndirectObjectIfValid(uint32_t objnum) {

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

nit: maybe GetOrParseIndirectObject(), and de-virtualize.

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

Can't as this has to override the version from CPDF_IndirectObjectHolder so we
can do our parse magic. The name is terrible, but I can't come up with anything
better ....

+  CPDF_Object* pObj = GetIndirectObject(objnum);
+  if (pObj)
+    return pObj->GetObjNum() != CPDF_Object::kInvalidObjNum ? pObj : nullptr;
+
+  if (!m_pParser)
+    return nullptr;
+
+  pObj = m_pParser->ParseIndirectObject(this, objnum);
+  if (!pObj)
+    return nullptr;
+
+  pObj->m_ObjNum = objnum;
+  EmplaceIndirectObject(pObj);
+  return pObj;
+}
+
 void CPDF_Document::LoadDocInternal() {
-  m_LastObjNum = m_pParser->GetLastObjNum();
+  SetLastObjNum(m_pParser->GetLastObjNum());
 
-  CPDF_Object* pRootObj = GetIndirectObject(m_pParser->GetRootObjNum());
+  CPDF_Object* pRootObj = GetIndirectObjectIfValid(m_pParser->GetRootObjNum());
   if (!pRootObj)
     return;
 
   m_pRootDict = pRootObj->GetDict();
   if (!m_pRootDict)
     return;
 
-  CPDF_Object* pInfoObj = GetIndirectObject(m_pParser->GetInfoObjNum());
+  CPDF_Object* pInfoObj = GetIndirectObjectIfValid(m_pParser->GetInfoObjNum());
   if (pInfoObj)
     m_pInfoDict = pInfoObj->GetDict();
   if (CPDF_Array* pIDArray = m_pParser->GetIDArray()) {
     m_ID1 = pIDArray->GetStringAt(0);
     m_ID2 = pIDArray->GetStringAt(1);
   }
 }
 
 void CPDF_Document::LoadDoc() {
   LoadDocInternal();
@@ skipping 59 matching lines @@
   }
   return nullptr;
 }
 
 CPDF_Dictionary* CPDF_Document::GetPage(int iPage) {
   if (iPage < 0 || iPage >= m_PageList.GetSize())
     return nullptr;
 
   if (m_bLinearized && (iPage == m_iFirstPageNo)) {
     if (CPDF_Dictionary* pDict =
-            ToDictionary(GetIndirectObject(m_dwFirstPageObjNum))) {
+            ToDictionary(GetIndirectObjectIfValid(m_dwFirstPageObjNum))) {
       return pDict;
     }
   }
 
   int objnum = m_PageList.GetAt(iPage);
   if (objnum) {
-    if (CPDF_Dictionary* pDict = ToDictionary(GetIndirectObject(objnum)))
+    if (CPDF_Dictionary* pDict = ToDictionary(GetIndirectObjectIfValid(objnum)))
       return pDict;
   }
 
   CPDF_Dictionary* pRoot = GetRoot();
   if (!pRoot)
     return nullptr;
 
   CPDF_Dictionary* pPages = pRoot->GetDictBy("Pages");
   if (!pPages)
     return nullptr;
@@ skipping 112 matching lines @@
 #ifndef PDF_ENABLE_XFA
     return 0;
 #else  // PDF_ENABLE_XFA
     return 0xFFFFFFFF;
 #endif
   }
   return m_pParser->GetPermissions();
 }
 
 FX_BOOL CPDF_Document::IsFormStream(uint32_t objnum, FX_BOOL& bForm) const {
-  auto it = m_IndirectObjs.find(objnum);
-  if (it != m_IndirectObjs.end()) {
-    CPDF_Stream* pStream = it->second->AsStream();
+  if (CPDF_Object* pObj = GetIndirectObject(objnum)) {
+    CPDF_Stream* pStream = pObj->AsStream();
     bForm = pStream && pStream->GetDict()->GetStringBy("Subtype") == "Form";
     return TRUE;
   }
   if (!m_pParser) {
     bForm = FALSE;
     return TRUE;
   }
   return m_pParser->IsFormStream(objnum, bForm);
 }
 
@@ skipping 698 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_