| Index: xfa/fxfa/app/xfa_textlayout.h
|
| diff --git a/xfa/fxfa/app/xfa_textlayout.h b/xfa/fxfa/app/xfa_textlayout.h
|
| index 30399a62178d14e2564ee02768e37f828c6b4c66..edb6c5e65341ee1c0c5d100a58c8578d5e73d7af 100644
|
| --- a/xfa/fxfa/app/xfa_textlayout.h
|
| +++ b/xfa/fxfa/app/xfa_textlayout.h
|
| @@ -95,8 +95,8 @@ class CXFA_TextParser {
|
| FX_BOOL IsSpaceRun(IFDE_CSSComputedStyle* pStyle) const;
|
| FX_BOOL GetTabstops(IFDE_CSSComputedStyle* pStyle,
|
| CXFA_TextTabstopsContext* pTabstopContext);
|
| - IFX_Font* GetFont(CXFA_TextProvider* pTextProvider,
|
| - IFDE_CSSComputedStyle* pStyle) const;
|
| + CFX_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,
|
| @@ -259,7 +259,7 @@ class XFA_TextPiece : public CFX_Target {
|
| int32_t iUnderline;
|
| int32_t iPeriod;
|
| int32_t iLineThrough;
|
| - IFX_Font* pFont;
|
| + CFX_GEFont* pFont;
|
| FX_ARGB dwColor;
|
| FX_FLOAT fFontSize;
|
| CFX_RectF rtPiece;
|
|
|