summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/cxfa_scriptdata.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-21 22:02:20 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-21 22:02:20 +0000
commit307dfb406422f9589fcdb09039b4c31a9c5f6269 (patch)
tree7d176d1f37af77877cfb2714e5ea415f344ba9db /xfa/fxfa/parser/cxfa_scriptdata.cpp
parent96d6f741b3c106ba0e48a05692910f64cf1e5e09 (diff)
downloadpdfium-307dfb406422f9589fcdb09039b4c31a9c5f6269.tar.xz
Cleanup CXFA_ScriptData
This CL cleans removes out params, makes methods const and moves the XFA_ScriptDataType into CXFA_ScriptData. Change-Id: I5a51a0eddc3608577a387472911000daa479af0f Reviewed-on: https://pdfium-review.googlesource.com/19090 Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_scriptdata.cpp')
-rw-r--r--xfa/fxfa/parser/cxfa_scriptdata.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/xfa/fxfa/parser/cxfa_scriptdata.cpp b/xfa/fxfa/parser/cxfa_scriptdata.cpp
index 39d9a4b8c9..40a22b672d 100644
--- a/xfa/fxfa/parser/cxfa_scriptdata.cpp
+++ b/xfa/fxfa/parser/cxfa_scriptdata.cpp
@@ -10,22 +10,20 @@
CXFA_ScriptData::CXFA_ScriptData(CXFA_Node* pNode) : CXFA_DataData(pNode) {}
-XFA_ScriptDataType CXFA_ScriptData::GetContentType() {
+CXFA_ScriptData::Type CXFA_ScriptData::GetContentType() const {
pdfium::Optional<WideString> cData =
m_pNode->JSNode()->TryCData(XFA_Attribute::ContentType, false);
- if (!cData)
- return XFA_ScriptDataType::Formcalc;
+ if (!cData || *cData == L"application/x-formcalc")
+ return Type::Formcalc;
if (*cData == L"application/x-javascript")
- return XFA_ScriptDataType::Javascript;
- if (*cData == L"application/x-formcalc")
- return XFA_ScriptDataType::Formcalc;
- return XFA_ScriptDataType::Unknown;
+ return Type::Javascript;
+ return Type::Unknown;
}
-int32_t CXFA_ScriptData::GetRunAt() {
+XFA_ATTRIBUTEENUM CXFA_ScriptData::GetRunAt() const {
return m_pNode->JSNode()->GetEnum(XFA_Attribute::RunAt);
}
-void CXFA_ScriptData::GetExpression(WideString& wsExpression) {
- wsExpression = m_pNode->JSNode()->GetContent(false);
+WideString CXFA_ScriptData::GetExpression() const {
+ return m_pNode->JSNode()->GetContent(false);
}