diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-07 18:40:35 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-07 18:40:35 +0000 |
| commit | 50132e522702dd016b83ed12e91d065357fe0b59 (patch) | |
| tree | c766cd59b00885c8dd38b1e0ff2ba9e9ebde5c85 /xfa/fxfa/parser/cxfa_widgetdata.cpp | |
| parent | e0d68541163e34cc61fcb7e7cb9f5a9887f45245 (diff) | |
| download | pdfium-50132e522702dd016b83ed12e91d065357fe0b59.tar.xz | |
Rename CXFA_Border to CXFA_BorderData
This CL renames CXFA_Border to CXFA_BorderData to make it clear it's
part of the Data hierarchy.
Change-Id: Icfe8dc07d527ba54413f073f5a444fb7b2a71271
Reviewed-on: https://pdfium-review.googlesource.com/17974
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_widgetdata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_widgetdata.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index 75de937944..ae857cb9c5 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -279,8 +279,8 @@ int32_t CXFA_WidgetData::GetRotate() { return iRotate / 90 * 90; } -CXFA_Border CXFA_WidgetData::GetBorder(bool bModified) { - return CXFA_Border( +CXFA_BorderData CXFA_WidgetData::GetBorderData(bool bModified) { + return CXFA_BorderData( m_pNode->JSNode()->GetProperty(0, XFA_Element::Border, bModified)); } @@ -387,9 +387,9 @@ bool CXFA_WidgetData::GetMaxHeight(float& fMaxHeight) { return TryMeasure(XFA_ATTRIBUTE_MaxH, fMaxHeight); } -CXFA_Border CXFA_WidgetData::GetUIBorder() { +CXFA_BorderData CXFA_WidgetData::GetUIBorderData() { CXFA_Node* pUIChild = GetUIChild(); - return CXFA_Border( + return CXFA_BorderData( pUIChild ? pUIChild->JSNode()->GetProperty(0, XFA_Element::Border, false) : nullptr); } @@ -403,8 +403,8 @@ CFX_RectF CXFA_WidgetData::GetUIMargin() { if (!mgUI) return CFX_RectF(); - CXFA_Border border = GetUIBorder(); - if (border && border.GetPresence() != XFA_ATTRIBUTEENUM_Visible) + CXFA_BorderData borderData = GetUIBorderData(); + if (borderData && borderData.GetPresence() != XFA_ATTRIBUTEENUM_Visible) return CFX_RectF(); float fLeftInset, fTopInset, fRightInset, fBottomInset; @@ -412,13 +412,13 @@ CFX_RectF CXFA_WidgetData::GetUIMargin() { bool bTop = mgUI.GetTopInset(fTopInset); bool bRight = mgUI.GetRightInset(fRightInset); bool bBottom = mgUI.GetBottomInset(fBottomInset); - if (border) { + if (borderData) { bool bVisible = false; float fThickness = 0; - border.Get3DStyle(bVisible, fThickness); + borderData.Get3DStyle(bVisible, fThickness); if (!bLeft || !bTop || !bRight || !bBottom) { std::vector<CXFA_Stroke> strokes; - border.GetStrokes(&strokes); + borderData.GetStrokes(&strokes); if (!bTop) fTopInset = GetEdgeThickness(strokes, bVisible, 0); if (!bRight) |