summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/cxfa_fontdata.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-12-13 18:29:02 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-12-13 18:29:02 +0000
commit2614250d4f11ed02033a7da095a1694ece12ab78 (patch)
treecc41c5770c17ea47537856991fa44cd1e2acfeb8 /xfa/fxfa/parser/cxfa_fontdata.cpp
parent14768f3264a4cff8ca0096a27e41f1861b2c422b (diff)
downloadpdfium-2614250d4f11ed02033a7da095a1694ece12ab78.tar.xz
Methods are on CJX_Object not CJX_Node now
This CL converts all of the JSNode() to JSObject() calls as all of the original CJX_Node methods have been moved to CJX_Object. This fixes potential bad casts from things like CJX_Content which do not inhert from CJX_Node. Bug: pdfium:793372 Change-Id: I6c7f63a78f3d47bb6bad74faed3fd8c535bf095e Reviewed-on: https://pdfium-review.googlesource.com/21090 Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_fontdata.cpp')
-rw-r--r--xfa/fxfa/parser/cxfa_fontdata.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/xfa/fxfa/parser/cxfa_fontdata.cpp b/xfa/fxfa/parser/cxfa_fontdata.cpp
index 7eda807c1c..c2b4a79fea 100644
--- a/xfa/fxfa/parser/cxfa_fontdata.cpp
+++ b/xfa/fxfa/parser/cxfa_fontdata.cpp
@@ -14,28 +14,28 @@
CXFA_FontData::CXFA_FontData(CXFA_Node* pNode) : CXFA_DataData(pNode) {}
float CXFA_FontData::GetBaselineShift() const {
- return m_pNode->JSNode()
+ return m_pNode->JSObject()
->GetMeasure(XFA_Attribute::BaselineShift)
.ToUnit(XFA_Unit::Pt);
}
float CXFA_FontData::GetHorizontalScale() const {
WideString wsValue =
- m_pNode->JSNode()->GetCData(XFA_Attribute::FontHorizontalScale);
+ m_pNode->JSObject()->GetCData(XFA_Attribute::FontHorizontalScale);
int32_t iScale = FXSYS_wtoi(wsValue.c_str());
return iScale > 0 ? (float)iScale : 100.0f;
}
float CXFA_FontData::GetVerticalScale() const {
WideString wsValue =
- m_pNode->JSNode()->GetCData(XFA_Attribute::FontVerticalScale);
+ m_pNode->JSObject()->GetCData(XFA_Attribute::FontVerticalScale);
int32_t iScale = FXSYS_wtoi(wsValue.c_str());
return iScale > 0 ? (float)iScale : 100.0f;
}
float CXFA_FontData::GetLetterSpacing() const {
WideString wsValue =
- m_pNode->JSNode()->GetCData(XFA_Attribute::LetterSpacing);
+ m_pNode->JSObject()->GetCData(XFA_Attribute::LetterSpacing);
CXFA_Measurement ms(wsValue.AsStringView());
if (ms.GetUnit() == XFA_Unit::Em)
return ms.GetValue() * GetFontSize();
@@ -43,41 +43,41 @@ float CXFA_FontData::GetLetterSpacing() const {
}
int32_t CXFA_FontData::GetLineThrough() const {
- return m_pNode->JSNode()->GetInteger(XFA_Attribute::LineThrough);
+ return m_pNode->JSObject()->GetInteger(XFA_Attribute::LineThrough);
}
int32_t CXFA_FontData::GetUnderline() const {
- return m_pNode->JSNode()->GetInteger(XFA_Attribute::Underline);
+ return m_pNode->JSObject()->GetInteger(XFA_Attribute::Underline);
}
XFA_AttributeEnum CXFA_FontData::GetUnderlinePeriod() const {
- return m_pNode->JSNode()
+ return m_pNode->JSObject()
->TryEnum(XFA_Attribute::UnderlinePeriod, true)
.value_or(XFA_AttributeEnum::All);
}
float CXFA_FontData::GetFontSize() const {
- return m_pNode->JSNode()
+ return m_pNode->JSObject()
->GetMeasure(XFA_Attribute::Size)
.ToUnit(XFA_Unit::Pt);
}
WideString CXFA_FontData::GetTypeface() const {
- return m_pNode->JSNode()->GetCData(XFA_Attribute::Typeface);
+ return m_pNode->JSObject()->GetCData(XFA_Attribute::Typeface);
}
bool CXFA_FontData::IsBold() const {
- return m_pNode->JSNode()->GetEnum(XFA_Attribute::Weight) ==
+ return m_pNode->JSObject()->GetEnum(XFA_Attribute::Weight) ==
XFA_AttributeEnum::Bold;
}
bool CXFA_FontData::IsItalic() const {
- return m_pNode->JSNode()->GetEnum(XFA_Attribute::Posture) ==
+ return m_pNode->JSObject()->GetEnum(XFA_Attribute::Posture) ==
XFA_AttributeEnum::Italic;
}
void CXFA_FontData::SetColor(FX_ARGB color) {
- CXFA_FillData(m_pNode->JSNode()->GetProperty(0, XFA_Element::Fill, true))
+ CXFA_FillData(m_pNode->JSObject()->GetProperty(0, XFA_Element::Fill, true))
.SetColor(color);
}