diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-03 15:52:41 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-03 21:12:00 +0000 |
| commit | bf1cf346ba28a9eab0d2ea490868c51040ee2bc4 (patch) | |
| tree | c1986792d22464cb308fb4d29980fea25c688362 /xfa/fxfa/parser/cxfa_widgetdata.cpp | |
| parent | fa50df5605a14ca4c9ba440506685981f1c8b04b (diff) | |
| download | pdfium-bf1cf346ba28a9eab0d2ea490868c51040ee2bc4.tar.xz | |
Convert CXFA_StrokeData to CXFA_Stroke
This CL changes CXFA_StrokeData to CXFA_Stroke and changes the
inheritance form CXFA_DataData to CXFA_Node. The CXFA_EdgeData and
CXFA_CornerData classes are removed and the node equivalents are changed
to inherit from CXFA_Stroke.
Change-Id: I8aa4365a8ed79c29c3a4c34879abe898a188b7de
Reviewed-on: https://pdfium-review.googlesource.com/22151
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_widgetdata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_widgetdata.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index 1351c77be2..a7f157d0a2 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -27,6 +27,7 @@ #include "xfa/fxfa/parser/cxfa_node.h" #include "xfa/fxfa/parser/cxfa_para.h" #include "xfa/fxfa/parser/cxfa_picture.h" +#include "xfa/fxfa/parser/cxfa_stroke.h" #include "xfa/fxfa/parser/cxfa_ui.h" #include "xfa/fxfa/parser/cxfa_validate.h" #include "xfa/fxfa/parser/cxfa_value.h" @@ -34,16 +35,17 @@ namespace { -float GetEdgeThickness(const std::vector<CXFA_StrokeData>& strokes, +float GetEdgeThickness(const std::vector<CXFA_Stroke*>& strokes, bool b3DStyle, int32_t nIndex) { float fThickness = 0; - if (strokes[nIndex * 2 + 1].IsVisible()) { + CXFA_Stroke* stroke = strokes[nIndex * 2 + 1]; + if (stroke->IsVisible()) { if (nIndex == 0) fThickness += 2.5f; - fThickness += strokes[nIndex * 2 + 1].GetThickness() * (b3DStyle ? 4 : 2); + fThickness += stroke->GetThickness() * (b3DStyle ? 4 : 2); } return fThickness; } @@ -395,7 +397,7 @@ CFX_RectF CXFA_WidgetData::GetUIMargin() { XFA_AttributeEnum iType = XFA_AttributeEnum::Unknown; std::tie(iType, bVisible, fThickness) = border->Get3DStyle(); if (!left || !top || !right || !bottom) { - std::vector<CXFA_StrokeData> strokes = border->GetStrokes(); + std::vector<CXFA_Stroke*> strokes = border->GetStrokes(); if (!top) top = GetEdgeThickness(strokes, bVisible, 0); if (!right) |