diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 15:49:49 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 20:17:31 +0000 |
| commit | 0b95042db2e6dab5876abd12ce485fff0a8e08fe (patch) | |
| tree | 02132ed53945fde30bfbf230ff4e9b5308dd7732 /xfa/fxfa/cxfa_fontmgr.h | |
| parent | a5eb9f05b7c3f82630784e043ccf75c4e019b18f (diff) | |
| download | pdfium-0b95042db2e6dab5876abd12ce485fff0a8e08fe.tar.xz | |
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>
Diffstat (limited to 'xfa/fxfa/cxfa_fontmgr.h')
| -rw-r--r-- | xfa/fxfa/cxfa_fontmgr.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fxfa/cxfa_fontmgr.h b/xfa/fxfa/cxfa_fontmgr.h index b7d1f51ff2..55ee6bbc4d 100644 --- a/xfa/fxfa/cxfa_fontmgr.h +++ b/xfa/fxfa/cxfa_fontmgr.h @@ -11,9 +11,9 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/retain_ptr.h" #include "xfa/fgas/font/cfgas_defaultfontmanager.h" #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fgas/font/cfgas_pdffontmgr.h" @@ -26,15 +26,15 @@ class CXFA_FontMgr { CXFA_FontMgr(); ~CXFA_FontMgr(); - CFX_RetainPtr<CFGAS_GEFont> GetFont(CXFA_FFDoc* hDoc, - const WideStringView& wsFontFamily, - uint32_t dwFontStyles, - uint16_t wCodePage = 0xFFFF); + RetainPtr<CFGAS_GEFont> GetFont(CXFA_FFDoc* hDoc, + const WideStringView& wsFontFamily, + uint32_t dwFontStyles, + uint16_t wCodePage = 0xFFFF); void SetDefFontMgr(std::unique_ptr<CFGAS_DefaultFontManager> pFontMgr); private: std::unique_ptr<CFGAS_DefaultFontManager> m_pDefFontMgr; - std::map<ByteString, CFX_RetainPtr<CFGAS_GEFont>> m_FontMap; + std::map<ByteString, RetainPtr<CFGAS_GEFont>> m_FontMap; }; #endif // XFA_FXFA_CXFA_FONTMGR_H_ |