Cleanup CFWL_Widget code to return CFX_RectFs where appropriate

xfa/fwl/cfwl_combobox.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_combobox.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 390 matching lines @@
   CFX_WideString wsText = m_pListBox->GetDataProviderItemText(hItem);
   m_pEdit->SetText(wsText);
   m_pEdit->Update();
   m_pEdit->SetSelected();
 }
 
 void CFWL_ComboBox::Layout() {
   if (m_pWidgetMgr->IsFormDisabled())
     return DisForm_Layout();
 
-  GetClientRect(m_rtClient);
+  m_rtClient = GetClientRect();
   FX_FLOAT* pFWidth = static_cast<FX_FLOAT*>(
       GetThemeCapacity(CFWL_WidgetCapacity::ScrollBarWidth));
   if (!pFWidth)
     return;
 
   FX_FLOAT fBtn = *pFWidth;
   m_rtBtn.Set(m_rtClient.right() - fBtn, m_rtClient.top, fBtn,
               m_rtClient.height);
   if (!IsDropDownStyle() || !m_pEdit)
     return;
@@ skipping 83 matching lines @@
       dwAdd |= FWL_STYLEEXT_LTB_LeftAlign;
       break;
     }
   }
   m_pListBox->ModifyStylesEx(dwAdd, FWL_STYLEEXT_CMB_ListItemAlignMask);
 }
 
 void CFWL_ComboBox::ProcessSelChanged(bool bLButtonUp) {
   m_iCurSel = m_pListBox->GetItemIndex(this, m_pListBox->GetSelItem(0));
   if (!IsDropDownStyle()) {
-    Repaint(&m_rtClient);
+    RepaintRect(m_rtClient);
     return;
   }
 
   CFWL_ListItem* hItem = m_pListBox->GetItem(this, m_iCurSel);
   if (!hItem)
     return;
 
   CFX_WideString wsText = m_pListBox->GetItemText(this, hItem);
   if (m_pEdit) {
     m_pEdit->SetText(wsText);
@@ skipping 89 matching lines @@
   if (bActivate) {
     m_pListBox->RemoveStates(FWL_WGTSTATE_Invisible);
     CFWL_Event postEvent(CFWL_Event::Type::PostDropDown, this);
     DispatchEvent(&postEvent);
   } else {
     m_pListBox->SetStates(FWL_WGTSTATE_Invisible);
   }
 
   CFX_RectF rect = m_pListBox->GetWidgetRect();
   rect.Inflate(2, 2);
-  Repaint(&rect);
+  RepaintRect(rect);
 }
 
 void CFWL_ComboBox::DisForm_ModifyStylesEx(uint32_t dwStylesExAdded,
                                            uint32_t dwStylesExRemoved) {
   if (!m_pEdit)
     DisForm_InitComboEdit();
 
   bool bAddDropDown = !!(dwStylesExAdded & FWL_STYLEEXT_CMB_DropDown);
   bool bDelDropDown = !!(dwStylesExRemoved & FWL_STYLEEXT_CMB_DropDown);
 
@@ skipping 74 matching lines @@
   if (!m_pListBox || !DisForm_IsDropListVisible())
     return rect;
 
   CFX_RectF rtList = m_pListBox->GetWidgetRect();
   rtList.Offset(rect.left, rect.top);
   rect.Union(rtList);
   return rect;
 }
 
 void CFWL_ComboBox::DisForm_Layout() {
-  GetClientRect(m_rtClient);
+  m_rtClient = GetClientRect();
   m_rtContent = m_rtClient;
   FX_FLOAT* pFWidth = static_cast<FX_FLOAT*>(
       GetThemeCapacity(CFWL_WidgetCapacity::ScrollBarWidth));
   if (!pFWidth)
     return;
 
   FX_FLOAT borderWidth = 1;
   FX_FLOAT fBtn = *pFWidth;
   if (!(GetStylesEx() & FWL_STYLEEXT_CMB_ReadOnly)) {
     m_rtBtn.Set(m_rtClient.right() - fBtn, m_rtClient.top + borderWidth,
@@ skipping 92 matching lines @@
 void CFWL_ComboBox::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   if (bSet) {
     m_pProperties->m_dwStates |= FWL_WGTSTATE_Focused;
     if (IsDropDownStyle() && pMsg->m_pSrcTarget != m_pListBox.get()) {
       if (!m_pEdit)
         return;
       m_pEdit->SetSelected();
       return;
     }
 
-    Repaint(&m_rtClient);
+    RepaintRect(m_rtClient);
     return;
   }
 
   m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Focused;
   if (!IsDropDownStyle() || pMsg->m_pDstTarget == m_pListBox.get()) {
-    Repaint(&m_rtClient);
+    RepaintRect(m_rtClient);
     return;
   }
   if (!m_pEdit)
     return;
 
   m_pEdit->FlagFocus(false);
   m_pEdit->ClearSelected();
 }
 
 void CFWL_ComboBox::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   if (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled)
     return;
 
   CFX_RectF& rtBtn = IsDropDownStyle() ? m_rtBtn : m_rtClient;
   if (!rtBtn.Contains(pMsg->m_fx, pMsg->m_fy))
     return;
 
   if (IsDropDownStyle() && m_pEdit)
     MatchEditText();
 
   m_bLButtonDown = true;
   m_iBtnState = CFWL_PartState_Pressed;
-  Repaint(&m_rtClient);
+  RepaintRect(m_rtClient);
 
   ShowDropList(true);
   m_iBtnState = CFWL_PartState_Normal;
-  Repaint(&m_rtClient);
+  RepaintRect(m_rtClient);
 }
 
 void CFWL_ComboBox::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   m_bLButtonDown = false;
   if (m_rtBtn.Contains(pMsg->m_fx, pMsg->m_fy))
     m_iBtnState = CFWL_PartState_Hovered;
   else
     m_iBtnState = CFWL_PartState_Normal;
 
-  Repaint(&m_rtBtn);
+  RepaintRect(m_rtBtn);
 }
 
 void CFWL_ComboBox::OnMouseMove(CFWL_MessageMouse* pMsg) {
   int32_t iOldState = m_iBtnState;
   if (m_rtBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iBtnState =
         m_bLButtonDown ? CFWL_PartState_Pressed : CFWL_PartState_Hovered;
   } else {
     m_iBtnState = CFWL_PartState_Normal;
   }
   if ((iOldState != m_iBtnState) &&
       !((m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) ==
         FWL_WGTSTATE_Disabled)) {
-    Repaint(&m_rtBtn);
+    RepaintRect(m_rtBtn);
   }
 }
 
 void CFWL_ComboBox::OnMouseLeave(CFWL_MessageMouse* pMsg) {
   if (!IsDropListVisible() &&
       !((m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) ==
         FWL_WGTSTATE_Disabled)) {
     m_iBtnState = CFWL_PartState_Normal;
-    Repaint(&m_rtBtn);
+    RepaintRect(m_rtBtn);
   }
 }
 
 void CFWL_ComboBox::OnKey(CFWL_MessageKey* pMsg) {
   uint32_t dwKeyCode = pMsg->m_dwKeyCode;
   if (dwKeyCode == FWL_VKEY_Tab)
     return;
   if (pMsg->m_pDstTarget == this)
     DoSubCtrlKey(pMsg);
 }
@@ skipping 26 matching lines @@
         return;
       if (bUp)
         iCurSel--;
       else
         iCurSel++;
     }
     m_iCurSel = iCurSel;
     if (bDropDown && m_pEdit)
       SyncEditText(m_iCurSel);
     else
-      Repaint(&m_rtClient);
+      RepaintRect(m_rtClient);
     return;
   }
 
   if (IsDropDownStyle())
     m_pEdit->GetDelegate()->OnProcessMessage(pMsg);
 }
 
 void CFWL_ComboBox::DisForm_OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
@@ skipping 112 matching lines @@
       else
         iCurSel++;
     }
     m_iCurSel = iCurSel;
     SyncEditText(m_iCurSel);
     return;
   }
   if (m_pEdit)
     m_pEdit->GetDelegate()->OnProcessMessage(pMsg);
 }