Make CPDF_PageContentGenerator methods take object numbers

core/fpdfapi/page/cpdf_docpagedata.cpp

Index: core/fpdfapi/page/cpdf_docpagedata.cpp
diff --git a/core/fpdfapi/page/cpdf_docpagedata.cpp b/core/fpdfapi/page/cpdf_docpagedata.cpp
index c4dc050215ed01caf040a682d2857f5afba05995..7c45a04af164125742d0acd2b5b35b221ba49039 100644
--- a/core/fpdfapi/page/cpdf_docpagedata.cpp
+++ b/core/fpdfapi/page/cpdf_docpagedata.cpp
@@ -393,31 +393,21 @@ void CPDF_DocPageData::ReleasePattern(const CPDF_Object* pPatternObj) {
   pPattern->clear();
 }
 
-CPDF_Image* CPDF_DocPageData::GetImage(CPDF_Object* pImageStream) {
-  if (!pImageStream)
-    return nullptr;
-
-  ASSERT(!pImageStream->IsInline());
-  const uint32_t dwObjNum = pImageStream->GetObjNum();
-  auto it = m_ImageMap.find(dwObjNum);
+CPDF_Image* CPDF_DocPageData::GetImage(uint32_t dwStreamObjNum) {
+  ASSERT(dwStreamObjNum);
+  auto it = m_ImageMap.find(dwStreamObjNum);
   if (it != m_ImageMap.end())
     return it->second->AddRef();
 
   CPDF_CountedImage* pCountedImage =
-      new CPDF_CountedImage(new CPDF_Image(m_pPDFDoc, dwObjNum));
-  m_ImageMap[dwObjNum] = pCountedImage;
+      new CPDF_CountedImage(new CPDF_Image(m_pPDFDoc, dwStreamObjNum));
+  m_ImageMap[dwStreamObjNum] = pCountedImage;
   return pCountedImage->AddRef();
 }
 
-void CPDF_DocPageData::ReleaseImage(const CPDF_Object* pImageStream) {
-  if (!pImageStream)
-    return;
-
-  uint32_t dwObjNum = pImageStream->GetObjNum();
-  if (!dwObjNum)
-    return;
-
-  auto it = m_ImageMap.find(dwObjNum);
+void CPDF_DocPageData::ReleaseImage(uint32_t dwStreamObjNum) {
+  ASSERT(dwStreamObjNum);
+  auto it = m_ImageMap.find(dwStreamObjNum);
   if (it == m_ImageMap.end())
     return;