Make CPDF_Font::Create() return a std::unique_ptr.

core/fpdfapi/fpdf_font/fpdf_font.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_font/font_int.h"
 
 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_form.h"
@@ skipping 42 matching lines @@
       pFontDict->Release();
   }
 }
 
 CPDF_Font* CFX_StockFontArray::GetFont(uint32_t index) const {
   if (index >= FX_ArraySize(m_StockFonts))
     return nullptr;
   return m_StockFonts[index].get();
 }
 
-void CFX_StockFontArray::SetFont(uint32_t index, CPDF_Font* font) {
-  if (index >= FX_ArraySize(m_StockFonts))
-    return;
-  m_StockFonts[index].reset(font);
+CPDF_Font* CFX_StockFontArray::SetFont(uint32_t index,
+                                       std::unique_ptr<CPDF_Font> pFont) {
+  CPDF_Font* result = pFont.get();
+  if (index < FX_ArraySize(m_StockFonts))
+    m_StockFonts[index] = std::move(pFont);
+  return result;
 }
 
 CPDF_FontGlobals::CPDF_FontGlobals() {
   FXSYS_memset(m_EmbeddedCharsets, 0, sizeof(m_EmbeddedCharsets));
   FXSYS_memset(m_EmbeddedToUnicodes, 0, sizeof(m_EmbeddedToUnicodes));
 }
 
 CPDF_FontGlobals::~CPDF_FontGlobals() {}
 
 CPDF_Font* CPDF_FontGlobals::Find(CPDF_Document* pDoc, uint32_t index) {
   auto it = m_StockMap.find(pDoc);
   if (it == m_StockMap.end())
     return nullptr;
   return it->second ? it->second->GetFont(index) : nullptr;
 }
 
-void CPDF_FontGlobals::Set(CPDF_Document* pDoc,
-                           uint32_t index,
-                           CPDF_Font* pFont) {
+CPDF_Font* CPDF_FontGlobals::Set(CPDF_Document* pDoc,
+                                 uint32_t index,
+                                 std::unique_ptr<CPDF_Font> pFont) {
   if (!pdfium::ContainsKey(m_StockMap, pDoc))
     m_StockMap[pDoc].reset(new CFX_StockFontArray);
-  m_StockMap[pDoc]->SetFont(index, pFont);
+  return m_StockMap[pDoc]->SetFont(index, std::move(pFont));
 }
 
 void CPDF_FontGlobals::Clear(CPDF_Document* pDoc) {
   m_StockMap.erase(pDoc);
 }
 
 CFX_WideString CPDF_ToUnicodeMap::Lookup(uint32_t charcode) const {
   auto it = m_Map.find(charcode);
   if (it != m_Map.end()) {
     uint32_t value = it->second;
@@ skipping 197 matching lines @@
   }
   if (cid_set) {
     m_pBaseMap = CPDF_ModuleMgr::Get()
                      ->GetPageModule()
                      ->GetFontGlobals()
                      ->m_CMapManager.GetCID2UnicodeMap(cid_set, FALSE);
   } else {
     m_pBaseMap = nullptr;
   }
 }