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_box.h | |
| 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_box.h')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_box.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xfa/fxfa/parser/cxfa_box.h b/xfa/fxfa/parser/cxfa_box.h index 5d9ee4c6fd..dbc07c603d 100644 --- a/xfa/fxfa/parser/cxfa_box.h +++ b/xfa/fxfa/parser/cxfa_box.h @@ -12,11 +12,12 @@ #include <vector> #include "xfa/fxfa/parser/cxfa_datadata.h" -#include "xfa/fxfa/parser/cxfa_edgedata.h" #include "xfa/fxfa/parser/cxfa_filldata.h" #include "xfa/fxfa/parser/cxfa_node.h" +class CXFA_Edge; class CXFA_Margin; +class CXFA_Stroke; class CXFA_Box : public CXFA_Node { public: @@ -30,11 +31,11 @@ class CXFA_Box : public CXFA_Node { std::tuple<XFA_AttributeEnum, bool, float> Get3DStyle(); int32_t CountEdges(); - CXFA_EdgeData GetEdgeData(int32_t nIndex); + CXFA_Edge* GetEdge(int32_t nIndex); CXFA_FillData GetFillData(bool bModified); CXFA_Margin* GetMargin(); - std::vector<CXFA_StrokeData> GetStrokes(); + std::vector<CXFA_Stroke*> GetStrokes(); pdfium::Optional<int32_t> GetStartAngle(); pdfium::Optional<int32_t> GetSweepAngle(); @@ -51,7 +52,7 @@ class CXFA_Box : public CXFA_Node { std::unique_ptr<CJX_Object> js_node); private: - std::vector<CXFA_StrokeData> GetStrokesInternal(bool bNull); + std::vector<CXFA_Stroke*> GetStrokesInternal(bool bNull); }; #endif // XFA_FXFA_PARSER_CXFA_BOX_H_ |