Index: xfa/fde/fde_gedevice.h |
diff --git a/xfa/fde/fde_gedevice.h b/xfa/fde/fde_gedevice.h |
index cb8e3fa42a72ce0da2f96b01112de90e981e217c..35efab2b2d42e4c22a923561c02e7950798595ce 100644 |
--- a/xfa/fde/fde_gedevice.h |
+++ b/xfa/fde/fde_gedevice.h |
@@ -9,11 +9,11 @@ |
#include "core/fxge/cfx_renderdevice.h" |
#include "xfa/fgas/crt/fgas_memory.h" |
+#include "xfa/fgas/font/cfgas_gefont.h" |
class CFDE_Brush; |
class CFDE_Path; |
class CFDE_Pen; |
-class CFGAS_GEFont; |
class CFX_GraphStateData; |
class CFDE_RenderDevice : public CFX_Target { |
@@ -39,7 +39,7 @@ class CFDE_RenderDevice : public CFX_Target { |
const CFX_Matrix* pImgMatrix = nullptr, |
const CFX_Matrix* pDevMatrix = nullptr); |
bool DrawString(CFDE_Brush* pBrush, |
- CFGAS_GEFont* pFont, |
+ const CFX_RetainPtr<CFGAS_GEFont>& pFont, |
const FXTEXT_CHARPOS* pCharPos, |
int32_t iCount, |
FX_FLOAT fFontSize, |
@@ -100,13 +100,13 @@ class CFDE_RenderDevice : public CFX_Target { |
const CFX_Matrix* pMatrix = nullptr); |
bool DrawSolidString(CFDE_Brush* pBrush, |
- CFGAS_GEFont* pFont, |
+ const CFX_RetainPtr<CFGAS_GEFont>& pFont, |
dsinclair
2017/01/05 17:01:20
Do we expect these draw methods to store the point
Tom Sepez
2017/01/05 17:35:49
It allows us to be unconcerned about what the meth
|
const FXTEXT_CHARPOS* pCharPos, |
int32_t iCount, |
FX_FLOAT fFontSize, |
const CFX_Matrix* pMatrix); |
bool DrawStringPath(CFDE_Brush* pBrush, |
- CFGAS_GEFont* pFont, |
+ const CFX_RetainPtr<CFGAS_GEFont>& pFont, |
const FXTEXT_CHARPOS* pCharPos, |
int32_t iCount, |
FX_FLOAT fFontSize, |