From acd0d59e3c09f04bffd178aecd3638d3e189faba Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 21 Apr 2016 11:06:27 -0700 Subject: Cleanup FDE interfaces. This CL removes IFDE_TextOut, IFDE_Path, IFDE_RenderContext, IFDE_RenderDevice, and IFDE_VisualSetIterator in favour of the concrete classes. BUG=pdfium:468 Review URL: https://codereview.chromium.org/1896893003 --- xfa/fwl/theme/cfwl_widgettp.cpp | 2 +- xfa/fwl/theme/cfwl_widgettp.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/fwl/theme') diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp index 1ce5d46caf..2fc8036763 100644 --- a/xfa/fwl/theme/cfwl_widgettp.cpp +++ b/xfa/fwl/theme/cfwl_widgettp.cpp @@ -206,7 +206,7 @@ FX_ERR CFWL_WidgetTP::InitTTO() { } m_pFDEFont = CFWL_FontManager::GetInstance()->FindFont(FX_WSTRC(L"Helvetica"), 0, 0); - m_pTextOut = IFDE_TextOut::Create(); + m_pTextOut = new CFDE_TextOut; m_pTextOut->SetFont(m_pFDEFont); m_pTextOut->SetFontSize(FWLTHEME_CAPACITY_FontSize); m_pTextOut->SetTextColor(FWLTHEME_CAPACITY_TextColor); diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index bbb3fd7ee6..4e640370b8 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h @@ -20,13 +20,13 @@ enum class CFWL_WidgetCapacity { None = 0, Today, + Sun, Mon, Tue, Wed, Thu, Fri, Sat, - Sun, January, February, @@ -92,7 +92,7 @@ enum class CFWL_WidgetCapacity { }; class IFWL_Widget; -class IFDE_TextOut; +class CFDE_TextOut; class IFX_Font; class IFX_FontMgr; class CFWL_ArrowData; @@ -217,7 +217,7 @@ class CFWL_WidgetTP { FWLTHEME_STATE eState, CFX_Matrix* pMatrix = NULL); uint32_t m_dwRefCount; - IFDE_TextOut* m_pTextOut; + CFDE_TextOut* m_pTextOut; IFX_Font* m_pFDEFont; FX_FLOAT m_fValue; uint32_t m_dwValue; -- cgit v1.2.3