diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-12-12 18:25:18 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-12 18:25:18 +0000 |
| commit | 3c78c03813f040640a15efe6d1646d21cb73b773 (patch) | |
| tree | 64bf1bc7791f4416b17627e534b027dd9e2df62b /fxjs | |
| parent | f7aa204aafe97505b98f38a7b52a74f5e2a59a8e (diff) | |
| download | pdfium-3c78c03813f040640a15efe6d1646d21cb73b773.tar.xz | |
Move Script_Attribute_BOOL to CJX_Object
The CJX_Node isn't the root of the CJX hierarchy. This causes issues
now that CJX_Object has child objects which don't inherit from CJX_Node.
This CL moves Script_Attribute_BOOL from CJX_Node to CJX_Object.
Change-Id: I0e5509f49c77897cb17a01fb9fa3abf0cb6074ae
Reviewed-on: https://pdfium-review.googlesource.com/20970
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fxjs')
| -rw-r--r-- | fxjs/xfa/cjx_node.cpp | 10 | ||||
| -rw-r--r-- | fxjs/xfa/cjx_node.h | 3 | ||||
| -rw-r--r-- | fxjs/xfa/cjx_object.cpp | 10 | ||||
| -rw-r--r-- | fxjs/xfa/cjx_object.h | 3 |
4 files changed, 13 insertions, 13 deletions
diff --git a/fxjs/xfa/cjx_node.cpp b/fxjs/xfa/cjx_node.cpp index 7627a3f783..1117a67ef3 100644 --- a/fxjs/xfa/cjx_node.cpp +++ b/fxjs/xfa/cjx_node.cpp @@ -615,16 +615,6 @@ void CJX_Node::Script_Attribute_IntegerRead(CFXJSE_Value* pValue, pValue->SetInteger(GetInteger(eAttribute)); } -void CJX_Node::Script_Attribute_BOOL(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute) { - if (bSetting) { - SetBoolean(eAttribute, pValue->ToBoolean(), true); - return; - } - pValue->SetString(GetBoolean(eAttribute) ? "1" : "0"); -} - void CJX_Node::Script_Attribute_BOOLRead(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute) { diff --git a/fxjs/xfa/cjx_node.h b/fxjs/xfa/cjx_node.h index f521971519..a7310c65b4 100644 --- a/fxjs/xfa/cjx_node.h +++ b/fxjs/xfa/cjx_node.h @@ -114,9 +114,6 @@ class CJX_Node : public CJX_Tree { void Script_Attribute_IntegerRead(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute); - void Script_Attribute_BOOL(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute); void Script_Attribute_BOOLRead(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute); diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp index 566eb1cbca..10c6078f17 100644 --- a/fxjs/xfa/cjx_object.cpp +++ b/fxjs/xfa/cjx_object.cpp @@ -873,3 +873,13 @@ void CJX_Object::Script_Attribute_String(CFXJSE_Value* pValue, GetDocument()->RemovePurgeNode(pProtoForm.get()); } + +void CJX_Object::Script_Attribute_BOOL(CFXJSE_Value* pValue, + bool bSetting, + XFA_Attribute eAttribute) { + if (bSetting) { + SetBoolean(eAttribute, pValue->ToBoolean(), true); + return; + } + pValue->SetString(GetBoolean(eAttribute) ? "1" : "0"); +} diff --git a/fxjs/xfa/cjx_object.h b/fxjs/xfa/cjx_object.h index e006b390cc..c16424fa3c 100644 --- a/fxjs/xfa/cjx_object.h +++ b/fxjs/xfa/cjx_object.h @@ -78,6 +78,9 @@ class CJX_Object { void Script_Attribute_String(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute); + void Script_Attribute_BOOL(CFXJSE_Value* pValue, + bool bSetting, + XFA_Attribute eAttribute); pdfium::Optional<int32_t> TryInteger(XFA_Attribute eAttr, bool bUseDefault); bool SetInteger(XFA_Attribute eAttr, int32_t iValue, bool bNotify); |