Use smart pointers for class owned pointers

xfa/fgas/font/fgas_gefont.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 "xfa/fgas/font/fgas_gefont.h"
 
 #include "xfa/fgas/crt/fgas_codepage.h"
 #include "xfa/fgas/font/fgas_fontutils.h"
@@ skipping 59 matching lines @@
 CFGAS_GEFont::CFGAS_GEFont(IFGAS_FontMgr* pFontMgr)
     :
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
       m_bUseLogFontStyle(FALSE),
       m_dwLogFontStyle(0),
 #endif
       m_pFont(nullptr),
       m_pFontMgr(pFontMgr),
       m_iRefCount(1),
       m_bExtFont(FALSE),
-      m_pStream(nullptr),
-      m_pFileRead(nullptr),
-      m_pFontEncoding(nullptr),
-      m_pCharWidthMap(nullptr),
-      m_pRectArray(nullptr),
-      m_pBBoxMap(nullptr),
       m_pProvider(nullptr) {
 }
 
 CFGAS_GEFont::CFGAS_GEFont(const CFGAS_GEFont& src, uint32_t dwFontStyles)
     :
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
       m_bUseLogFontStyle(FALSE),
       m_dwLogFontStyle(0),
 #endif
       m_pFont(nullptr),
       m_pFontMgr(src.m_pFontMgr),
       m_iRefCount(1),
       m_bExtFont(FALSE),
-      m_pStream(nullptr),
-      m_pFileRead(nullptr),
-      m_pFontEncoding(nullptr),
-      m_pCharWidthMap(nullptr),
-      m_pRectArray(nullptr),
-      m_pBBoxMap(nullptr),
       m_pProvider(nullptr) {
   ASSERT(src.m_pFont);
   m_pFont = new CFX_Font;
   m_pFont->LoadClone(src.m_pFont);
   CFX_SubstFont* pSubst = m_pFont->GetSubstFont();
   if (!pSubst) {
     pSubst = new CFX_SubstFont;
     m_pFont->SetSubstFont(std::unique_ptr<CFX_SubstFont>(pSubst));
   }
   pSubst->m_Weight =
       (dwFontStyles & FX_FONTSTYLE_Bold) ? FXFONT_FW_BOLD : FXFONT_FW_NORMAL;
   if (dwFontStyles & FX_FONTSTYLE_Italic) {
     pSubst->m_SubstFlags |= FXFONT_SUBST_ITALIC;
   }
   InitFont();
 }
 
 CFGAS_GEFont::~CFGAS_GEFont() {
   for (int32_t i = 0; i < m_SubstFonts.GetSize(); i++)
     m_SubstFonts[i]->Release();
 
   m_SubstFonts.RemoveAll();
   m_FontMapper.clear();
-  if (m_pFileRead)
-    m_pFileRead->Release();
 
-  if (m_pStream)
-    m_pStream->Release();
-
-  delete m_pFontEncoding;
-  delete m_pCharWidthMap;
-  delete m_pRectArray;
-  delete m_pBBoxMap;
   if (!m_bExtFont)
     delete m_pFont;
 }
 
 void CFGAS_GEFont::Release() {
   if (--m_iRefCount < 1) {
     if (m_pFontMgr) {
       m_pFontMgr->RemoveFont(this);
     }
     delete this;
@@ skipping 58 matching lines @@
     return FALSE;
 
   m_pFont = new CFX_Font;
   if (!m_pFont->LoadEmbedded(pBuffer, length))
     return FALSE;
   return InitFont();
 }
 
 FX_BOOL CFGAS_GEFont::LoadFontInternal(IFX_Stream* pFontStream,
                                        FX_BOOL bSaveStream) {
-  if (m_pFont || m_pFileRead || !pFontStream || pFontStream->GetLength() < 1) {
+  if (m_pFont || m_pFileRead || !pFontStream || pFontStream->GetLength() < 1)
+    return FALSE;
+  if (bSaveStream)
+    m_pStream.reset(pFontStream);
+
+  m_pFileRead.reset(FX_CreateFileRead(pFontStream, FALSE));
+  m_pFont = new CFX_Font;
+  if (m_pFont->LoadFile(m_pFileRead.get())) {
+    return InitFont();
+  } else {

[Lei Zhang, 2016/08/04 18:49:31]

no else after return

[Wei Li, 2016/08/04 22:16:04]

Done.

+    m_pFileRead.reset();
     return FALSE;
   }
-  if (bSaveStream) {
-    m_pStream = pFontStream;
-  }
-  m_pFileRead = FX_CreateFileRead(pFontStream, FALSE);
-  m_pFont = new CFX_Font;
-  FX_BOOL bRet = m_pFont->LoadFile(m_pFileRead);
-  if (bRet) {
-    bRet = InitFont();
-  } else {
-    m_pFileRead->Release();
-    m_pFileRead = nullptr;
-  }
-  return bRet;
 }
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 
 FX_BOOL CFGAS_GEFont::LoadFontInternal(CFX_Font* pExtFont) {
   if (m_pFont || !pExtFont) {
     return FALSE;
   }
   m_pFont = pExtFont;
   m_bExtFont = TRUE;
   return InitFont();
 }
 
 FX_BOOL CFGAS_GEFont::InitFont() {
   if (!m_pFont)
     return FALSE;
   if (!m_pFontEncoding) {
-    m_pFontEncoding = FX_CreateFontEncodingEx(m_pFont);
+    m_pFontEncoding.reset(FX_CreateFontEncodingEx(m_pFont));
     if (!m_pFontEncoding)
       return FALSE;
   }
   if (!m_pCharWidthMap)
-    m_pCharWidthMap = new CFX_DiscreteArrayTemplate<uint16_t>(1024);
+    m_pCharWidthMap.reset(new CFX_DiscreteArrayTemplate<uint16_t>(1024));
   if (!m_pRectArray)
-    m_pRectArray = new CFX_MassArrayTemplate<CFX_Rect>(16);
+    m_pRectArray.reset(new CFX_MassArrayTemplate<CFX_Rect>(16));
   if (!m_pBBoxMap)
-    m_pBBoxMap = new CFX_MapPtrToPtr(16);
+    m_pBBoxMap.reset(new CFX_MapPtrToPtr(16));
 
   return TRUE;
 }
 
 CFGAS_GEFont* CFGAS_GEFont::Derive(uint32_t dwFontStyles, uint16_t wCodePage) {
   if (GetFontStyles() == dwFontStyles)
     return Retain();
   return new CFGAS_GEFont(*this, dwFontStyles);
 }
 
@@ skipping 206 matching lines @@
   }
   if (m_pRectArray) {
     m_pRectArray->RemoveAll(FALSE);
   }
 }
 CFGAS_GEFont* CFGAS_GEFont::GetSubstFont(int32_t iGlyphIndex) const {
   iGlyphIndex = ((uint32_t)iGlyphIndex) >> 24;
   return iGlyphIndex == 0 ? const_cast<CFGAS_GEFont*>(this)
                           : m_SubstFonts[iGlyphIndex - 1];
 }