4 files changed, 8 insertions, 13 deletions
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index fc8b0fa888..127c258d04 100644
--- a/xfa/fwl/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -228,7 +228,7 @@ void CFWL_Edit::DrawSpellCheck(CXFA_Graphics* pGraphics,
     CFX_RectF rtClip = m_rtEngine;
     CFX_Matrix mt(1, 0, 0, 1, fOffSetX, fOffSetY);
     if (pMatrix) {
-      pMatrix->TransformRect(rtClip);
+      rtClip = pMatrix->TransformRect(rtClip);
       mt.Concat(*pMatrix);
     }
     pGraphics->SetClipRect(rtClip);
@@ -511,7 +511,7 @@ void CFWL_Edit::DrawContent(CXFA_Graphics* pGraphics,
   float fOffSetY = m_rtEngine.top - m_fScrollOffsetY + m_fVAlignOffset;
   CFX_Matrix mt(1, 0, 0, 1, fOffSetX, fOffSetY);
   if (pMatrix) {
-    pMatrix->TransformRect(rtClip);
+    rtClip = pMatrix->TransformRect(rtClip);
     mt.Concat(*pMatrix);
   }
 
@@ -609,7 +609,7 @@ void CFWL_Edit::RenderText(CFX_RenderDevice* pRenderDev,
     rtDocClip.width = static_cast<float>(pRenderDev->GetWidth());
     rtDocClip.height = static_cast<float>(pRenderDev->GetHeight());
   }
-  mt.GetInverse().TransformRect(rtDocClip);
+  rtDocClip = mt.GetInverse().TransformRect(rtDocClip);
 
   std::vector<FXTEXT_CHARPOS> char_pos;
 
@@ -1130,8 +1130,7 @@ void CFWL_Edit::ShowCaret(CFX_RectF* pRect) {
   if (!pDocEnvironment)
     return;
 
-  CFX_RectF rt(*pRect);
-  pXFAWidget->GetRotateMatrix().TransformRect(rt);
+  CFX_RectF rt = pXFAWidget->GetRotateMatrix().TransformRect(*pRect);
   pDocEnvironment->DisplayCaret(pXFAWidget, true, &rt);
 }
 
diff --git a/xfa/fwl/cfwl_listbox.cpp b/xfa/fwl/cfwl_listbox.cpp
index ce1c0133f9..210ec1f06e 100644
--- a/xfa/fwl/cfwl_listbox.cpp
+++ b/xfa/fwl/cfwl_listbox.cpp
@@ -107,9 +107,8 @@ void CFWL_ListBox::DrawWidget(CXFA_Graphics* pGraphics,
     rtClip.height -= m_fScorllBarWidth;
   if (IsShowScrollBar(true))
     rtClip.width -= m_fScorllBarWidth;
-  matrix.TransformRect(rtClip);
 
-  pGraphics->SetClipRect(rtClip);
+  pGraphics->SetClipRect(matrix.TransformRect(rtClip));
   if ((m_pProperties->m_dwStyles & FWL_WGTSTYLE_NoBackground) == 0)
     DrawBkground(pGraphics, pTheme, &matrix);
 
diff --git a/xfa/fwl/cfwl_spinbutton.cpp b/xfa/fwl/cfwl_spinbutton.cpp
index 3119c7517a..f4ca339089 100644
--- a/xfa/fwl/cfwl_spinbutton.cpp
+++ b/xfa/fwl/cfwl_spinbutton.cpp
@@ -83,9 +83,6 @@ void CFWL_SpinButton::DrawWidget(CXFA_Graphics* pGraphics,
   if (!pGraphics)
     return;
 
-  CFX_RectF rtClip(m_rtClient);
-  matrix.TransformRect(rtClip);
-
   IFWL_ThemeProvider* pTheme = GetAvailableTheme();
   if (HasBorder())
     DrawBorder(pGraphics, CFWL_Part::Border, pTheme, matrix);
diff --git a/xfa/fwl/cfwl_widgetmgr.cpp b/xfa/fwl/cfwl_widgetmgr.cpp
index f5beb411e6..d3f2dd4655 100644
--- a/xfa/fwl/cfwl_widgetmgr.cpp
+++ b/xfa/fwl/cfwl_widgetmgr.cpp
@@ -514,8 +514,8 @@ bool CFWL_WidgetMgr::IsNeedRepaint(CFWL_Widget* pWidget,
     return true;
   }
 
-  CFX_RectF rtWidget(0, 0, pWidget->GetWidgetRect().Size());
-  pMatrix->TransformRect(rtWidget);
+  CFX_RectF rtWidget =
+      pMatrix->TransformRect(CFX_RectF(0, 0, pWidget->GetWidgetRect().Size()));
   if (!rtWidget.IntersectWith(rtDirty))
     return false;
 
@@ -593,7 +593,7 @@ bool CFWL_WidgetMgr::IsNeedRepaint(CFWL_Widget* pWidget,
   if (repaintPoint > 0)
     return true;
 
-  pMatrix->TransformRect(rtChilds);
+  rtChilds = pMatrix->TransformRect(rtChilds);
   if (rtChilds.Contains(rtDirty) || rtChilds.Contains(rtWidget))
     return false;
   return true;