summaryrefslogtreecommitdiff
path: root/xfa/fxfa/cxfa_ffpushbutton.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2018-01-03 11:11:16 -0500
committerChromium commit bot <commit-bot@chromium.org>2018-01-03 17:21:40 +0000
commitcbd4410908e2a4898fdd5e0d6d17591fc2c71f54 (patch)
tree85ee81736d4c8de97e117a6500fafe6ac3c726fb /xfa/fxfa/cxfa_ffpushbutton.cpp
parentcf3d40d10276686f972761bafd005a7715f6eb1c (diff)
downloadpdfium-cbd4410908e2a4898fdd5e0d6d17591fc2c71f54.tar.xz
Fold CXFA_MarginData into CXFA_Marginchromium/3311
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 <hnakashima@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffpushbutton.cpp')
-rw-r--r--xfa/fxfa/cxfa_ffpushbutton.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp
index 615c8ae16c..914b350767 100644
--- a/xfa/fxfa/cxfa_ffpushbutton.cpp
+++ b/xfa/fxfa/cxfa_ffpushbutton.cpp
@@ -97,15 +97,15 @@ bool CXFA_FFPushButton::PerformLayout() {
CFX_RectF rtWidget = GetRectWithoutRotate();
m_rtUI = rtWidget;
- CXFA_MarginData marginData = m_pDataAcc->GetMarginData();
- if (marginData.HasValidNode())
- XFA_RectWidthoutMargin(rtWidget, marginData);
+ CXFA_Margin* margin = m_pDataAcc->GetMargin();
+ if (margin)
+ XFA_RectWidthoutMargin(rtWidget, margin);
CXFA_CaptionData captionData = m_pDataAcc->GetCaptionData();
m_rtCaption = rtWidget;
- CXFA_MarginData captionMarginData = captionData.GetMarginData();
- if (captionMarginData.HasValidNode())
- XFA_RectWidthoutMargin(m_rtCaption, captionMarginData);
+ CXFA_Margin* captionMargin = captionData.GetMargin();
+ if (captionMargin)
+ XFA_RectWidthoutMargin(m_rtCaption, captionMargin);
LayoutHighlightCaption();
SetFWLRect();