diff options
| -rw-r--r-- | BUILD.gn | 2 | ||||
| -rw-r--r-- | xfa/fxfa/cxfa_ffwidget.cpp | 26 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_boxdata.cpp | 8 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_cornerdata.h (renamed from xfa/fxfa/parser/cxfa_corner.h) | 10 |
4 files changed, 23 insertions, 23 deletions
@@ -1807,7 +1807,7 @@ if (pdf_enable_xfa) { "xfa/fxfa/parser/cxfa_containerlayoutitem.h", "xfa/fxfa/parser/cxfa_contentlayoutitem.cpp", "xfa/fxfa/parser/cxfa_contentlayoutitem.h", - "xfa/fxfa/parser/cxfa_corner.h", + "xfa/fxfa/parser/cxfa_cornerdata.h", "xfa/fxfa/parser/cxfa_data.cpp", "xfa/fxfa/parser/cxfa_data.h", "xfa/fxfa/parser/cxfa_dataexporter.cpp", diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp index cca04dac5e..f6949c4853 100644 --- a/xfa/fxfa/cxfa_ffwidget.cpp +++ b/xfa/fxfa/cxfa_ffwidget.cpp @@ -28,7 +28,7 @@ #include "xfa/fxfa/cxfa_ffpageview.h" #include "xfa/fxfa/cxfa_textlayout.h" #include "xfa/fxfa/cxfa_widgetacc.h" -#include "xfa/fxfa/parser/cxfa_corner.h" +#include "xfa/fxfa/parser/cxfa_cornerdata.h" #include "xfa/fxfa/parser/cxfa_node.h" #include "xfa/fxgraphics/cxfa_color.h" #include "xfa/fxgraphics/cxfa_graphics.h" @@ -73,14 +73,14 @@ void XFA_BOX_GetPath(const std::vector<CXFA_Stroke>& strokes, bool bCorner) { ASSERT(nIndex >= 0 && nIndex < 8); int32_t n = (nIndex & 1) ? nIndex - 1 : nIndex; - CXFA_Corner corner1(strokes[n].GetNode()); - CXFA_Corner corner2(strokes[(n + 2) % 8].GetNode()); - float fRadius1 = bCorner ? corner1.GetRadius() : 0.0f; - float fRadius2 = bCorner ? corner2.GetRadius() : 0.0f; - bool bInverted = corner1.IsInverted(); + CXFA_CornerData cornerData1(strokes[n].GetNode()); + CXFA_CornerData cornerData2(strokes[(n + 2) % 8].GetNode()); + float fRadius1 = bCorner ? cornerData1.GetRadius() : 0.0f; + float fRadius2 = bCorner ? cornerData2.GetRadius() : 0.0f; + bool bInverted = cornerData1.IsInverted(); float offsetY = 0.0f; float offsetX = 0.0f; - bool bRound = corner1.GetJoinType() == XFA_ATTRIBUTEENUM_Round; + bool bRound = cornerData1.GetJoinType() == XFA_ATTRIBUTEENUM_Round; float halfAfter = 0.0f; float halfBefore = 0.0f; CXFA_Stroke stroke = strokes[nIndex]; @@ -300,12 +300,12 @@ void XFA_BOX_GetFillPath(CXFA_BoxData boxData, float nx = 1.0f; float ny = 1.0f; CFX_PointF cp1, cp2; - CXFA_Corner corner1(strokes[i].GetNode()); - CXFA_Corner corner2(strokes[(i + 2) % 8].GetNode()); - float fRadius1 = corner1.GetRadius(); - float fRadius2 = corner2.GetRadius(); - bool bInverted = corner1.IsInverted(); - bool bRound = corner1.GetJoinType() == XFA_ATTRIBUTEENUM_Round; + CXFA_CornerData cornerData1(strokes[i].GetNode()); + CXFA_CornerData cornerData2(strokes[(i + 2) % 8].GetNode()); + float fRadius1 = cornerData1.GetRadius(); + float fRadius2 = cornerData2.GetRadius(); + bool bInverted = cornerData1.IsInverted(); + bool bRound = cornerData1.GetJoinType() == XFA_ATTRIBUTEENUM_Round; if (bRound) { sy = FX_PI / 2; } diff --git a/xfa/fxfa/parser/cxfa_boxdata.cpp b/xfa/fxfa/parser/cxfa_boxdata.cpp index c7a58a1c27..51fadffd79 100644 --- a/xfa/fxfa/parser/cxfa_boxdata.cpp +++ b/xfa/fxfa/parser/cxfa_boxdata.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_boxdata.h" -#include "xfa/fxfa/parser/cxfa_corner.h" +#include "xfa/fxfa/parser/cxfa_cornerdata.h" #include "xfa/fxfa/parser/cxfa_measurement.h" #include "xfa/fxfa/parser/cxfa_node.h" @@ -22,10 +22,10 @@ void GetStrokesInternal(CXFA_Node* pNode, strokes->resize(8); int32_t i, j; for (i = 0, j = 0; i < 4; i++) { - CXFA_Corner corner = CXFA_Corner( + CXFA_CornerData cornerData = CXFA_CornerData( pNode->JSNode()->GetProperty(i, XFA_Element::Corner, i == 0)); - if (corner || i == 0) { - (*strokes)[j] = corner; + if (cornerData || i == 0) { + (*strokes)[j] = cornerData; } else if (!bNull) { if (i == 1 || i == 2) (*strokes)[j] = (*strokes)[0]; diff --git a/xfa/fxfa/parser/cxfa_corner.h b/xfa/fxfa/parser/cxfa_cornerdata.h index 7665c53812..be0b602d78 100644 --- a/xfa/fxfa/parser/cxfa_corner.h +++ b/xfa/fxfa/parser/cxfa_cornerdata.h @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_PARSER_CXFA_CORNER_H_ -#define XFA_FXFA_PARSER_CXFA_CORNER_H_ +#ifndef XFA_FXFA_PARSER_CXFA_CORNERDATA_H_ +#define XFA_FXFA_PARSER_CXFA_CORNERDATA_H_ #include "xfa/fxfa/parser/cxfa_stroke.h" class CXFA_Node; -class CXFA_Corner : public CXFA_Stroke { +class CXFA_CornerData : public CXFA_Stroke { public: - explicit CXFA_Corner(CXFA_Node* pNode) : CXFA_Stroke(pNode) {} + explicit CXFA_CornerData(CXFA_Node* pNode) : CXFA_Stroke(pNode) {} }; -#endif // XFA_FXFA_PARSER_CXFA_CORNER_H_ +#endif // XFA_FXFA_PARSER_CXFA_CORNERDATA_H_ |