diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-21 21:51:40 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-21 21:51:40 +0000 |
commit | f9958ed00c5f288d95ab4c6c1d90fc639d5c0f8d (patch) | |
tree | 8bc55fb63db3080b3f59bdc8ee95414a5d957649 /xfa/fxfa/parser/cxfa_fontdata.cpp | |
parent | 7c986a085631639d38076918e0df719d11f40e59 (diff) | |
download | pdfium-f9958ed00c5f288d95ab4c6c1d90fc639d5c0f8d.tar.xz |
Cleanup CXFA_FontData
This CL makes the various methods const and removes out params from
CXFA_FontData.
Change-Id: I85268906a2454c23b73d5724c2556758246791cb
Reviewed-on: https://pdfium-review.googlesource.com/18970
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_fontdata.cpp')
-rw-r--r-- | xfa/fxfa/parser/cxfa_fontdata.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/xfa/fxfa/parser/cxfa_fontdata.cpp b/xfa/fxfa/parser/cxfa_fontdata.cpp index 17bd6b8f3f..20fe68face 100644 --- a/xfa/fxfa/parser/cxfa_fontdata.cpp +++ b/xfa/fxfa/parser/cxfa_fontdata.cpp @@ -13,27 +13,27 @@ CXFA_FontData::CXFA_FontData(CXFA_Node* pNode) : CXFA_DataData(pNode) {} -float CXFA_FontData::GetBaselineShift() { +float CXFA_FontData::GetBaselineShift() const { return m_pNode->JSNode() ->GetMeasure(XFA_Attribute::BaselineShift) .ToUnit(XFA_Unit::Pt); } -float CXFA_FontData::GetHorizontalScale() { +float CXFA_FontData::GetHorizontalScale() const { WideString wsValue = m_pNode->JSNode()->GetCData(XFA_Attribute::FontHorizontalScale); int32_t iScale = FXSYS_wtoi(wsValue.c_str()); return iScale > 0 ? (float)iScale : 100.0f; } -float CXFA_FontData::GetVerticalScale() { +float CXFA_FontData::GetVerticalScale() const { WideString wsValue = m_pNode->JSNode()->GetCData(XFA_Attribute::FontVerticalScale); int32_t iScale = FXSYS_wtoi(wsValue.c_str()); return iScale > 0 ? (float)iScale : 100.0f; } -float CXFA_FontData::GetLetterSpacing() { +float CXFA_FontData::GetLetterSpacing() const { WideString wsValue = m_pNode->JSNode()->GetCData(XFA_Attribute::LetterSpacing); CXFA_Measurement ms(wsValue.AsStringView()); @@ -42,36 +42,36 @@ float CXFA_FontData::GetLetterSpacing() { return ms.ToUnit(XFA_Unit::Pt); } -int32_t CXFA_FontData::GetLineThrough() { +int32_t CXFA_FontData::GetLineThrough() const { return m_pNode->JSNode()->GetInteger(XFA_Attribute::LineThrough); } -int32_t CXFA_FontData::GetUnderline() { +int32_t CXFA_FontData::GetUnderline() const { return m_pNode->JSNode()->GetInteger(XFA_Attribute::Underline); } -int32_t CXFA_FontData::GetUnderlinePeriod() { +int32_t CXFA_FontData::GetUnderlinePeriod() const { return m_pNode->JSNode() ->TryEnum(XFA_Attribute::UnderlinePeriod, true) .value_or(XFA_ATTRIBUTEENUM_All); } -float CXFA_FontData::GetFontSize() { +float CXFA_FontData::GetFontSize() const { return m_pNode->JSNode() ->GetMeasure(XFA_Attribute::Size) .ToUnit(XFA_Unit::Pt); } -void CXFA_FontData::GetTypeface(WideString& wsTypeFace) { - wsTypeFace = m_pNode->JSNode()->GetCData(XFA_Attribute::Typeface); +WideString CXFA_FontData::GetTypeface() const { + return m_pNode->JSNode()->GetCData(XFA_Attribute::Typeface); } -bool CXFA_FontData::IsBold() { +bool CXFA_FontData::IsBold() const { return m_pNode->JSNode()->GetEnum(XFA_Attribute::Weight) == XFA_ATTRIBUTEENUM_Bold; } -bool CXFA_FontData::IsItalic() { +bool CXFA_FontData::IsItalic() const { return m_pNode->JSNode()->GetEnum(XFA_Attribute::Posture) == XFA_ATTRIBUTEENUM_Italic; } @@ -81,7 +81,7 @@ void CXFA_FontData::SetColor(FX_ARGB color) { .SetColor(color); } -FX_ARGB CXFA_FontData::GetColor() { +FX_ARGB CXFA_FontData::GetColor() const { CXFA_FillData fillData(m_pNode->GetChild(0, XFA_Element::Fill, false)); return fillData.HasValidNode() ? fillData.GetColor(true) : 0xFF000000; } |