Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1825)

Unified Diff: xfa/fxfa/app/xfa_fwltheme.h

Issue 2609423003: Properly ref-count CFGAS_GEFont with CFX_RetainPtr. (Closed)
Patch Set: comments Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: xfa/fxfa/app/xfa_fwltheme.h
diff --git a/xfa/fxfa/app/xfa_fwltheme.h b/xfa/fxfa/app/xfa_fwltheme.h
index f8b804893a82fc865f1e81770968ec5e91b89230..a8efad0ccff82df64d2a3a8398a1f900b9d1d9d1 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;

Powered by Google App Engine
This is Rietveld 408576698