From 0b95042db2e6dab5876abd12ce485fff0a8e08fe Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Thu, 21 Sep 2017 15:49:49 -0400
Subject: Rename CFX_RetainPtr to RetainPtr

This CL renames CFX_RetainPtr to RetainPtr and places in the fxcrt
namespace.

Bug: pdfium:898
Change-Id: I8798a9f79cb0840d3f037e8d04937cedd742914e
Reviewed-on: https://pdfium-review.googlesource.com/14616
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
---
 xfa/fgas/font/cfgas_pdffontmgr.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'xfa/fgas/font/cfgas_pdffontmgr.h')

diff --git a/xfa/fgas/font/cfgas_pdffontmgr.h b/xfa/fgas/font/cfgas_pdffontmgr.h
index a31d865cec..1f7d49a4e7 100644
--- a/xfa/fgas/font/cfgas_pdffontmgr.h
+++ b/xfa/fgas/font/cfgas_pdffontmgr.h
@@ -11,9 +11,9 @@
 
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
 #include "core/fpdfapi/parser/cpdf_document.h"
-#include "core/fxcrt/cfx_retain_ptr.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/observable.h"
+#include "core/fxcrt/retain_ptr.h"
 
 class CFGAS_FontMgr;
 class CFGAS_GEFont;
@@ -25,22 +25,22 @@ class CFGAS_PDFFontMgr : public Observable<CFGAS_PDFFontMgr> {
   explicit CFGAS_PDFFontMgr(CPDF_Document* pDoc, CFGAS_FontMgr* pFontMgr);
   ~CFGAS_PDFFontMgr();
 
-  CFX_RetainPtr<CFGAS_GEFont> GetFont(const WideStringView& wsFontFamily,
-                                      uint32_t dwFontStyles,
-                                      CPDF_Font** pPDFFont,
-                                      bool bStrictMatch);
-  bool GetCharWidth(const CFX_RetainPtr<CFGAS_GEFont>& pFont,
+  RetainPtr<CFGAS_GEFont> GetFont(const WideStringView& wsFontFamily,
+                                  uint32_t dwFontStyles,
+                                  CPDF_Font** pPDFFont,
+                                  bool bStrictMatch);
+  bool GetCharWidth(const RetainPtr<CFGAS_GEFont>& pFont,
                     wchar_t wUnicode,
                     bool bCharCode,
                     int32_t* pWidth);
-  void SetFont(const CFX_RetainPtr<CFGAS_GEFont>& pFont, CPDF_Font* pPDFFont);
+  void SetFont(const RetainPtr<CFGAS_GEFont>& pFont, CPDF_Font* pPDFFont);
 
  private:
-  CFX_RetainPtr<CFGAS_GEFont> FindFont(const ByteString& strFamilyName,
-                                       bool bBold,
-                                       bool bItalic,
-                                       CPDF_Font** pPDFFont,
-                                       bool bStrictMatch);
+  RetainPtr<CFGAS_GEFont> FindFont(const ByteString& strFamilyName,
+                                   bool bBold,
+                                   bool bItalic,
+                                   CPDF_Font** pPDFFont,
+                                   bool bStrictMatch);
   ByteString PsNameToFontName(const ByteString& strPsName,
                               bool bBold,
                               bool bItalic);
@@ -52,8 +52,8 @@ class CFGAS_PDFFontMgr : public Observable<CFGAS_PDFFontMgr> {
 
   CFX_UnownedPtr<CPDF_Document> const m_pDoc;
   CFX_UnownedPtr<CFGAS_FontMgr> const m_pFontMgr;
-  std::map<CFX_RetainPtr<CFGAS_GEFont>, CPDF_Font*> m_FDE2PDFFont;
-  std::map<ByteString, CFX_RetainPtr<CFGAS_GEFont>> m_FontMap;
+  std::map<RetainPtr<CFGAS_GEFont>, CPDF_Font*> m_FDE2PDFFont;
+  std::map<ByteString, RetainPtr<CFGAS_GEFont>> m_FontMap;
 };
 
 #endif  // XFA_FGAS_FONT_CFGAS_PDFFONTMGR_H_
-- 
cgit v1.2.3