commit 2393614002f553e78fb4bde58c77e5eec0c272ce
author Lei Zhang <thestig@chromium.org> Tue Mar 29 00:23:30 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 29 00:23:30 2022 +0000
tree cad12302c74a195bae992ca663a07b43d5d3ff3b
parent 88f2dd4384d5ac887f049d7d8d6f0d68cd12d73e

Add ScopedFontDeleter for use within CFX_FontMapper.

No need to manually call DeleteFont().

Change-Id: I789e247bdebf483b791f295b135fa4ecf60073f0
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/91950
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxge/cfx_fontmapper.cpp

diff --git a/core/fxge/cfx_fontmapper.cpp b/core/fxge/cfx_fontmapper.cpp
index 47ccf52..b85031c 100644
--- a/core/fxge/cfx_fontmapper.cpp
+++ b/core/fxge/cfx_fontmapper.cpp
@@ -15,6 +15,7 @@
 #include "build/build_config.h"
 #include "core/fxcrt/fx_codepage.h"
 #include "core/fxcrt/fx_extension.h"
+#include "core/fxcrt/fx_memory.h"
 #include "core/fxcrt/fx_memory_wrappers.h"
 #include "core/fxcrt/stl_util.h"
 #include "core/fxge/cfx_fontmgr.h"
@@ -270,6 +271,19 @@
   }
 }
 
+class ScopedFontDeleter {
+ public:
+  FX_STACK_ALLOCATED();
+
+  ScopedFontDeleter(SystemFontInfoIface* font_info, void* font)
+      : font_info_(font_info), font_(font) {}
+  ~ScopedFontDeleter() { font_info_->DeleteFont(font_); }
+
+ private:
+  UnownedPtr<SystemFontInfoIface> const font_info_;
+  void* const font_;
+};
+
 }  // namespace
 
 CFX_FontMapper::CFX_FontMapper(CFX_FontMgr* mgr) : m_pFontMgr(mgr) {}
@@ -332,10 +346,10 @@
         return;
     }
 
+    ScopedFontDeleter scoped_font(m_pFontInfo.get(), hFont);
     ByteString new_name = GetPSNameFromTT(hFont);
     if (!new_name.IsEmpty())
       m_LocalizedTTFonts.push_back(std::make_pair(new_name, name));
-    m_pFontInfo->DeleteFont(hFont);
   }
   m_InstalledTTFonts.push_back(name);
   m_LastFamily = name;
@@ -637,24 +651,23 @@
   if (!hFont)
     return nullptr;
 
+  ScopedFontDeleter scoped_font(m_pFontInfo.get(), hFont);
   m_pFontInfo->GetFaceName(hFont, &SubstName);
   if (Charset == FX_Charset::kDefault)
     m_pFontInfo->GetFontCharset(hFont, &Charset);
   size_t ttc_size = m_pFontInfo->GetFontData(hFont, kTableTTCF, {});
   size_t font_size = m_pFontInfo->GetFontData(hFont, 0, {});
-  if (font_size == 0 && ttc_size == 0) {
-    m_pFontInfo->DeleteFont(hFont);
+  if (font_size == 0 && ttc_size == 0)
     return nullptr;
-  }
+
   RetainPtr<CFX_Face> face;
   if (ttc_size)
     face = GetCachedTTCFace(hFont, ttc_size, font_size);
   else
     face = GetCachedFace(hFont, SubstName, weight, bItalic, font_size);
-  if (!face) {
-    m_pFontInfo->DeleteFont(hFont);
+  if (!face)
     return nullptr;
-  }
+
   pSubstFont->m_Family = SubstName;
   pSubstFont->m_Charset = Charset;
   bool bNeedUpdateWeight = false;
@@ -671,7 +684,6 @@
       italic_angle = 0;
     pSubstFont->m_ItalicAngle = italic_angle;
   }
-  m_pFontInfo->DeleteFont(hFont);
   return face;
 }