From f0799fe84df4d86f25d342b03525f3016d674f86 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 28 Mar 2017 09:31:32 -0700 Subject: Revert "Revert "Refcount all CFX_DIBSources (and subclasses) all the time."" This reverts commit 31b08d4cdaa17d7a03f35e087096a77036af98ec. Re-landing the patch after fixing skia build issue. Change-Id: Ie7039890088b803a6ec5ce365d70f57277459b48 Reviewed-on: https://pdfium-review.googlesource.com/3245 Commit-Queue: Tom Sepez Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fxge/fx_font.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'core/fxge/fx_font.h') diff --git a/core/fxge/fx_font.h b/core/fxge/fx_font.h index 79957ef506..880b6751e8 100644 --- a/core/fxge/fx_font.h +++ b/core/fxge/fx_font.h @@ -222,11 +222,19 @@ class CFX_FontFaceInfo { class CFX_GlyphBitmap { public: + CFX_GlyphBitmap(); + ~CFX_GlyphBitmap(); + int m_Top; int m_Left; - CFX_DIBitmap m_Bitmap; + CFX_RetainPtr m_pBitmap; }; +inline CFX_GlyphBitmap::CFX_GlyphBitmap() + : m_pBitmap(pdfium::MakeRetain()) {} + +inline CFX_GlyphBitmap::~CFX_GlyphBitmap() {} + class FXTEXT_GLYPHPOS { public: FXTEXT_GLYPHPOS(); -- cgit v1.2.3