commit c75ce35aa1a75ab3aed909dad553a46719db2f48
author Tom Sepez <tsepez@chromium.org> Mon Apr 08 19:51:32 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Apr 08 19:51:32 2019 +0000
tree ea04089d257cfcc7a72e54bc77b4b573a9561613
parent a78fa0a009090753e87c8cd41db854e333c1adda

Add pdfium::WrapRetain<>() type deducing wrapper

Provide consistency with unique_ptrs. Use it in one spot.

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

core/fxcrt/retain_ptr.h

diff --git a/core/fxcrt/retain_ptr.h b/core/fxcrt/retain_ptr.h
index 02faff6..edd2663 100644
--- a/core/fxcrt/retain_ptr.h
+++ b/core/fxcrt/retain_ptr.h
@@ -130,6 +130,12 @@
   return RetainPtr<T>(new T(std::forward<Args>(args)...));
 }
 
+// Type-deducing wrapper to make a RetainPtr from an ordinary pointer.
+template <typename T>
+RetainPtr<T> WrapRetain(T* that) {
+  return RetainPtr<T>(that);
+}
+
 }  // namespace pdfium
 
 #endif  // CORE_FXCRT_RETAIN_PTR_H_

xfa/fgas/font/cfgas_gefont.cpp

diff --git a/xfa/fgas/font/cfgas_gefont.cpp b/xfa/fgas/font/cfgas_gefont.cpp
index 07f9fce..fb5944d 100644
--- a/xfa/fgas/font/cfgas_gefont.cpp
+++ b/xfa/fgas/font/cfgas_gefont.cpp
@@ -210,7 +210,7 @@
     bool bRecursive) {
   int32_t iGlyphIndex = m_pFontEncoding->GlyphFromCharCode(wUnicode);
   if (iGlyphIndex > 0)
-    return {iGlyphIndex, RetainPtr<CFGAS_GEFont>(this)};
+    return {iGlyphIndex, pdfium::WrapRetain(this)};
 
   const FGAS_FONTUSB* pFontUSB = FGAS_GetUnicodeBitField(wUnicode);
   if (!pFontUSB)
@@ -267,6 +267,6 @@
 RetainPtr<CFGAS_GEFont> CFGAS_GEFont::GetSubstFont(int32_t iGlyphIndex) {
   iGlyphIndex = static_cast<uint32_t>(iGlyphIndex) >> 24;
   if (iGlyphIndex == 0)
-    return RetainPtr<CFGAS_GEFont>(this);
+    return pdfium::WrapRetain(this);
   return m_SubstFonts[iGlyphIndex - 1];
 }