diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 16:53:58 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 21:25:26 +0000 |
| commit | aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d (patch) | |
| tree | 1e14d60adcffeb0791a0a6c8792d3e9c0109384e /xfa/fgas | |
| parent | 8e9e3d8975eeea3429c3b3ea703f04ac34e20e28 (diff) | |
| download | pdfium-aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d.tar.xz | |
Move CFX_UnownedPtr to UnownedPtr
This CL moves CFX_UnownedPtr to UnownedPtr and places in the fxcrt
namespace.
Bug: pdfium:898
Change-Id: I6d1fa463f365e5cb3aafa8c8a7a5f7eff62ed8e0
Reviewed-on: https://pdfium-review.googlesource.com/14620
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fgas')
| -rw-r--r-- | xfa/fgas/font/cfgas_gefont.h | 2 | ||||
| -rw-r--r-- | xfa/fgas/font/cfgas_pdffontmgr.h | 4 | ||||
| -rw-r--r-- | xfa/fgas/layout/cfx_breakpiece.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fgas/font/cfgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h index f88f8b4cd9..9df9ea842d 100644 --- a/xfa/fgas/font/cfgas_gefont.h +++ b/xfa/fgas/font/cfgas_gefont.h @@ -11,9 +11,9 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_memory.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fgas/font/cfgas_pdffontmgr.h" diff --git a/xfa/fgas/font/cfgas_pdffontmgr.h b/xfa/fgas/font/cfgas_pdffontmgr.h index 1f7d49a4e7..410aa009b0 100644 --- a/xfa/fgas/font/cfgas_pdffontmgr.h +++ b/xfa/fgas/font/cfgas_pdffontmgr.h @@ -50,8 +50,8 @@ class CFGAS_PDFFontMgr : public Observable<CFGAS_PDFFontMgr> { const ByteString& bsDRFontName, bool bStrictMatch); - CFX_UnownedPtr<CPDF_Document> const m_pDoc; - CFX_UnownedPtr<CFGAS_FontMgr> const m_pFontMgr; + UnownedPtr<CPDF_Document> const m_pDoc; + UnownedPtr<CFGAS_FontMgr> const m_pFontMgr; std::map<RetainPtr<CFGAS_GEFont>, CPDF_Font*> m_FDE2PDFFont; std::map<ByteString, RetainPtr<CFGAS_GEFont>> m_FontMap; }; diff --git a/xfa/fgas/layout/cfx_breakpiece.h b/xfa/fgas/layout/cfx_breakpiece.h index 1109e2296b..5dbc0e7722 100644 --- a/xfa/fgas/layout/cfx_breakpiece.h +++ b/xfa/fgas/layout/cfx_breakpiece.h @@ -10,9 +10,9 @@ #include <vector> #include "core/fxcrt/cfx_char.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "xfa/fxfa/cxfa_textuserdata.h" class CFX_BreakPiece { @@ -40,7 +40,7 @@ class CFX_BreakPiece { int32_t m_iVerticalScale; uint32_t m_dwIdentity; uint32_t m_dwCharStyles; - CFX_UnownedPtr<std::vector<CFX_Char>> m_pChars; + UnownedPtr<std::vector<CFX_Char>> m_pChars; RetainPtr<CXFA_TextUserData> m_pUserData; }; |