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_ffpushbutton.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_ffpushbutton.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffpushbutton.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp index 914b350767..8358ba0dac 100644 --- a/xfa/fxfa/cxfa_ffpushbutton.cpp +++ b/xfa/fxfa/cxfa_ffpushbutton.cpp @@ -18,6 +18,7 @@ #include "xfa/fxfa/cxfa_ffwidget.h" #include "xfa/fxfa/cxfa_textlayout.h" #include "xfa/fxfa/cxfa_textprovider.h" +#include "xfa/fxfa/parser/cxfa_border.h" #include "xfa/fxgraphics/cxfa_gecolor.h" #include "xfa/fxgraphics/cxfa_gepath.h" @@ -115,12 +116,9 @@ bool CXFA_FFPushButton::PerformLayout() { return true; } float CXFA_FFPushButton::GetLineWidth() { - CXFA_BorderData borderData = m_pDataAcc->GetBorderData(false); - if (borderData.HasValidNode() && - borderData.GetPresence() == XFA_AttributeEnum::Visible) { - return borderData.GetEdgeData(0).GetThickness(); - } - + CXFA_Border* border = m_pDataAcc->GetBorder(false); + if (border && border->GetPresence() == XFA_AttributeEnum::Visible) + return border->GetEdgeData(0).GetThickness(); return 0; } |