3 files changed, 29 insertions, 12 deletions

diff --git a/fxjs/xfa/cjx_node.cpp b/fxjs/xfa/cjx_node.cpp
index 1216177f02..e64f1fd5e7 100644
--- a/fxjs/xfa/cjx_node.cpp
+++ b/fxjs/xfa/cjx_node.cpp
@@ -163,8 +163,8 @@ CJS_Return CJX_Node::getElement(
   WideString expression = runtime->ToWideString(params[0]);
   int32_t iValue = params.size() >= 2 ? runtime->ToInt32(params[1]) : 0;
 
-  CXFA_Node* pNode =
-      GetProperty(iValue, CXFA_Node::NameToElement(expression), true);
+  CXFA_Node* pNode = GetProperty<CXFA_Node>(
+      iValue, CXFA_Node::NameToElement(expression), true);
   CFXJSE_Value* value =
       GetDocument()->GetScriptContext()->GetJSValueFromMap(pNode);
   if (!value)
@@ -186,12 +186,12 @@ CJS_Return CJX_Node::isPropertySpecified(
   bool bParent = params.size() < 2 || runtime->ToBoolean(params[1]);
   int32_t iIndex = params.size() == 3 ? runtime->ToInt32(params[2]) : 0;
   XFA_Element eType = CXFA_Node::NameToElement(expression);
-  bool bHas = !!GetProperty(iIndex, eType, true);
+  bool bHas = !!GetProperty<CXFA_Node>(iIndex, eType, true);
   if (!bHas && bParent && GetXFANode()->GetParent()) {
     // Also check on the parent.
     auto* jsnode = GetXFANode()->GetParent()->JSObject();
     bHas = jsnode->HasAttribute(attr) ||
-           !!jsnode->GetProperty(iIndex, eType, true);
+           !!jsnode->GetProperty<CXFA_Node>(iIndex, eType, true);
   }
   return CJS_Return(runtime->NewBoolean(bHas));
 }
diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp
index fcf77d434d..304b861dcf 100644
--- a/fxjs/xfa/cjx_object.cpp
+++ b/fxjs/xfa/cjx_object.cpp
@@ -619,7 +619,8 @@ bool CJX_Object::SetContent(const WideString& wsContent,
   switch (ToNode(GetXFAObject())->GetObjectType()) {
     case XFA_ObjectType::ContainerNode: {
       if (XFA_FieldIsMultiListBox(ToNode(GetXFAObject()))) {
-        CXFA_Node* pValue = GetProperty(0, XFA_Element::Value, true);
+        CXFA_Value* pValue =
+            GetProperty<CXFA_Value>(0, XFA_Element::Value, true);
         if (!pValue)
           break;
 
@@ -703,7 +704,8 @@ bool CJX_Object::SetContent(const WideString& wsContent,
       if (ToNode(GetXFAObject())->GetElementType() == XFA_Element::ExclGroup) {
         pNode = ToNode(GetXFAObject());
       } else {
-        CXFA_Node* pValue = GetProperty(0, XFA_Element::Value, true);
+        CXFA_Value* pValue =
+            GetProperty<CXFA_Value>(0, XFA_Element::Value, true);
         if (!pValue)
           break;
 
@@ -898,9 +900,9 @@ pdfium::Optional<WideString> CJX_Object::TryNamespace() {
   return {static_cast<CFX_XMLElement*>(pXMLNode)->GetNamespaceURI()};
 }
 
-CXFA_Node* CJX_Object::GetProperty(int32_t index,
-                                   XFA_Element eProperty,
-                                   bool bCreateProperty) {
+CXFA_Node* CJX_Object::GetPropertyInternal(int32_t index,
+                                           XFA_Element eProperty,
+                                           bool bCreateProperty) {
   if (index < 0 ||
       index >= ToNode(GetXFAObject())->PropertyOccuranceCount(eProperty)) {
     return nullptr;
diff --git a/fxjs/xfa/cjx_object.h b/fxjs/xfa/cjx_object.h
index cf2ede7abf..f6ce3ccfb8 100644
--- a/fxjs/xfa/cjx_object.h
+++ b/fxjs/xfa/cjx_object.h
@@ -101,9 +101,10 @@ class CJX_Object {
                   bool bSyncData);
   WideString GetContent(bool bScriptModify);
 
-  CXFA_Node* GetProperty(int32_t index,
-                         XFA_Element eType,
-                         bool bCreateProperty);
+  template <typename T>
+  T* GetProperty(int32_t index, XFA_Element eType, bool bCreateProperty) {
+    return static_cast<T*>(GetPropertyInternal(index, eType, bCreateProperty));
+  }
 
   void SetAttributeValue(const WideString& wsValue,
                          const WideString& wsXMLValue,
@@ -222,6 +223,20 @@ class CJX_Object {
   void ThrowException(const wchar_t* str, ...) const;
 
  private:
+  void Script_Boolean_DefaultValue(CFXJSE_Value* pValue,
+                                   bool bSetting,
+                                   XFA_Attribute eAttribute);
+  void Script_Draw_DefaultValue(CFXJSE_Value* pValue,
+                                bool bSetting,
+                                XFA_Attribute eAttribute);
+  void Script_Field_DefaultValue(CFXJSE_Value* pValue,
+                                 bool bSetting,
+                                 XFA_Attribute eAttribute);
+
+  CXFA_Node* GetPropertyInternal(int32_t index,
+                                 XFA_Element eType,
+                                 bool bCreateProperty);
+
   void OnChanged(XFA_Attribute eAttr, bool bNotify, bool bScriptModify);
   void OnChanging(XFA_Attribute eAttr, bool bNotify);
   bool SetUserData(void* pKey,