From 5a423ef8708e61d43f1556ab09c2e09f496d700d Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 14 Nov 2017 18:56:54 +0000 Subject: 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 Reviewed-by: Tom Sepez --- xfa/fwl/theme/cfwl_carettp.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'xfa/fwl/theme/cfwl_carettp.cpp') diff --git a/xfa/fwl/theme/cfwl_carettp.cpp b/xfa/fwl/theme/cfwl_carettp.cpp index 37dfad5146..973531958a 100644 --- a/xfa/fwl/theme/cfwl_carettp.cpp +++ b/xfa/fwl/theme/cfwl_carettp.cpp @@ -9,8 +9,8 @@ #include "xfa/fwl/cfwl_caret.h" #include "xfa/fwl/cfwl_themebackground.h" #include "xfa/fwl/cfwl_widget.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_CaretTP::CFWL_CaretTP() {} CFWL_CaretTP::~CFWL_CaretTP() {} @@ -25,7 +25,7 @@ void CFWL_CaretTP::DrawBackground(CFWL_ThemeBackground* pParams) { return; DrawCaretBK(pParams->m_pGraphics, pParams->m_dwStates, - &(pParams->m_rtPart), (CXFA_Color*)pParams->m_pData, + &(pParams->m_rtPart), (CXFA_GEColor*)pParams->m_pData, &(pParams->m_matrix)); break; } @@ -37,15 +37,15 @@ void CFWL_CaretTP::DrawBackground(CFWL_ThemeBackground* pParams) { void CFWL_CaretTP::DrawCaretBK(CXFA_Graphics* pGraphics, uint32_t dwStates, const CFX_RectF* pRect, - CXFA_Color* crFill, + CXFA_GEColor* crFill, CFX_Matrix* pMatrix) { - CXFA_Path path; + CXFA_GEPath path; CFX_RectF rect = *pRect; path.AddRectangle(rect.left, rect.top, rect.width, rect.height); if (crFill) { pGraphics->SetFillColor(*crFill); } else { - pGraphics->SetFillColor(CXFA_Color(ArgbEncode(255, 0, 0, 0))); + pGraphics->SetFillColor(CXFA_GEColor(ArgbEncode(255, 0, 0, 0))); } pGraphics->FillPath(&path, FXFILL_WINDING, pMatrix); } -- cgit v1.2.3