Revert "Update CPDF_IndirectObjectHolder APIs for unique objects."

fpdfsdk/fpdf_flatten.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 "public/fpdf_flatten.h"
 
 #include <algorithm>
 
@@ skipping 168 matching lines @@
   rcRet.left = GetMinMaxValue(*pRectArray, MIN, LEFT);
   rcRet.top = GetMinMaxValue(*pRectArray, MAX, TOP);
   rcRet.right = GetMinMaxValue(*pRectArray, MAX, RIGHT);
   rcRet.bottom = GetMinMaxValue(*pRectArray, MIN, BOTTOM);
 
   return rcRet;
 }
 
 uint32_t NewIndirectContentsStream(const CFX_ByteString& key,
                                    CPDF_Document* pDocument) {
-  CPDF_Stream* pNewContents = pDocument->AddIndirectStream(
+  CPDF_Stream* pNewContents = new CPDF_Stream(
       nullptr, 0, new CPDF_Dictionary(pDocument->GetByteStringPool()));
   CFX_ByteString sStream;
   sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());
   pNewContents->SetData(sStream.raw_str(), sStream.GetLength());
-  return pNewContents->GetObjNum();
+  return pDocument->AddIndirectObject(pNewContents);
 }
 
 void SetPageContents(const CFX_ByteString& key,
                      CPDF_Dictionary* pPage,
                      CPDF_Document* pDocument) {
   CPDF_Array* pContentsArray = nullptr;
   CPDF_Stream* pContentsStream = pPage->GetStreamFor("Contents");
   if (!pContentsStream) {
     pContentsArray = pPage->GetArrayFor("Contents");
     if (!pContentsArray) {
       if (!key.IsEmpty()) {
         pPage->SetReferenceFor("Contents", pDocument,
                                NewIndirectContentsStream(key, pDocument));
       }
       return;
     }
   }
   pPage->ConvertToIndirectObjectFor("Contents", pDocument);
   if (!pContentsArray) {
-    pContentsArray = pDocument->AddIndirectArray();
+    pContentsArray = new CPDF_Array;
     CPDF_StreamAcc acc;
     acc.LoadAllData(pContentsStream);
     CFX_ByteString sStream = "q\n";
-    CFX_ByteString sBody = CFX_ByteString(acc.GetData(), acc.GetSize());
+    CFX_ByteString sBody =
+        CFX_ByteString((const FX_CHAR*)acc.GetData(), acc.GetSize());
     sStream = sStream + sBody + "\nQ";
     pContentsStream->SetData(sStream.raw_str(), sStream.GetLength());
     pContentsArray->AddReference(pDocument, pContentsStream->GetObjNum());
-    pPage->SetReferenceFor("Contents", pDocument, pContentsArray);
+    pPage->SetReferenceFor("Contents", pDocument,
+                           pDocument->AddIndirectObject(pContentsArray));
   }
   if (!key.IsEmpty()) {
     pContentsArray->AddReference(pDocument,
                                  NewIndirectContentsStream(key, pDocument));
   }
 }
 
 CFX_Matrix GetMatrix(CFX_FloatRect rcAnnot,
                      CFX_FloatRect rcStream,
                      const CFX_Matrix& matrix) {
@@ skipping 76 matching lines @@
     pCropBox->Add(new CPDF_Number(rcOriginalCB.top));
     pPageDict->SetFor("ArtBox", pCropBox);
   }
 
   CPDF_Dictionary* pRes = pPageDict->GetDictFor("Resources");
   if (!pRes) {
     pRes = new CPDF_Dictionary(pDocument->GetByteStringPool());
     pPageDict->SetFor("Resources", pRes);
   }
 
-  CPDF_Stream* pNewXObject = pDocument->AddIndirectStream(
+  CPDF_Stream* pNewXObject = new CPDF_Stream(
       nullptr, 0, new CPDF_Dictionary(pDocument->GetByteStringPool()));
 
-  uint32_t dwObjNum = pNewXObject->GetObjNum();
+  uint32_t dwObjNum = pDocument->AddIndirectObject(pNewXObject);
   CPDF_Dictionary* pPageXObject = pRes->GetDictFor("XObject");
   if (!pPageXObject) {
     pPageXObject = new CPDF_Dictionary(pDocument->GetByteStringPool());
     pRes->SetFor("XObject", pPageXObject);
   }
 
   CFX_ByteString key = "";
   int nStreams = pdfium::CollectionSize<int>(ObjectArray);
 
   if (nStreams > 0) {
@@ skipping 84 matching lines @@
     }
 
     CPDF_Dictionary* pXObject = pNewXORes->GetDictFor("XObject");
     if (!pXObject) {
       pXObject = new CPDF_Dictionary(pDocument->GetByteStringPool());
       pNewXORes->SetFor("XObject", pXObject);
     }
 
     CFX_ByteString sFormName;
     sFormName.Format("F%d", i);
-
-    // TODO(tsepez): check |pObj| ownership.
     pXObject->SetReferenceFor(sFormName, pDocument,
-                              pDocument->AddIndirectObject(UniqueObject(pObj)));
+                              pDocument->AddIndirectObject(pObj));
 
     CPDF_StreamAcc acc;
     acc.LoadAllData(pNewXObject);
 
     const uint8_t* pData = acc.GetData();
     CFX_ByteString sStream(pData, acc.GetSize());
 
     if (matrix.IsIdentity()) {
       matrix.a = 1.0f;
       matrix.b = 0.0f;
       matrix.c = 0.0f;
       matrix.d = 1.0f;
       matrix.e = 0.0f;
       matrix.f = 0.0f;
     }
 
     CFX_ByteString sTemp;
     CFX_Matrix m = GetMatrix(rcAnnot, rcStream, matrix);
     sTemp.Format("q %f 0 0 %f %f %f cm /%s Do Q\n", m.a, m.d, m.e, m.f,
                  sFormName.c_str());
     sStream += sTemp;
     pNewXObject->SetData(sStream.raw_str(), sStream.GetLength());
   }
   pPageDict->RemoveFor("Annots");
 
   RectArray.RemoveAll();
   return FLATTEN_SUCCESS;
 }