diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-04-21 11:06:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-21 11:06:27 -0700 |
| commit | acd0d59e3c09f04bffd178aecd3638d3e189faba (patch) | |
| tree | 39e30a37353f74aeb775834967eb86779c0bbdcd /xfa/fwl | |
| parent | 4f70b53efb39e9b9b868d99999582282be57fe50 (diff) | |
| download | pdfium-acd0d59e3c09f04bffd178aecd3638d3e189faba.tar.xz | |
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
Diffstat (limited to 'xfa/fwl')
| -rw-r--r-- | xfa/fwl/basewidget/fwl_editimp.cpp | 10 | ||||
| -rw-r--r-- | xfa/fwl/theme/cfwl_widgettp.cpp | 2 | ||||
| -rw-r--r-- | xfa/fwl/theme/cfwl_widgettp.h | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp index d25fd09d29..54e8abcb8b 100644 --- a/xfa/fwl/basewidget/fwl_editimp.cpp +++ b/xfa/fwl/basewidget/fwl_editimp.cpp @@ -9,8 +9,8 @@ #include <algorithm> #include <vector> +#include "xfa/fde/fde_gedevice.h" #include "xfa/fde/fde_render.h" -#include "xfa/fde/fde_renderdevice.h" #include "xfa/fee/ifde_txtedtpage.h" #include "xfa/fwl/basewidget/fwl_caretimp.h" #include "xfa/fwl/basewidget/fwl_comboboximp.h" @@ -1039,12 +1039,8 @@ void CFWL_EditImp::DrawContent(CFX_Graphics* pGraphics, CFX_RenderDevice* pRenderDev = pGraphics->GetRenderDevice(); if (!pRenderDev) return; - IFDE_RenderDevice* pRenderDevice = IFDE_RenderDevice::Create(pRenderDev); - if (!pRenderDevice) - return; - IFDE_RenderContext* pRenderContext = IFDE_RenderContext::Create(); - if (!pRenderContext) - return; + CFDE_RenderDevice* pRenderDevice = new CFDE_RenderDevice(pRenderDev, FALSE); + CFDE_RenderContext* pRenderContext = new CFDE_RenderContext; pRenderDevice->SetClipRect(rtClip); pRenderContext->StartRender(pRenderDevice, pPage, mt); pRenderContext->DoRender(NULL); 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; |