diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-14 18:56:54 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-14 18:56:54 +0000 |
| commit | 5a423ef8708e61d43f1556ab09c2e09f496d700d (patch) | |
| tree | 4d1858fa46836f33b7e334348cecd96318de6ea6 /xfa/fwl/theme/cfwl_edittp.cpp | |
| parent | c8619c8d1cebb6b64db248ec89db98ab4513ad3c (diff) | |
| download | pdfium-5a423ef8708e61d43f1556ab09c2e09f496d700d.tar.xz | |
Rename the fxgraphics classes
The build system doesn't like name clashes over directories in XFA.
The Pattern and and Shading classes need to be renamed to not clash with
future XFA node class names.
Change-Id: I978da492d884626c0db2e11ac236a3399e9c7e58
Reviewed-on: https://pdfium-review.googlesource.com/18290
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fwl/theme/cfwl_edittp.cpp')
| -rw-r--r-- | xfa/fwl/theme/cfwl_edittp.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp index 9b8497a41e..4f8c4d533e 100644 --- a/xfa/fwl/theme/cfwl_edittp.cpp +++ b/xfa/fwl/theme/cfwl_edittp.cpp @@ -11,8 +11,8 @@ #include "xfa/fwl/cfwl_widget.h" #include "xfa/fxfa/cxfa_ffwidget.h" #include "xfa/fxfa/cxfa_fwltheme.h" -#include "xfa/fxgraphics/cxfa_color.h" -#include "xfa/fxgraphics/cxfa_path.h" +#include "xfa/fxgraphics/cxfa_gecolor.h" +#include "xfa/fxgraphics/cxfa_gepath.h" CFWL_EditTP::CFWL_EditTP() {} @@ -31,7 +31,7 @@ void CFWL_EditTP::DrawBackground(CFWL_ThemeBackground* pParams) { fWidth = edgeData.GetThickness(); } } - pParams->m_pGraphics->SetStrokeColor(CXFA_Color(cr)); + pParams->m_pGraphics->SetStrokeColor(CXFA_GEColor(cr)); pParams->m_pGraphics->SetLineWidth(fWidth); pParams->m_pGraphics->StrokePath(pParams->m_pPath, &pParams->m_matrix); return; @@ -46,22 +46,22 @@ void CFWL_EditTP::DrawBackground(CFWL_ThemeBackground* pParams) { if (pParams->m_pPath) { CXFA_Graphics* pGraphics = pParams->m_pGraphics; pGraphics->SaveGraphState(); - pGraphics->SetFillColor(CXFA_Color(FWLTHEME_COLOR_BKSelected)); + pGraphics->SetFillColor(CXFA_GEColor(FWLTHEME_COLOR_BKSelected)); pGraphics->FillPath(pParams->m_pPath, FXFILL_WINDING, &pParams->m_matrix); pGraphics->RestoreGraphState(); } else { - CXFA_Path path; + CXFA_GEPath path; path.AddRectangle(pParams->m_rtPart.left, pParams->m_rtPart.top, pParams->m_rtPart.width, pParams->m_rtPart.height); - CXFA_Color cr(FWLTHEME_COLOR_Background); + CXFA_GEColor cr(FWLTHEME_COLOR_Background); if (!pParams->m_bStaticBackground) { if (pParams->m_dwStates & CFWL_PartState_Disabled) - cr = CXFA_Color(FWLTHEME_COLOR_EDGERB1); + cr = CXFA_GEColor(FWLTHEME_COLOR_EDGERB1); else if (pParams->m_dwStates & CFWL_PartState_ReadOnly) - cr = CXFA_Color(ArgbEncode(255, 236, 233, 216)); + cr = CXFA_GEColor(ArgbEncode(255, 236, 233, 216)); else - cr = CXFA_Color(0xFFFFFFFF); + cr = CXFA_GEColor(0xFFFFFFFF); } pParams->m_pGraphics->SaveGraphState(); pParams->m_pGraphics->SetFillColor(cr); @@ -72,7 +72,7 @@ void CFWL_EditTP::DrawBackground(CFWL_ThemeBackground* pParams) { break; } case CFWL_Part::CombTextLine: { - pParams->m_pGraphics->SetStrokeColor(CXFA_Color(0xFF000000)); + pParams->m_pGraphics->SetStrokeColor(CXFA_GEColor(0xFF000000)); pParams->m_pGraphics->SetLineWidth(1.0f); pParams->m_pGraphics->StrokePath(pParams->m_pPath, &pParams->m_matrix); break; |