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

Unified Diff: xfa/fwl/theme/cfwl_widgettp.h

Issue 2037563002: Replace IFGAS_Font with underlying concrete type (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: rebase Created 4 years, 6 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
« no previous file with comments | « xfa/fwl/basewidget/fwl_editimp.cpp ('k') | xfa/fwl/theme/cfwl_widgettp.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fwl/theme/cfwl_widgettp.h
diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h
index 971b6f09b140438b85b4ffa52619ff110a14cfb1..20be62619e699a7e60847f4f7965ad6e0d3a0ecd 100644
--- a/xfa/fwl/theme/cfwl_widgettp.h
+++ b/xfa/fwl/theme/cfwl_widgettp.h
@@ -91,14 +91,14 @@ enum class CFWL_WidgetCapacity {
Width
};
-class IFWL_Widget;
class CFDE_TextOut;
-class IFGAS_Font;
-class IFGAS_FontMgr;
+class CFGAS_GEFont;
class CFWL_ArrowData;
class CFWL_ThemeBackground;
class CFWL_ThemePart;
class CFWL_ThemeText;
+class IFGAS_FontMgr;
+class IFWL_Widget;
#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
class CFX_FontSourceEnum_File;
@@ -135,10 +135,10 @@ class CFWL_WidgetTP {
FX_FLOAT fFontSize,
FX_ARGB rgbFont);
FWL_Error SetFont(IFWL_Widget* pWidget,
- IFGAS_Font* pFont,
+ CFGAS_GEFont* pFont,
FX_FLOAT fFontSize,
FX_ARGB rgbFont);
- IFGAS_Font* GetFont(IFWL_Widget* pWidget);
+ CFGAS_GEFont* GetFont(IFWL_Widget* pWidget);
protected:
CFWL_WidgetTP();
@@ -221,7 +221,7 @@ class CFWL_WidgetTP {
CFX_Matrix* pMatrix = NULL);
uint32_t m_dwRefCount;
std::unique_ptr<CFDE_TextOut> m_pTextOut;
- IFGAS_Font* m_pFDEFont;
+ CFGAS_GEFont* m_pFDEFont;
FX_FLOAT m_fValue;
uint32_t m_dwValue;
CFX_RectF m_rtMargin;
@@ -264,13 +264,13 @@ class CFWL_FontData {
FX_BOOL LoadFont(const CFX_WideStringC& wsFontFamily,
uint32_t dwFontStyles,
uint16_t wCodePage);
- IFGAS_Font* GetFont() const { return m_pFont; }
+ CFGAS_GEFont* GetFont() const { return m_pFont; }
protected:
CFX_WideString m_wsFamily;
uint32_t m_dwStyles;
uint32_t m_dwCodePage;
- IFGAS_Font* m_pFont;
+ CFGAS_GEFont* m_pFont;
IFGAS_FontMgr* m_pFontMgr;
#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
CFX_FontSourceEnum_File* m_pFontSource;
@@ -282,9 +282,9 @@ class CFWL_FontManager {
static CFWL_FontManager* GetInstance();
static void DestroyInstance();
- IFGAS_Font* FindFont(const CFX_WideStringC& wsFontFamily,
- uint32_t dwFontStyles,
- uint16_t dwCodePage);
+ CFGAS_GEFont* FindFont(const CFX_WideStringC& wsFontFamily,
+ uint32_t dwFontStyles,
+ uint16_t dwCodePage);
protected:
CFWL_FontManager();
« no previous file with comments | « xfa/fwl/basewidget/fwl_editimp.cpp ('k') | xfa/fwl/theme/cfwl_widgettp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698