summaryrefslogtreecommitdiff
path: root/xfa/fxfa/cxfa_fffield.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2018-01-03 12:01:24 -0500
committerChromium commit bot <commit-bot@chromium.org>2018-01-03 18:20:01 +0000
commit39628b04bc86461426f2dcf5a568f5e9e70ad997 (patch)
treea0cf6c494a74b83e93a5cc526ab5897a08e3d743 /xfa/fxfa/cxfa_fffield.cpp
parent9647614a5dcd00d50aacf4e000fd23a5ebb13931 (diff)
downloadpdfium-39628b04bc86461426f2dcf5a568f5e9e70ad997.tar.xz
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 <rharrison@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_fffield.cpp')
-rw-r--r--xfa/fxfa/cxfa_fffield.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp
index 75bd064e29..678b9f0d9a 100644
--- a/xfa/fxfa/cxfa_fffield.cpp
+++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -22,6 +22,7 @@
#include "xfa/fxfa/cxfa_ffwidget.h"
#include "xfa/fxfa/cxfa_fwltheme.h"
#include "xfa/fxfa/cxfa_textlayout.h"
+#include "xfa/fxfa/parser/cxfa_border.h"
#include "xfa/fxfa/parser/cxfa_calculate.h"
#include "xfa/fxfa/parser/cxfa_margin.h"
#include "xfa/fxfa/parser/cxfa_node.h"
@@ -68,7 +69,7 @@ void CXFA_FFField::RenderWidget(CXFA_Graphics* pGS,
mtRotate.Concat(matrix);
CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus);
- DrawBorder(pGS, m_pDataAcc->GetUIBorderData(), m_rtUI, mtRotate);
+ DrawBorder(pGS, m_pDataAcc->GetUIBorder(), m_rtUI, mtRotate);
RenderCaption(pGS, &mtRotate);
DrawHighlight(pGS, &mtRotate, dwStatus, false);
@@ -264,9 +265,9 @@ void CXFA_FFField::CapPlacement() {
break;
}
- CXFA_BorderData borderUIData = m_pDataAcc->GetUIBorderData();
- if (borderUIData.HasValidNode()) {
- CXFA_Margin* borderMargin = borderUIData.GetMargin();
+ CXFA_Border* borderUI = m_pDataAcc->GetUIBorder();
+ if (borderUI) {
+ CXFA_Margin* borderMargin = borderUI->GetMargin();
if (borderMargin)
XFA_RectWidthoutMargin(m_rtUI, borderMargin);
}