Make CPDF_ColorSpace::Load() return a unique_ptr

core/fpdfapi/fpdf_page/fpdf_page_doc.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_page/pageint.h"
 
 #include <algorithm>
 #include <set>
@@ skipping 58 matching lines @@
       fontData->clear();
     }
   }
 
   for (auto& it : m_ColorSpaceMap) {
     CPDF_CountedColorSpace* csData = it.second;
     if (!csData->get())
       continue;
 
     if (bForceRelease || csData->use_count() < 2) {
-      csData->get()->ReleaseCS();
+      csData->get()->Release();
       csData->reset(nullptr);
     }
   }
 
   for (auto it = m_IccProfileMap.begin(); it != m_IccProfileMap.end();) {
     auto curr_it = it++;
     CPDF_CountedIccProfile* ipData = curr_it->second;
     if (!ipData->get())
       continue;
 
@@ skipping 197 matching lines @@
 
   CPDF_CountedColorSpace* csData = nullptr;
   auto it = m_ColorSpaceMap.find(pCSObj);
   if (it != m_ColorSpaceMap.end()) {
     csData = it->second;
     if (csData->get()) {
       return csData->AddRef();
     }
   }
 
-  CPDF_ColorSpace* pCS = CPDF_ColorSpace::Load(m_pPDFDoc, pArray);
+  std::unique_ptr<CPDF_ColorSpace> pCS =
+      CPDF_ColorSpace::Load(m_pPDFDoc, pArray);
   if (!pCS)
     return nullptr;
 
   if (!csData) {
-    csData = new CPDF_CountedColorSpace(pCS);
+    csData = new CPDF_CountedColorSpace(pCS.release());
     m_ColorSpaceMap[pCSObj] = csData;
   } else {
-    csData->reset(pCS);
+    csData->reset(pCS.release());
   }
   return csData->AddRef();
 }
 
 CPDF_ColorSpace* CPDF_DocPageData::GetCopiedColorSpace(CPDF_Object* pCSObj) {
   if (!pCSObj)
     return nullptr;
 
   auto it = m_ColorSpaceMap.find(pCSObj);
   if (it != m_ColorSpaceMap.end())
@@ skipping 12 matching lines @@
 
   CPDF_CountedColorSpace* pCountedColorSpace = it->second;
   if (!pCountedColorSpace->get())
     return;
 
   pCountedColorSpace->RemoveRef();
   if (pCountedColorSpace->use_count() > 1)
     return;
 
   // We have item only in m_ColorSpaceMap cache. Clean it.
-  pCountedColorSpace->get()->ReleaseCS();
+  pCountedColorSpace->get()->Release();
   pCountedColorSpace->reset(nullptr);
 }
 
 CPDF_Pattern* CPDF_DocPageData::GetPattern(CPDF_Object* pPatternObj,
                                            FX_BOOL bShading,
                                            const CFX_Matrix& matrix) {
   if (!pPatternObj)
     return nullptr;
 
   CPDF_CountedPattern* ptData = nullptr;
@@ skipping 194 matching lines @@
 }
 
 CPDF_CountedPattern* CPDF_DocPageData::FindPatternPtr(
     CPDF_Object* pPatternObj) const {
   if (!pPatternObj)
     return nullptr;
 
   auto it = m_PatternMap.find(pPatternObj);
   return it != m_PatternMap.end() ? it->second : nullptr;
 }