2 files changed, 12 insertions, 18 deletions

diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp
index ff28e574e8..aee5a8a9ac 100644
--- a/xfa/fxfa/cxfa_fffield.cpp
+++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -108,8 +108,8 @@ void CXFA_FFField::DrawFocus(CXFA_Graphics* pGS, CFX_Matrix* pMatrix) {
 
   pGS->SetStrokeColor(CXFA_GEColor(0xFF000000));
 
-  float DashPattern[2] = {1, 1};
-  pGS->SetLineDash(0.0f, DashPattern, 2);
+  static constexpr float kDashPattern[2] = {1, 1};
+  pGS->SetLineDash(0.0f, kDashPattern, FX_ArraySize(kDashPattern));
   pGS->SetLineWidth(0);
 
   CXFA_GEPath path;
@@ -348,12 +348,10 @@ void CXFA_FFField::SetFWLRect() {
     return;
 
   CFX_RectF rtUi = m_rtUI;
-  if (rtUi.width < 1.0)
-    rtUi.width = 1.0;
+  rtUi.width = std::max(rtUi.width, 1.0f);
   if (!GetDoc()->GetXFADoc()->IsInteractive()) {
     float fFontSize = m_pNode->GetFontSize();
-    if (rtUi.height < fFontSize)
-      rtUi.height = fFontSize;
+    rtUi.height = std::max(rtUi.height, fFontSize);
   }
   m_pNormalWidget->SetWidgetRect(rtUi);
 }
@@ -587,10 +585,8 @@ void CXFA_FFField::LayoutCaption() {
   if (!pCapTextLayout)
     return;
 
-  float fHeight =
-      pCapTextLayout->Layout(CFX_SizeF(m_rtCaption.width, m_rtCaption.height));
-  if (m_rtCaption.height < fHeight)
-    m_rtCaption.height = fHeight;
+  float fHeight = pCapTextLayout->Layout(m_rtCaption.Size());
+  m_rtCaption.height = std::max(m_rtCaption.height, fHeight);
 }
 
 void CXFA_FFField::RenderCaption(CXFA_Graphics* pGS, CFX_Matrix* pMatrix) {
@@ -603,7 +599,7 @@ void CXFA_FFField::RenderCaption(CXFA_Graphics* pGS, CFX_Matrix* pMatrix) {
     return;
 
   if (!pCapTextLayout->IsLoaded())
-    pCapTextLayout->Layout(CFX_SizeF(m_rtCaption.width, m_rtCaption.height));
+    pCapTextLayout->Layout(m_rtCaption.Size());
 
   CFX_RectF rtClip = m_rtCaption;
   rtClip.Intersect(GetRectWithoutRotate());
@@ -675,9 +671,7 @@ int32_t CXFA_FFField::CalculateNode(CXFA_Node* pNode) {
     case XFA_AttributeEnum::Warning: {
       if (version <= XFA_VERSION_204) {
         CXFA_Script* script = calc->GetScriptIfExists();
-        if (!script)
-          return 1;
-        if (script->GetExpression().IsEmpty())
+        if (!script || script->GetExpression().IsEmpty())
           return 1;
       }
 
diff --git a/xfa/fxfa/parser/cxfa_stroke.cpp b/xfa/fxfa/parser/cxfa_stroke.cpp
index 9d5916a8a3..a19dd3ce3b 100644
--- a/xfa/fxfa/parser/cxfa_stroke.cpp
+++ b/xfa/fxfa/parser/cxfa_stroke.cpp
@@ -26,7 +26,7 @@ void XFA_StrokeTypeSetLineDash(CXFA_Graphics* pGraphics,
         dashArray[1] = 2;
         dashArray[3] = 2;
       }
-      pGraphics->SetLineDash(0, dashArray, 4);
+      pGraphics->SetLineDash(0, dashArray, FX_ArraySize(dashArray));
       break;
     }
     case XFA_AttributeEnum::DashDotDot: {
@@ -36,7 +36,7 @@ void XFA_StrokeTypeSetLineDash(CXFA_Graphics* pGraphics,
         dashArray[3] = 2;
         dashArray[5] = 2;
       }
-      pGraphics->SetLineDash(0, dashArray, 6);
+      pGraphics->SetLineDash(0, dashArray, FX_ArraySize(dashArray));
       break;
     }
     case XFA_AttributeEnum::Dashed: {
@@ -44,7 +44,7 @@ void XFA_StrokeTypeSetLineDash(CXFA_Graphics* pGraphics,
       if (iCapType != XFA_AttributeEnum::Butt)
         dashArray[1] = 2;
 
-      pGraphics->SetLineDash(0, dashArray, 2);
+      pGraphics->SetLineDash(0, dashArray, FX_ArraySize(dashArray));
       break;
     }
     case XFA_AttributeEnum::Dotted: {
@@ -52,7 +52,7 @@ void XFA_StrokeTypeSetLineDash(CXFA_Graphics* pGraphics,
       if (iCapType != XFA_AttributeEnum::Butt)
         dashArray[1] = 2;
 
-      pGraphics->SetLineDash(0, dashArray, 2);
+      pGraphics->SetLineDash(0, dashArray, FX_ArraySize(dashArray));
       break;
     }
     default: