diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-03 12:01:24 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-03 18:20:01 +0000 |
| commit | 39628b04bc86461426f2dcf5a568f5e9e70ad997 (patch) | |
| tree | a0cf6c494a74b83e93a5cc526ab5897a08e3d743 /xfa/fxfa/cxfa_ffcheckbutton.cpp | |
| parent | 9647614a5dcd00d50aacf4e000fd23a5ebb13931 (diff) | |
| download | pdfium-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_ffcheckbutton.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffcheckbutton.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xfa/fxfa/cxfa_ffcheckbutton.cpp b/xfa/fxfa/cxfa_ffcheckbutton.cpp index 00369784e1..9083a254a1 100644 --- a/xfa/fxfa/cxfa_ffcheckbutton.cpp +++ b/xfa/fxfa/cxfa_ffcheckbutton.cpp @@ -19,6 +19,7 @@ #include "xfa/fxfa/cxfa_fffield.h" #include "xfa/fxfa/cxfa_ffpageview.h" #include "xfa/fxfa/cxfa_ffwidget.h" +#include "xfa/fxfa/parser/cxfa_border.h" #include "xfa/fxfa/parser/cxfa_para.h" CXFA_FFCheckButton::CXFA_FFCheckButton(CXFA_WidgetAcc* pDataAcc) @@ -171,9 +172,9 @@ bool CXFA_FFCheckButton::PerformLayout() { m_rtUI.height = fCheckSize; AddUIMargin(iCapPlacement); m_rtCheckBox = m_rtUI; - 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); } @@ -233,7 +234,7 @@ void CXFA_FFCheckButton::RenderWidget(CXFA_Graphics* pGS, CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus); DrawBorderWithFlags( - pGS, m_pDataAcc->GetUIBorderData(), m_rtUI, mtRotate, + pGS, m_pDataAcc->GetUIBorder(), m_rtUI, mtRotate, m_pDataAcc->IsCheckButtonRound() ? XFA_DRAWBOX_ForceRound : 0); RenderCaption(pGS, &mtRotate); DrawHighlight(pGS, &mtRotate, dwStatus, m_pDataAcc->IsCheckButtonRound()); |