From bf1cf346ba28a9eab0d2ea490868c51040ee2bc4 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 3 Jan 2018 15:52:41 -0500 Subject: Convert CXFA_StrokeData to CXFA_Stroke This CL changes CXFA_StrokeData to CXFA_Stroke and changes the inheritance form CXFA_DataData to CXFA_Node. The CXFA_EdgeData and CXFA_CornerData classes are removed and the node equivalents are changed to inherit from CXFA_Stroke. Change-Id: I8aa4365a8ed79c29c3a4c34879abe898a188b7de Reviewed-on: https://pdfium-review.googlesource.com/22151 Commit-Queue: dsinclair Reviewed-by: Henrique Nakashima --- xfa/fwl/theme/cfwl_edittp.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'xfa/fwl') diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp index ad9bf02038..59a2ff07d9 100644 --- a/xfa/fwl/theme/cfwl_edittp.cpp +++ b/xfa/fwl/theme/cfwl_edittp.cpp @@ -12,6 +12,7 @@ #include "xfa/fxfa/cxfa_ffwidget.h" #include "xfa/fxfa/cxfa_fwltheme.h" #include "xfa/fxfa/parser/cxfa_border.h" +#include "xfa/fxfa/parser/cxfa_edge.h" #include "xfa/fxgraphics/cxfa_gecolor.h" #include "xfa/fxgraphics/cxfa_gepath.h" @@ -26,10 +27,10 @@ void CFWL_EditTP::DrawBackground(CFWL_ThemeBackground* pParams) { FX_ARGB cr = 0xFF000000; float fWidth = 1.0f; if (borderUI) { - CXFA_EdgeData edgeData = borderUI->GetEdgeData(0); - if (edgeData.HasValidNode()) { - cr = edgeData.GetColor(); - fWidth = edgeData.GetThickness(); + CXFA_Edge* edge = borderUI->GetEdge(0); + if (edge) { + cr = edge->GetColor(); + fWidth = edge->GetThickness(); } } pParams->m_pGraphics->SetStrokeColor(CXFA_GEColor(cr)); -- cgit v1.2.3