summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-21 22:03:20 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-21 22:03:20 +0000
commit559f974dbb92e35a1bfb739032d82a2536fcf59c (patch)
treef9b90f5029a28138377272195392aaab659250b1 /xfa/fxfa/parser
parent307dfb406422f9589fcdb09039b4c31a9c5f6269 (diff)
downloadpdfium-559f974dbb92e35a1bfb739032d82a2536fcf59c.tar.xz
Cleanup CXFA_StrokeData
This CL fixes return types and makes methods consts. Change-Id: I97da09a491d10760d6adf4efcc0557130cf8b405 Reviewed-on: https://pdfium-review.googlesource.com/19110 Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser')
-rw-r--r--xfa/fxfa/parser/cxfa_boxdata.cpp3
-rw-r--r--xfa/fxfa/parser/cxfa_strokedata.cpp13
-rw-r--r--xfa/fxfa/parser/cxfa_strokedata.h20
-rw-r--r--xfa/fxfa/parser/cxfa_widgetdata.cpp2
4 files changed, 21 insertions, 17 deletions
diff --git a/xfa/fxfa/parser/cxfa_boxdata.cpp b/xfa/fxfa/parser/cxfa_boxdata.cpp
index a9f7ace13e..ef9864f6f9 100644
--- a/xfa/fxfa/parser/cxfa_boxdata.cpp
+++ b/xfa/fxfa/parser/cxfa_boxdata.cpp
@@ -63,7 +63,8 @@ static int32_t Style3D(const std::vector<CXFA_StrokeData>& strokes,
strokeData = find;
break;
}
- int32_t iType = strokeData.GetStrokeType();
+
+ XFA_ATTRIBUTEENUM iType = strokeData.GetStrokeType();
if (iType == XFA_ATTRIBUTEENUM_Lowered || iType == XFA_ATTRIBUTEENUM_Raised ||
iType == XFA_ATTRIBUTEENUM_Etched ||
iType == XFA_ATTRIBUTEENUM_Embossed) {
diff --git a/xfa/fxfa/parser/cxfa_strokedata.cpp b/xfa/fxfa/parser/cxfa_strokedata.cpp
index edbac24237..0845719c9e 100644
--- a/xfa/fxfa/parser/cxfa_strokedata.cpp
+++ b/xfa/fxfa/parser/cxfa_strokedata.cpp
@@ -10,18 +10,19 @@
#include "xfa/fxfa/parser/cxfa_node.h"
#include "xfa/fxfa/parser/xfa_utils.h"
-int32_t CXFA_StrokeData::GetPresence() const {
- return m_pNode ? m_pNode->JSNode()->GetEnum(XFA_Attribute::Presence)
- : XFA_ATTRIBUTEENUM_Invisible;
+bool CXFA_StrokeData::IsVisible() const {
+ return m_pNode ? m_pNode->JSNode()->GetEnum(XFA_Attribute::Presence) ==
+ XFA_ATTRIBUTEENUM_Visible
+ : false;
}
-int32_t CXFA_StrokeData::GetCapType() const {
+XFA_ATTRIBUTEENUM CXFA_StrokeData::GetCapType() const {
if (!m_pNode)
return XFA_ATTRIBUTEENUM_Square;
return m_pNode->JSNode()->GetEnum(XFA_Attribute::Cap);
}
-int32_t CXFA_StrokeData::GetStrokeType() const {
+XFA_ATTRIBUTEENUM CXFA_StrokeData::GetStrokeType() const {
return m_pNode ? m_pNode->JSNode()->GetEnum(XFA_Attribute::Stroke)
: XFA_ATTRIBUTEENUM_Solid;
}
@@ -70,7 +71,7 @@ void CXFA_StrokeData::SetColor(FX_ARGB argb) {
false);
}
-int32_t CXFA_StrokeData::GetJoinType() const {
+XFA_ATTRIBUTEENUM CXFA_StrokeData::GetJoinType() const {
return m_pNode ? m_pNode->JSNode()->GetEnum(XFA_Attribute::Join)
: XFA_ATTRIBUTEENUM_Square;
}
diff --git a/xfa/fxfa/parser/cxfa_strokedata.h b/xfa/fxfa/parser/cxfa_strokedata.h
index 2921f885ff..b701c25edf 100644
--- a/xfa/fxfa/parser/cxfa_strokedata.h
+++ b/xfa/fxfa/parser/cxfa_strokedata.h
@@ -25,20 +25,22 @@ class CXFA_StrokeData : public CXFA_DataData {
explicit CXFA_StrokeData(CXFA_Node* pNode) : CXFA_DataData(pNode) {}
bool IsCorner() const { return GetElementType() == XFA_Element::Corner; }
- bool IsEdge() const { return GetElementType() == XFA_Element::Edge; }
- bool IsVisible() const { return GetPresence() == XFA_ATTRIBUTEENUM_Visible; }
- int32_t GetPresence() const;
- int32_t GetCapType() const;
- int32_t GetStrokeType() const;
+ bool IsVisible() const;
+ bool IsInverted() const;
+
+ XFA_ATTRIBUTEENUM GetCapType() const;
+ XFA_ATTRIBUTEENUM GetStrokeType() const;
+ XFA_ATTRIBUTEENUM GetJoinType() const;
+ float GetRadius() const;
float GetThickness() const;
+
CXFA_Measurement GetMSThickness() const;
void SetMSThickness(CXFA_Measurement msThinkness);
+
FX_ARGB GetColor() const;
void SetColor(FX_ARGB argb);
- int32_t GetJoinType() const;
- bool IsInverted() const;
- float GetRadius() const;
- bool SameStyles(CXFA_StrokeData stroke, uint32_t dwFlags = 0) const;
+
+ bool SameStyles(CXFA_StrokeData stroke, uint32_t dwFlags) const;
};
#endif // XFA_FXFA_PARSER_CXFA_STROKEDATA_H_
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index 4688aee390..13b1c7a3ae 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -25,7 +25,7 @@ float GetEdgeThickness(const std::vector<CXFA_StrokeData>& strokes,
int32_t nIndex) {
float fThickness = 0;
- if (strokes[nIndex * 2 + 1].GetPresence() == XFA_ATTRIBUTEENUM_Visible) {
+ if (strokes[nIndex * 2 + 1].IsVisible()) {
if (nIndex == 0)
fThickness += 2.5f;