From cbd4410908e2a4898fdd5e0d6d17591fc2c71f54 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 3 Jan 2018 11:11:16 -0500 Subject: Fold CXFA_MarginData into CXFA_Margin This CL removes the CXFA_MarginData wrapper and moves the methods directly to CXFA_Margin. Change-Id: I7c9e979fb78d0d356605f1318489daabcb8c32cd Reviewed-on: https://pdfium-review.googlesource.com/22110 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/cxfa_ffrectangle.cpp | 6 +++--- 1 file changed, 3 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 063a9e9865..080488418d 100644 --- a/xfa/fxfa/cxfa_ffrectangle.cpp +++ b/xfa/fxfa/cxfa_ffrectangle.cpp @@ -24,9 +24,9 @@ void CXFA_FFRectangle::RenderWidget(CXFA_Graphics* pGS, return; CFX_RectF rect = GetRectWithoutRotate(); - CXFA_MarginData marginData = m_pDataAcc->GetMarginData(); - if (marginData.HasValidNode()) - XFA_RectWidthoutMargin(rect, marginData); + CXFA_Margin* margin = m_pDataAcc->GetMargin(); + if (margin) + XFA_RectWidthoutMargin(rect, margin); CFX_Matrix mtRotate = GetRotateMatrix(); mtRotate.Concat(matrix); -- cgit v1.2.3