diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-04-12 13:19:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-12 13:19:36 -0700 |
| commit | a5c1323ae6a2379fb5fe3ddea4c223fccd0c41b0 (patch) | |
| tree | accc30b91dd79d90921b13ae430d17f4a51a737f /xfa/fxfa/app/xfa_textlayout.cpp | |
| parent | 6b19ec629d32e872d2e430987526162b2954b851 (diff) | |
| download | pdfium-a5c1323ae6a2379fb5fe3ddea4c223fccd0c41b0.tar.xz | |
Remove IFDE_Pen and IFDE_Brush.
This Cl removes the two interfaces and renames CFDE_SolidBrush to CFDE_Brush.
Uncalled methods are removed from both CFDE_Brush and CFDE_Pen and code
simplified to match.
BUG=pdfium:468
Review URL: https://codereview.chromium.org/1881803003
Diffstat (limited to 'xfa/fxfa/app/xfa_textlayout.cpp')
| -rw-r--r-- | xfa/fxfa/app/xfa_textlayout.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp index a15fb95925..4a20cbb44d 100644 --- a/xfa/fxfa/app/xfa_textlayout.cpp +++ b/xfa/fxfa/app/xfa_textlayout.cpp @@ -11,7 +11,6 @@ #include "core/fxcrt/include/fx_ext.h" #include "xfa/fde/css/fde_csscache.h" #include "xfa/fde/fde_object.h" -#include "xfa/fde/fde_pen.h" #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fgas/crt/fgas_algorithm.h" #include "xfa/fgas/crt/fgas_codepage.h" @@ -1223,8 +1222,8 @@ FX_BOOL CXFA_TextLayout::DrawString(CFX_RenderDevice* pFxDevice, } FDE_HDEVICESTATE state = pDevice->SaveState(); pDevice->SetClipRect(rtClip); - IFDE_SolidBrush* pSolidBrush = new CFDE_SolidBrush; - IFDE_Pen* pPen = new CFDE_Pen; + CFDE_Brush* pSolidBrush = new CFDE_Brush; + CFDE_Pen* pPen = new CFDE_Pen; FXSYS_assert(pDevice); if (m_pieceLines.GetSize() == 0) { @@ -1271,8 +1270,8 @@ FX_BOOL CXFA_TextLayout::DrawString(CFX_RenderDevice* pFxDevice, } pDevice->RestoreState(state); FX_Free(pCharPos); - pSolidBrush->Release(); - pPen->Release(); + delete pSolidBrush; + delete pPen; pDevice->Release(); return iPieceLines; } @@ -1840,7 +1839,7 @@ void CXFA_TextLayout::AppendTextLine(uint32_t dwStatus, m_iLines++; } void CXFA_TextLayout::RenderString(IFDE_RenderDevice* pDevice, - IFDE_SolidBrush* pBrush, + CFDE_Brush* pBrush, CXFA_PieceLine* pPieceLine, int32_t iPiece, FXTEXT_CHARPOS* pCharPos, @@ -1855,7 +1854,7 @@ void CXFA_TextLayout::RenderString(IFDE_RenderDevice* pDevice, pPieceLine->m_charCounts.Add(iCount); } void CXFA_TextLayout::RenderPath(IFDE_RenderDevice* pDevice, - IFDE_Pen* pPen, + CFDE_Pen* pPen, CXFA_PieceLine* pPieceLine, int32_t iPiece, FXTEXT_CHARPOS* pCharPos, |