From 39628b04bc86461426f2dcf5a568f5e9e70ad997 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 3 Jan 2018 12:01:24 -0500 Subject: Change CXFA_BoxData to CXFA_Box This CL renames CXFA_BoxData to CXFA_Box and sets it to inhert from CXFA_Node instead of CXFA_DataData. The CXFA_BoxData subclasses, CXFA_RectangleData, CXFA_BorderData and CXFA_ArcData classes are removed and the nodes now inherit from CXFA_Box. Change-Id: Ia0df7d56535b5d90be29f040180a5d5fc55a64e0 Reviewed-on: https://pdfium-review.googlesource.com/22091 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- xfa/fwl/theme/cfwl_edittp.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'xfa/fwl/theme') diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp index 563ae532dd..ad9bf02038 100644 --- a/xfa/fwl/theme/cfwl_edittp.cpp +++ b/xfa/fwl/theme/cfwl_edittp.cpp @@ -11,6 +11,7 @@ #include "xfa/fwl/cfwl_widget.h" #include "xfa/fxfa/cxfa_ffwidget.h" #include "xfa/fxfa/cxfa_fwltheme.h" +#include "xfa/fxfa/parser/cxfa_border.h" #include "xfa/fxgraphics/cxfa_gecolor.h" #include "xfa/fxgraphics/cxfa_gepath.h" @@ -21,11 +22,11 @@ CFWL_EditTP::~CFWL_EditTP() {} void CFWL_EditTP::DrawBackground(CFWL_ThemeBackground* pParams) { if (CFWL_Part::CombTextLine == pParams->m_iPart) { CXFA_FFWidget* pWidget = XFA_ThemeGetOuterWidget(pParams->m_pWidget); - CXFA_BorderData borderUIData = pWidget->GetDataAcc()->GetUIBorderData(); + CXFA_Border* borderUI = pWidget->GetDataAcc()->GetUIBorder(); FX_ARGB cr = 0xFF000000; float fWidth = 1.0f; - if (borderUIData.HasValidNode()) { - CXFA_EdgeData edgeData = borderUIData.GetEdgeData(0); + if (borderUI) { + CXFA_EdgeData edgeData = borderUI->GetEdgeData(0); if (edgeData.HasValidNode()) { cr = edgeData.GetColor(); fWidth = edgeData.GetThickness(); -- cgit v1.2.3