1 files changed, 14 insertions, 12 deletions

diff --git a/xfa/fxfa/parser/cxfa_font.cpp b/xfa/fxfa/parser/cxfa_font.cpp
index 71aa61700f..023a34b387 100644
--- a/xfa/fxfa/parser/cxfa_font.cpp
+++ b/xfa/fxfa/parser/cxfa_font.cpp
@@ -14,26 +14,28 @@
 CXFA_Font::CXFA_Font(CXFA_Node* pNode) : CXFA_Data(pNode) {}
 
 float CXFA_Font::GetBaselineShift() {
-  return m_pNode->GetMeasure(XFA_ATTRIBUTE_BaselineShift).ToUnit(XFA_UNIT_Pt);
+  return m_pNode->JSNode()
+      ->GetMeasure(XFA_ATTRIBUTE_BaselineShift)
+      .ToUnit(XFA_UNIT_Pt);
 }
 
 float CXFA_Font::GetHorizontalScale() {
   WideString wsValue;
-  m_pNode->TryCData(XFA_ATTRIBUTE_FontHorizontalScale, wsValue);
+  m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_FontHorizontalScale, wsValue);
   int32_t iScale = FXSYS_wtoi(wsValue.c_str());
   return iScale > 0 ? (float)iScale : 100.0f;
 }
 
 float CXFA_Font::GetVerticalScale() {
   WideString wsValue;
-  m_pNode->TryCData(XFA_ATTRIBUTE_FontVerticalScale, wsValue);
+  m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_FontVerticalScale, wsValue);
   int32_t iScale = FXSYS_wtoi(wsValue.c_str());
   return iScale > 0 ? (float)iScale : 100.0f;
 }
 
 float CXFA_Font::GetLetterSpacing() {
   WideStringView wsValue;
-  if (!m_pNode->TryCData(XFA_ATTRIBUTE_LetterSpacing, wsValue))
+  if (!m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_LetterSpacing, wsValue))
     return 0;
 
   CXFA_Measurement ms(wsValue);
@@ -44,46 +46,46 @@ float CXFA_Font::GetLetterSpacing() {
 
 int32_t CXFA_Font::GetLineThrough() {
   int32_t iValue = 0;
-  m_pNode->TryInteger(XFA_ATTRIBUTE_LineThrough, iValue);
+  m_pNode->JSNode()->TryInteger(XFA_ATTRIBUTE_LineThrough, iValue);
   return iValue;
 }
 
 int32_t CXFA_Font::GetUnderline() {
   int32_t iValue = 0;
-  m_pNode->TryInteger(XFA_ATTRIBUTE_Underline, iValue);
+  m_pNode->JSNode()->TryInteger(XFA_ATTRIBUTE_Underline, iValue);
   return iValue;
 }
 
 int32_t CXFA_Font::GetUnderlinePeriod() {
   XFA_ATTRIBUTEENUM eAttr = XFA_ATTRIBUTEENUM_All;
-  m_pNode->TryEnum(XFA_ATTRIBUTE_UnderlinePeriod, eAttr);
+  m_pNode->JSNode()->TryEnum(XFA_ATTRIBUTE_UnderlinePeriod, eAttr);
   return eAttr;
 }
 
 float CXFA_Font::GetFontSize() {
   CXFA_Measurement ms;
-  m_pNode->TryMeasure(XFA_ATTRIBUTE_Size, ms);
+  m_pNode->JSNode()->TryMeasure(XFA_ATTRIBUTE_Size, ms);
   return ms.ToUnit(XFA_UNIT_Pt);
 }
 
 void CXFA_Font::GetTypeface(WideStringView& wsTypeFace) {
-  m_pNode->TryCData(XFA_ATTRIBUTE_Typeface, wsTypeFace);
+  m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Typeface, wsTypeFace);
 }
 
 bool CXFA_Font::IsBold() {
   XFA_ATTRIBUTEENUM eAttr = XFA_ATTRIBUTEENUM_Normal;
-  m_pNode->TryEnum(XFA_ATTRIBUTE_Weight, eAttr);
+  m_pNode->JSNode()->TryEnum(XFA_ATTRIBUTE_Weight, eAttr);
   return eAttr == XFA_ATTRIBUTEENUM_Bold;
 }
 
 bool CXFA_Font::IsItalic() {
   XFA_ATTRIBUTEENUM eAttr = XFA_ATTRIBUTEENUM_Normal;
-  m_pNode->TryEnum(XFA_ATTRIBUTE_Posture, eAttr);
+  m_pNode->JSNode()->TryEnum(XFA_ATTRIBUTE_Posture, eAttr);
   return eAttr == XFA_ATTRIBUTEENUM_Italic;
 }
 
 void CXFA_Font::SetColor(FX_ARGB color) {
-  CXFA_Fill fill(m_pNode->GetProperty(0, XFA_Element::Fill));
+  CXFA_Fill fill(m_pNode->JSNode()->GetProperty(0, XFA_Element::Fill));
   fill.SetColor(color);
 }