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_pushbuttontp.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_pushbuttontp.cpp')
| -rw-r--r-- | xfa/fwl/theme/cfwl_pushbuttontp.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fwl/theme/cfwl_pushbuttontp.cpp b/xfa/fwl/theme/cfwl_pushbuttontp.cpp index c8152f8d9b..3d3b1aabf7 100644 --- a/xfa/fwl/theme/cfwl_pushbuttontp.cpp +++ b/xfa/fwl/theme/cfwl_pushbuttontp.cpp @@ -10,8 +10,8 @@ #include "xfa/fwl/cfwl_themebackground.h" #include "xfa/fwl/cfwl_widget.h" #include "xfa/fwl/ifwl_themeprovider.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" #define PUSHBUTTON_SIZE_Corner 2 @@ -32,7 +32,7 @@ void CFWL_PushButtonTP::DrawBackground(CFWL_ThemeBackground* pParams) { float fRight = rect.right(); float fBottom = rect.bottom(); - CXFA_Path strokePath; + CXFA_GEPath strokePath; strokePath.MoveTo( CFX_PointF(rect.left + PUSHBUTTON_SIZE_Corner, rect.top)); strokePath.LineTo(CFX_PointF(fRight - PUSHBUTTON_SIZE_Corner, rect.top)); @@ -48,7 +48,7 @@ void CFWL_PushButtonTP::DrawBackground(CFWL_ThemeBackground* pParams) { strokePath.LineTo( CFX_PointF(rect.left + PUSHBUTTON_SIZE_Corner, rect.top)); - CXFA_Path fillPath; + CXFA_GEPath fillPath; fillPath.AddSubpath(&strokePath); CXFA_Graphics* pGraphics = pParams->m_pGraphics; @@ -67,14 +67,14 @@ void CFWL_PushButtonTP::DrawBackground(CFWL_ThemeBackground* pParams) { m_pThemeData->clrEnd[iColor], &fillPath, FXFILL_ALTERNATE, &pParams->m_matrix); - pGraphics->SetStrokeColor(CXFA_Color(m_pThemeData->clrBorder[iColor])); + pGraphics->SetStrokeColor(CXFA_GEColor(m_pThemeData->clrBorder[iColor])); pGraphics->StrokePath(&strokePath, &pParams->m_matrix); fillPath.Clear(); fillPath.AddRectangle(rtInner.left, rtInner.top, rtInner.width, rtInner.height); - pGraphics->SetFillColor(CXFA_Color(m_pThemeData->clrFill[iColor])); + pGraphics->SetFillColor(CXFA_GEColor(m_pThemeData->clrFill[iColor])); pGraphics->FillPath(&fillPath, FXFILL_WINDING, &pParams->m_matrix); if (pParams->m_dwStates & CFWL_PartState_Focused) { rtInner.Inflate(1, 1, 0, 0); |