From 94ed4456bfe64ea045be24c66966d814b73fa7ac Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 13 Dec 2017 01:20:24 +0000 Subject: Move remaining Script_ methods 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_* from CJX_Node to CJX_Object. Change-Id: I9f063c9d796896ba34be802a8ef8f108911ed56c Reviewed-on: https://pdfium-review.googlesource.com/20972 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/parser/xfa_basic_data_element_script.cpp | 72 +++++++++++------------ 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'xfa/fxfa') diff --git a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp index 3e22316daf..a56ba19d7a 100644 --- a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp @@ -11,7 +11,6 @@ #include "fxjs/xfa/cjx_hostpseudomodel.h" #include "fxjs/xfa/cjx_layoutpseudomodel.h" #include "fxjs/xfa/cjx_logpseudomodel.h" -#include "fxjs/xfa/cjx_node.h" #include "fxjs/xfa/cjx_object.h" #include "fxjs/xfa/cjx_signaturepseudomodel.h" #include "fxjs/xfa/cjx_tree.h" @@ -420,7 +419,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { {0xf6b47749, L"lock", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_BOOL, XFA_Attribute::Lock, XFA_ScriptType::Basic}, - {0x2d574d58, L"this", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Xfa_This, + {0x2d574d58, L"this", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Xfa_This, XFA_Attribute::Unknown, XFA_ScriptType::Object}, {0x4fdc3454, L"timeStamp", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -777,13 +776,13 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_BOOL, XFA_Attribute::Lock, XFA_ScriptType::Basic}, {0x6c0d9600, L"currentValue", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Delta_CurrentValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Delta_CurrentValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x942643f0, L"savedValue", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Delta_SavedValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Delta_SavedValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xc8da4da7, L"target", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Delta_Target, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Delta_Target, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbe52dfbf, L"desc", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1047,7 +1046,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_FillColor, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x54c399e3, L"formattedValue", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_FormattedValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Field_FormattedValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x570ce835, L"presence", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1059,7 +1058,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_FontColor, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x6826c408, L"parentSubform", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_ParentSubform, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Field_ParentSubform, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x79b67434, L"mandatoryMessage", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_MandatoryMessage, @@ -1095,7 +1094,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xa60dd202, L"length", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_Length, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Field_Length, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xac06e2b0, L"colSpan", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1116,10 +1115,10 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_ValidationMessage, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xdcecd663, L"editValue", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_EditValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Field_EditValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xe07e5061, L"selectedIndex", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_SelectedIndex, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Field_SelectedIndex, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xf65e34be, L"borderWidth", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_BorderWidth, @@ -1293,7 +1292,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Use, XFA_ScriptType::Basic}, {0xf23332f, L"errorText", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ExclGroup_ErrorText, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_ExclGroup_ErrorText, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x1abbd7e0, L"dataNode", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DataNode, @@ -1332,7 +1331,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Layout, XFA_ScriptType::Basic}, {0x846599f8, L"transient", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ExclGroup_Transient, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_ExclGroup_Transient, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x85fd6faf, L"mandatory", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_Mandatory, @@ -1341,10 +1340,10 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Relevant, XFA_ScriptType::Basic}, {0xa03cf627, L"rawValue", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ExclGroup_DefaultAndRawValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_ExclGroup_DefaultAndRawValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ExclGroup_DefaultAndRawValue, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_ExclGroup_DefaultAndRawValue, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xac06e2b0, L"colSpan", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1565,7 +1564,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::MergeMode, XFA_ScriptType::Basic}, {0x9f3e9510, L"instanceManager", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Subform_InstanceManager, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Subform_InstanceManager, XFA_Attribute::Unknown, XFA_ScriptType::Object}, {0xac06e2b0, L"colSpan", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1574,7 +1573,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Usehref, XFA_ScriptType::Basic}, {0xbc8fa350, L"locale", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Subform_Locale, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Subform_Locale, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xc2bd40fd, L"anchorType", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1616,7 +1615,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Type, XFA_ScriptType::Basic}, {0x5a50e9e6, L"version", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Handler_Version, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Handler_Version, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -1701,7 +1700,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Lock, XFA_ScriptType::Basic}, {0x7d9fd7c5, L"mode", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_SubmitFormat_Mode, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_SubmitFormat_Mode, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbe52dfbf, L"desc", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -2076,7 +2075,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::RunAt, XFA_ScriptType::Basic}, {0xa021b738, L"stateless", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Script_Stateless, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Script_Stateless, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xa52682bd, L"{default}", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, @@ -2328,13 +2327,13 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Usehref, XFA_ScriptType::Basic}, {0xb3543a6, L"max", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_InstanceManager_Max, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_InstanceManager_Max, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xb356ca4, L"min", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_InstanceManager_Min, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_InstanceManager_Min, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x6f544d49, L"count", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_InstanceManager_Count, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_InstanceManager_Count, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x25363, L"to", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -2586,7 +2585,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Use, XFA_ScriptType::Basic}, {0x28dee6e9, L"format", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Encrypt_Format, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Encrypt_Format, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -2786,7 +2785,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Overline, XFA_ScriptType::Basic}, {0xaf754613, L"checksum", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Form_Checksum, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Form_Checksum, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbe52dfbf, L"desc", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -2929,7 +2928,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Use, XFA_ScriptType::Basic}, - {0x2f16a382, L"type", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Extras_Type, + {0x2f16a382, L"type", + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Extras_Type, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -3001,7 +3001,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_BOOL, XFA_Attribute::Lock, XFA_ScriptType::Basic}, {0x97be91b, L"content", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Packet_Content, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Packet_Content, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -3161,7 +3161,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { XFA_Attribute::Hand, XFA_ScriptType::Basic}, {0xa60dd202, L"length", (XFA_ATTRIBUTE_CALLBACK)&CJX_List::length, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, - {0x20146, L"db", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Source_Db, + {0x20146, L"db", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Source_Db, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -3169,9 +3169,9 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Usehref, XFA_ScriptType::Basic}, - {0xb3543a6, L"max", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Occur_Max, + {0xb3543a6, L"max", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Occur_Max, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, - {0xb356ca4, L"min", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Occur_Min, + {0xb356ca4, L"min", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Occur_Min, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, @@ -3265,25 +3265,25 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { {0x21aed, L"id", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Attribute_String, XFA_Attribute::Id, XFA_ScriptType::Basic}, - {0x234a1, L"ns", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_Ns, + {0x234a1, L"ns", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_NodeClass_Ns, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0x50d1a9d1, L"model", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_Model, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_NodeClass_Model, XFA_Attribute::Unknown, XFA_ScriptType::Object}, {0xacb4823f, L"isContainer", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_IsContainer, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_NodeClass_IsContainer, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xe372ae97, L"isNull", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_IsNull, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_NodeClass_IsNull, XFA_Attribute::Unknown, XFA_ScriptType::Basic}, {0xfe612a5b, L"oneOfChild", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_OneOfChild, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_NodeClass_OneOfChild, XFA_Attribute::Unknown, XFA_ScriptType::Object}, {0x97c1c65, L"context", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ModelClass_Context, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_ModelClass_Context, XFA_Attribute::Unknown, XFA_ScriptType::Object}, {0x58be2870, L"aliasNode", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ModelClass_AliasNode, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_ModelClass_AliasNode, XFA_Attribute::Unknown, XFA_ScriptType::Object}, {0xa52682bd, L"{default}", (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_Som_DefaultValue, -- cgit v1.2.3