From 0821c95ee9f132f77f3670a7dbbf114a82a6b9a0 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 14 Dec 2017 20:09:43 +0000 Subject: Fold CXFA_ValueData into CXFA_Value The CXFA_ValueData class is a thin wrapper around the CXFA_Value, this CL moves the methods from CXFA_ValueData into CXFA_Value. Change-Id: I2c57e93e5c4675b82af71cf75f2dfc0fb12e4b20 Reviewed-on: https://pdfium-review.googlesource.com/21170 Commit-Queue: dsinclair Reviewed-by: Henrique Nakashima --- xfa/fxfa/cxfa_ffrectangle.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'xfa/fxfa/cxfa_ffrectangle.cpp') diff --git a/xfa/fxfa/cxfa_ffrectangle.cpp b/xfa/fxfa/cxfa_ffrectangle.cpp index 716ef2e840..063a9e9865 100644 --- a/xfa/fxfa/cxfa_ffrectangle.cpp +++ b/xfa/fxfa/cxfa_ffrectangle.cpp @@ -6,6 +6,8 @@ #include "xfa/fxfa/cxfa_ffrectangle.h" +#include "xfa/fxfa/parser/cxfa_value.h" + CXFA_FFRectangle::CXFA_FFRectangle(CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pDataAcc) {} @@ -17,8 +19,8 @@ void CXFA_FFRectangle::RenderWidget(CXFA_Graphics* pGS, if (!IsMatchVisibleStatus(dwStatus)) return; - CXFA_ValueData valueData = m_pDataAcc->GetFormValueData(); - if (!valueData.HasValidNode()) + CXFA_Value* value = m_pDataAcc->GetFormValue(); + if (!value) return; CFX_RectF rect = GetRectWithoutRotate(); @@ -29,5 +31,5 @@ void CXFA_FFRectangle::RenderWidget(CXFA_Graphics* pGS, CFX_Matrix mtRotate = GetRotateMatrix(); mtRotate.Concat(matrix); - DrawBorder(pGS, valueData.GetRectangleData(), rect, mtRotate); + DrawBorder(pGS, value->GetRectangleData(), rect, mtRotate); } -- cgit v1.2.3