diff options
| author | tsepez <tsepez@chromium.org> | 2017-01-05 12:57:00 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2017-01-05 12:57:00 -0800 |
| commit | e647799f6a2f7f747c9f55d9f0ce08dcdfbd53f4 (patch) | |
| tree | 282c502bd9f807f385d0cbcc1692bb475c8a4df1 /xfa/fxfa/app/xfa_textlayout.h | |
| parent | 6bb3b894488fd6f38c096b708980a9f08286ac5c (diff) | |
| download | pdfium-e647799f6a2f7f747c9f55d9f0ce08dcdfbd53f4.tar.xz | |
Properly ref-count CFGAS_GEFont with CFX_RetainPtr.
We worry about cyclical references, but no leaks found.
Review-Url: https://codereview.chromium.org/2609423003
Diffstat (limited to 'xfa/fxfa/app/xfa_textlayout.h')
| -rw-r--r-- | xfa/fxfa/app/xfa_textlayout.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fxfa/app/xfa_textlayout.h b/xfa/fxfa/app/xfa_textlayout.h index f923c743ed..fa0ca668ca 100644 --- a/xfa/fxfa/app/xfa_textlayout.h +++ b/xfa/fxfa/app/xfa_textlayout.h @@ -92,8 +92,8 @@ class CXFA_TextParser { bool IsSpaceRun(IFDE_CSSComputedStyle* pStyle) const; bool GetTabstops(IFDE_CSSComputedStyle* pStyle, CXFA_TextTabstopsContext* pTabstopContext); - CFGAS_GEFont* GetFont(CXFA_TextProvider* pTextProvider, - IFDE_CSSComputedStyle* pStyle) const; + CFX_RetainPtr<CFGAS_GEFont> GetFont(CXFA_TextProvider* pTextProvider, + IFDE_CSSComputedStyle* pStyle) const; FX_FLOAT GetFontSize(CXFA_TextProvider* pTextProvider, IFDE_CSSComputedStyle* pStyle) const; int32_t GetHorScale(CXFA_TextProvider* pTextProvider, @@ -210,7 +210,7 @@ class XFA_TextPiece : public CFX_Target { int32_t iUnderline; int32_t iPeriod; int32_t iLineThrough; - CFGAS_GEFont* pFont; + CFX_RetainPtr<CFGAS_GEFont> pFont; FX_ARGB dwColor; FX_FLOAT fFontSize; CFX_RectF rtPiece; |