Make AddIndirectObject() take a unique_ptr.

core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp

 // Copyright 2016 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/edit/cpdf_pagecontentgenerator.h"
 
 #include "core/fpdfapi/edit/cpdf_creator.h"
 #include "core/fpdfapi/page/cpdf_docpagedata.h"
@@ skipping 34 matching lines @@
     CPDF_ImageObject* pImageObject = pPageObj->AsImage();
     if (pImageObject)
       ProcessImage(buf, pImageObject);
   }
   CPDF_Dictionary* pPageDict = m_pPage->m_pFormDict;
   CPDF_Object* pContent =
       pPageDict ? pPageDict->GetDirectObjectFor("Contents") : nullptr;
   if (pContent)
     pPageDict->RemoveFor("Contents");
 
-  CPDF_Stream* pStream = new CPDF_Stream;
+  CPDF_Stream* pStream = m_pDocument->NewIndirect<CPDF_Stream>();
   pStream->SetData(buf.GetBuffer(), buf.GetLength());
-  pPageDict->SetReferenceFor("Contents", m_pDocument,
-                             m_pDocument->AddIndirectObject(pStream));
+  pPageDict->SetReferenceFor("Contents", m_pDocument, pStream);
 }
 
 CFX_ByteString CPDF_PageContentGenerator::RealizeResource(
     uint32_t dwResourceObjNum,
     const CFX_ByteString& bsType) {
   ASSERT(dwResourceObjNum);
   if (!m_pPage->m_pResources) {
-    m_pPage->m_pResources =
-        new CPDF_Dictionary(m_pDocument->GetByteStringPool());
-    m_pPage->m_pFormDict->SetReferenceFor(
-        "Resources", m_pDocument,
-        m_pDocument->AddIndirectObject(m_pPage->m_pResources));
+    m_pPage->m_pResources = m_pDocument->NewIndirect<CPDF_Dictionary>(
+        m_pDocument->GetByteStringPool());
+    m_pPage->m_pFormDict->SetReferenceFor("Resources", m_pDocument,
+                                          m_pPage->m_pResources);
   }
   CPDF_Dictionary* pResList = m_pPage->m_pResources->GetDictFor(bsType);
   if (!pResList) {
     pResList = new CPDF_Dictionary(m_pDocument->GetByteStringPool());
     m_pPage->m_pResources->SetFor(bsType, pResList);
   }
   CFX_ByteString name;
   int idnum = 1;
   while (1) {
     name.Format("FX%c%d", bsType[0], idnum);
@@ skipping 45 matching lines @@
 
   CFX_FloatRect bbox = m_pPage->GetPageBBox();
   matrix.TransformRect(bbox);
 
   CPDF_Dictionary* pFormDict =
       new CPDF_Dictionary(m_pDocument->GetByteStringPool());
   pFormDict->SetNameFor("Type", "XObject");
   pFormDict->SetNameFor("Subtype", "Form");
   pFormDict->SetRectFor("BBox", bbox);
 
-  CPDF_Stream* pStream = new CPDF_Stream;
+  CPDF_Stream* pStream = m_pDocument->NewIndirect<CPDF_Stream>();
   pStream->InitStream(data, size, pFormDict);
 
-  CFX_ByteString name =
-      RealizeResource(m_pDocument->AddIndirectObject(pStream), "XObject");
+  CFX_ByteString name = RealizeResource(pStream->GetObjNum(), "XObject");

[dsinclair, 2016/11/15 18:55:51]

Why does this one need the extra ->GetObjNum when the others don't?

[Tom Sepez, 2016/11/15 19:15:16]

which other ones?  RealizeResource() only takes object numbers now.

$ git grep RealizeResource
core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp:CFX_ByteString
CPDF_PageContentGenerator::RealizeResource(
core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp:  CFX_ByteString name =
RealizeResource(dwObjNum, "XObject");
core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp:  CFX_ByteString name =
RealizeResource(pStream->GetObjNum(), "XObject");
core/fpdfapi/edit/cpdf_pagecontentgenerator.h:  CFX_ByteString
RealizeResource(uint32_t dwResourceObjNum,

   buf << "/" << PDF_NameEncode(name) << " Do Q\n";
 }
 
 void CPDF_PageContentGenerator::TransformContent(CFX_Matrix& matrix) {
   CPDF_Dictionary* pDict = m_pPage->m_pFormDict;
   CPDF_Object* pContent =
       pDict ? pDict->GetDirectObjectFor("Contents") : nullptr;
   if (!pContent)
     return;
 
@@ skipping 23 matching lines @@
       delete pContentArray[i];
     }
     ProcessForm(buf, pBuf, size, matrix);
     FX_Free(pBuf);
     FX_Free(pContentArray);
   } else if (CPDF_Stream* pStream = pContent->AsStream()) {
     CPDF_StreamAcc contentStream;
     contentStream.LoadAllData(pStream);
     ProcessForm(buf, contentStream.GetData(), contentStream.GetSize(), matrix);
   }
-  CPDF_Stream* pStream = new CPDF_Stream;
+  CPDF_Stream* pStream = m_pDocument->NewIndirect<CPDF_Stream>();
   pStream->SetData(buf.GetBuffer(), buf.GetLength());
-  m_pPage->m_pFormDict->SetReferenceFor(
-      "Contents", m_pDocument, m_pDocument->AddIndirectObject(pStream));
+  m_pPage->m_pFormDict->SetReferenceFor("Contents", m_pDocument, pStream);
 }