diff options
Diffstat (limited to 'xfa/fgas')
| -rw-r--r-- | xfa/fgas/font/cfgas_gefont.h | 3 | ||||
| -rw-r--r-- | xfa/fgas/layout/cfx_breakpiece.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/xfa/fgas/font/cfgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h index ba2e6e69a5..5fe73bbb40 100644 --- a/xfa/fgas/font/cfgas_gefont.h +++ b/xfa/fgas/font/cfgas_gefont.h @@ -12,6 +12,7 @@ #include <vector> #include "core/fxcrt/cfx_retain_ptr.h" +#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_memory.h" #include "xfa/fgas/font/cfgas_fontmgr.h" @@ -101,7 +102,7 @@ class CFGAS_GEFont : public CFX_Retainable { std::unique_ptr<CFX_UnicodeEncoding> m_pFontEncoding; std::map<wchar_t, int32_t> m_CharWidthMap; std::map<wchar_t, CFX_Rect> m_BBoxMap; - CXFA_PDFFontMgr* m_pProvider; // not owned. + CFX_UnownedPtr<CXFA_PDFFontMgr> m_pProvider; std::vector<CFX_RetainPtr<CFGAS_GEFont>> m_SubstFonts; std::map<wchar_t, CFX_RetainPtr<CFGAS_GEFont>> m_FontMapper; }; diff --git a/xfa/fgas/layout/cfx_breakpiece.h b/xfa/fgas/layout/cfx_breakpiece.h index 1c51b1e42a..807b5f769f 100644 --- a/xfa/fgas/layout/cfx_breakpiece.h +++ b/xfa/fgas/layout/cfx_breakpiece.h @@ -11,6 +11,7 @@ #include "core/fxcrt/cfx_char.h" #include "core/fxcrt/cfx_retain_ptr.h" +#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" #include "xfa/fxfa/app/cxfa_textuserdata.h" @@ -39,7 +40,7 @@ class CFX_BreakPiece { int32_t m_iVerticalScale; uint32_t m_dwIdentity; uint32_t m_dwCharStyles; - std::vector<CFX_Char>* m_pChars; // not owned. + CFX_UnownedPtr<std::vector<CFX_Char>> m_pChars; CFX_RetainPtr<CXFA_TextUserData> m_pUserData; }; |