Cleanup CFWL_Widget code to return CFX_RectFs where appropriate

xfa/fwl/cfwl_edit.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/cfwl_edit.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 411 matching lines @@
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine) {
     CFWL_ScrollBar* pScroll = UpdateScroll();
     if (pScroll) {
       rtInvalid = pScroll->GetWidgetRect();
       bRepaintScroll = true;
     }
   }
   if (bRepaintContent || bRepaintScroll) {
     if (bRepaintContent)
       rtInvalid.Union(m_rtEngine);
-    Repaint(&rtInvalid);
+    RepaintRect(rtInvalid);
   }
 }
 
 void CFWL_Edit::OnTextChanged(const FDE_TXTEDT_TEXTCHANGE_INFO& ChangeInfo) {
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_VAlignMask)
     UpdateVAlignment();
 
-  CFX_RectF rtTemp;
-  GetClientRect(rtTemp);
-
   CFWL_EventTextChanged event(this);
   event.wsPrevText = ChangeInfo.wsPrevText;
   DispatchEvent(&event);
 
   LayoutScrollBar();
-  Repaint(&rtTemp);
+  RepaintRect(GetClientRect());
 }
 
 void CFWL_Edit::OnSelChanged() {
-  CFX_RectF rtTemp;
-  GetClientRect(rtTemp);
-  Repaint(&rtTemp);
+  RepaintRect(GetClientRect());
 }
 
 bool CFWL_Edit::OnPageLoad(int32_t nPageIndex) {
   IFDE_TxtEdtPage* pPage = m_EdtEngine.GetPage(nPageIndex);
   if (!pPage)
     return false;
 
   pPage->LoadPage(nullptr, nullptr);
   return true;
 }
@@ skipping 391 matching lines @@
 
 void CFWL_Edit::UpdateCaret() {
   CFX_RectF rtFDE;
   m_EdtEngine.GetCaretRect(rtFDE);
 
   rtFDE.Offset(m_rtEngine.left - m_fScrollOffsetX,
                m_rtEngine.top - m_fScrollOffsetY + m_fVAlignOffset);
   CFX_RectF rtCaret;
   rtCaret.Set(rtFDE.left, rtFDE.top, rtFDE.width, rtFDE.height);
 
-  CFX_RectF rtClient;
-  GetClientRect(rtClient);
+  CFX_RectF rtClient = GetClientRect();
   rtCaret.Intersect(rtClient);
-
   if (rtCaret.left > rtClient.right()) {
     FX_FLOAT right = rtCaret.right();
     rtCaret.left = rtClient.right() - 1;
     rtCaret.width = right - rtCaret.left;
   }
 
   if (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused && !rtCaret.IsEmpty())
     ShowCaret(&rtCaret);
   else
     HideCaret(&rtCaret);
@@ skipping 103 matching lines @@
     m_DoRecords.erase(m_DoRecords.begin() + m_iCurRecord + 1,
                       m_DoRecords.end());
   }
 
   m_DoRecords.push_back(std::move(pRecord));
   m_iCurRecord = pdfium::CollectionSize<int32_t>(m_DoRecords) - 1;
   return m_iCurRecord;
 }
 
 void CFWL_Edit::Layout() {
-  GetClientRect(m_rtClient);
+  m_rtClient = GetClientRect();
   m_rtEngine = m_rtClient;
   FX_FLOAT* pfWidth = static_cast<FX_FLOAT*>(
       GetThemeCapacity(CFWL_WidgetCapacity::ScrollBarWidth));
   if (!pfWidth)
     return;
 
   FX_FLOAT fWidth = *pfWidth;
   if (!m_pOuter) {
     CFX_RectF* pUIMargin = static_cast<CFX_RectF*>(
         GetThemeCapacity(CFWL_WidgetCapacity::UIMargin));
@@ skipping 151 matching lines @@
   prop->m_pThemeProvider = m_pProperties->m_pThemeProvider;
   m_pHorzScrollBar =
       pdfium::MakeUnique<CFWL_ScrollBar>(m_pOwnerApp, std::move(prop), this);
 }
 
 void CFWL_Edit::ShowCaret(CFX_RectF* pRect) {
   if (m_pCaret) {
     m_pCaret->ShowCaret();
     if (!pRect->IsEmpty())
       m_pCaret->SetWidgetRect(*pRect);
-    Repaint(&m_rtEngine);
+    RepaintRect(m_rtEngine);
     return;
   }
 
   CFWL_Widget* pOuter = this;
   pRect->Offset(m_pProperties->m_rtWidget.left, m_pProperties->m_rtWidget.top);
   while (pOuter->GetOuter()) {
     pOuter = pOuter->GetOuter();
 
     CFX_RectF rtOuter = pOuter->GetWidgetRect();
     pRect->Offset(rtOuter.left, rtOuter.top);
@@ skipping 13 matching lines @@
   pXFAWidget->GetRotateMatrix(mt);
 
   CFX_RectF rt(*pRect);
   mt.TransformRect(rt);
   pDocEnvironment->DisplayCaret(pXFAWidget, true, &rt);
 }
 
 void CFWL_Edit::HideCaret(CFX_RectF* pRect) {
   if (m_pCaret) {
     m_pCaret->HideCaret();
-    Repaint(&m_rtEngine);
+    RepaintRect(m_rtEngine);
     return;
   }
 
   CFWL_Widget* pOuter = this;
   while (pOuter->GetOuter())
     pOuter = pOuter->GetOuter();
 
   CXFA_FFWidget* pXFAWidget =
       static_cast<CXFA_FFWidget*>(pOuter->GetLayoutItem());
   if (!pXFAWidget)
@@ skipping 174 matching lines @@
     ClearRecord();
   }
 
   LayoutScrollBar();
   if (!bRepaint)
     return;
 
   CFX_RectF rtInvalidate;
   rtInvalidate.Set(0, 0, m_pProperties->m_rtWidget.width,
                    m_pProperties->m_rtWidget.height);
-  Repaint(&rtInvalidate);
+  RepaintRect(rtInvalidate);
 }
 
 void CFWL_Edit::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   if (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled)
     return;
 
   m_bLButtonDown = true;
   SetGrab(true);
   DoButtonDown(pMsg);
   int32_t nIndex = m_EdtEngine.GetCaretPos();
   bool bRepaint = false;
   if (m_EdtEngine.CountSelRanges() > 0) {
     m_EdtEngine.ClearSelection();
     bRepaint = true;
   }
 
   if ((pMsg->m_dwFlags & FWL_KEYFLAG_Shift) && m_nSelStart != nIndex) {
     int32_t iStart = std::min(m_nSelStart, nIndex);
     int32_t iEnd = std::max(m_nSelStart, nIndex);
     m_EdtEngine.AddSelRange(iStart, iEnd - iStart);
     bRepaint = true;
   } else {
     m_nSelStart = nIndex;
   }
   if (bRepaint)
-    Repaint(&m_rtEngine);
+    RepaintRect(m_rtEngine);
 }
 
 void CFWL_Edit::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   m_bLButtonDown = false;
   SetGrab(false);
 }
 
 void CFWL_Edit::OnButtonDblClk(CFWL_MessageMouse* pMsg) {
   IFDE_TxtEdtPage* pPage = m_EdtEngine.GetPage(0);
   if (!pPage)
     return;
 
   CFX_PointF pt(pMsg->m_fx, pMsg->m_fy);
   DeviceToEngine(pt);
   int32_t nCount = 0;
   int32_t nIndex = pPage->SelectWord(pt, nCount);
   if (nIndex < 0)
     return;
 
   m_EdtEngine.AddSelRange(nIndex, nCount);
   m_EdtEngine.SetCaretPos(nIndex + nCount - 1, false);
-  Repaint(&m_rtEngine);
+  RepaintRect(m_rtEngine);
 }
 
 void CFWL_Edit::OnMouseMove(CFWL_MessageMouse* pMsg) {
   if (m_nSelStart == -1 || !m_bLButtonDown)
     return;
 
   IFDE_TxtEdtPage* pPage = m_EdtEngine.GetPage(0);
   if (!pPage)
     return;
 
@@ skipping 179 matching lines @@
     return true;
 
   pScrollBar->SetPos(fPos);
   pScrollBar->SetTrackPos(fPos);
   UpdateOffset(pScrollBar, fPos - iCurPos);
   UpdateCaret();
 
   CFX_RectF rect = GetWidgetRect();
   CFX_RectF rtInvalidate;
   rtInvalidate.Set(0, 0, rect.width + 2, rect.height + 2);
-  Repaint(&rtInvalidate);
+  RepaintRect(rtInvalidate);
   return true;
 }