Make CPDF_Font::Create() return a std::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 127 matching lines @@
   if (it != m_FontMap.end()) {
     pFontData = it->second;
     if (pFontData->get()) {
       return pFontData->AddRef();
     }
   }
 
   if (findOnly)
     return nullptr;
 
-  CPDF_Font* pFont = CPDF_Font::CreateFontF(m_pPDFDoc, pFontDict);
+  std::unique_ptr<CPDF_Font> pFont = CPDF_Font::Create(m_pPDFDoc, pFontDict);
   if (!pFont)
     return nullptr;
 
   if (pFontData) {
-    pFontData->reset(pFont);
+    pFontData->reset(pFont.release());

[Tom Sepez, 2016/09/22 21:08:04]

note: these become std::move() down the road.

   } else {
-    pFontData = new CPDF_CountedFont(pFont);
+    pFontData = new CPDF_CountedFont(pFont.release());
     m_FontMap[pFontDict] = pFontData;
   }
   return pFontData->AddRef();
 }
 
 CPDF_Font* CPDF_DocPageData::GetStandardFont(const CFX_ByteString& fontName,
                                              CPDF_FontEncoding* pEncoding) {
   if (fontName.IsEmpty())
     return nullptr;
 
@@ skipping 19 matching lines @@
   }
 
   CPDF_Dictionary* pDict = new CPDF_Dictionary;
   pDict->SetNameFor("Type", "Font");
   pDict->SetNameFor("Subtype", "Type1");
   pDict->SetNameFor("BaseFont", fontName);
   if (pEncoding) {
     pDict->SetFor("Encoding", pEncoding->Realize());
   }
   m_pPDFDoc->AddIndirectObject(pDict);
-  CPDF_Font* pFont = CPDF_Font::CreateFontF(m_pPDFDoc, pDict);
-  if (!pFont) {
+  std::unique_ptr<CPDF_Font> pFont = CPDF_Font::Create(m_pPDFDoc, pDict);
+  if (!pFont)
     return nullptr;
-  }
-  CPDF_CountedFont* fontData = new CPDF_CountedFont(pFont);
+
+  CPDF_CountedFont* fontData = new CPDF_CountedFont(pFont.release());
   m_FontMap[pDict] = fontData;
   return fontData->AddRef();
 }
 
 void CPDF_DocPageData::ReleaseFont(const CPDF_Dictionary* pFontDict) {
   if (!pFontDict)
     return;
 
   auto it = m_FontMap.find(pFontDict);
   if (it == m_FontMap.end())
@@ skipping 333 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;
 }