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_fwltheme.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_fwltheme.h')
| -rw-r--r-- | xfa/fxfa/app/xfa_fwltheme.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xfa/fxfa/app/xfa_fwltheme.h b/xfa/fxfa/app/xfa_fwltheme.h index f8b804893a..a8efad0ccf 100644 --- a/xfa/fxfa/app/xfa_fwltheme.h +++ b/xfa/fxfa/app/xfa_fwltheme.h @@ -37,7 +37,8 @@ class CXFA_FWLTheme final : public IFWL_ThemeProvider { float GetCYBorderSize() const override; CFX_RectF GetUIMargin(CFWL_ThemePart* pThemePart) const override; float GetFontSize(CFWL_ThemePart* pThemePart) const override; - CFGAS_GEFont* GetFont(CFWL_ThemePart* pThemePart) const override; + CFX_RetainPtr<CFGAS_GEFont> GetFont( + CFWL_ThemePart* pThemePart) const override; float GetLineHeight(CFWL_ThemePart* pThemePart) const override; float GetScrollBarWidth() const override; FX_COLORREF GetTextColor(CFWL_ThemePart* pThemePart) const override; @@ -58,7 +59,7 @@ class CXFA_FWLTheme final : public IFWL_ThemeProvider { std::unique_ptr<CFWL_CaretTP> m_pCaretTP; std::unique_ptr<CFWL_BarcodeTP> m_pBarcodeTP; std::unique_ptr<CFDE_TextOut> m_pTextOut; - CFGAS_GEFont* m_pCalendarFont; + CFX_RetainPtr<CFGAS_GEFont> m_pCalendarFont; CFX_WideString m_wsResource; CXFA_FFApp* const m_pApp; CFX_RectF m_Rect; |