Cleanup CFWL_Widget code to return CFX_RectFs where appropriate

xfa/fwl/cfwl_widget.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_widget.h"
 
 #include <algorithm>
 #include <utility>
@@ skipping 74 matching lines @@
 }
 
 void CFWL_Widget::SetWidgetRect(const CFX_RectF& rect) {
   m_pProperties->m_rtWidget = rect;
   if (IsChild())
     return;
 
   m_pWidgetMgr->SetWidgetRect_Native(this, rect);
 }
 
-void CFWL_Widget::GetClientRect(CFX_RectF& rect) {
-  GetEdgeRect(rect);
+CFX_RectF CFWL_Widget::GetClientRect() {
+  CFX_RectF rect = GetEdgeRect();
   if (HasEdge()) {
     FX_FLOAT fEdge = GetEdgeWidth();
     rect.Deflate(fEdge, fEdge);
   }
+  return rect;
 }
 
 void CFWL_Widget::SetParent(CFWL_Widget* pParent) {
   m_pProperties->m_pParent = pParent;
   m_pWidgetMgr->SetParent(pParent, this);
 }
 
 uint32_t CFWL_Widget::GetStyles() const {
   return m_pProperties->m_dwStyles;
 }
@@ skipping 44 matching lines @@
     child = widgetMgr->GetNextSiblingWidget(child);
   }
   return;
 }
 
 void CFWL_Widget::RemoveStates(uint32_t dwStates) {
   m_pProperties->m_dwStates &= ~dwStates;
 }
 
 FWL_WidgetHit CFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
-  CFX_RectF rtClient;
-  GetClientRect(rtClient);
-  if (rtClient.Contains(fx, fy))
+  if (GetClientRect().Contains(fx, fy))
     return FWL_WidgetHit::Client;
-  if (HasEdge()) {
-    CFX_RectF rtEdge;
-    GetEdgeRect(rtEdge);
-    if (rtEdge.Contains(fx, fy))
-      return FWL_WidgetHit::Edge;
-  }
-  if (HasBorder()) {
-    CFX_RectF rtRelative;
-    GetRelativeRect(rtRelative);
-    if (rtRelative.Contains(fx, fy))
-      return FWL_WidgetHit::Border;
-  }
+  if (HasEdge() && GetEdgeRect().Contains(fx, fy))
+    return FWL_WidgetHit::Edge;
+  if (HasBorder() && GetRelativeRect().Contains(fx, fy))
+    return FWL_WidgetHit::Border;
   return FWL_WidgetHit::Unknown;
 }
 
 void CFWL_Widget::TransformTo(CFWL_Widget* pWidget,
                               FX_FLOAT& fx,
                               FX_FLOAT& fy) {
   if (m_pWidgetMgr->IsFormDisabled()) {
     CFX_SizeF szOffset;
     if (IsParent(pWidget)) {
       szOffset = GetOffsetFromParent(pWidget);
@@ skipping 119 matching lines @@
 }
 
 bool CFWL_Widget::IsChild() const {
   return !!(m_pProperties->m_dwStyles & FWL_WGTSTYLE_Child);
 }
 
 bool CFWL_Widget::IsOffscreen() const {
   return !!(m_pProperties->m_dwStyles & FWL_WGTSTYLE_Offscreen);
 }
 
-void CFWL_Widget::GetEdgeRect(CFX_RectF& rtEdge) {
-  rtEdge = m_pProperties->m_rtWidget;
+CFX_RectF CFWL_Widget::GetEdgeRect() {
+  CFX_RectF rtEdge = m_pProperties->m_rtWidget;
   rtEdge.left = rtEdge.top = 0;
   if (HasBorder()) {
     FX_FLOAT fCX = GetBorderSize(true);
     FX_FLOAT fCY = GetBorderSize(false);
     rtEdge.Deflate(fCX, fCY);
   }
+  return rtEdge;
 }
 
 FX_FLOAT CFWL_Widget::GetBorderSize(bool bCX) {
   FX_FLOAT* pfBorder = static_cast<FX_FLOAT*>(GetThemeCapacity(
       bCX ? CFWL_WidgetCapacity::CXBorder : CFWL_WidgetCapacity::CYBorder));
   if (!pfBorder)
     return 0;
   return *pfBorder;
 }
 
@@ skipping 13 matching lines @@
       break;
     }
   }
   if (dwCapacity != CFWL_WidgetCapacity::None) {
     FX_FLOAT* fRet = static_cast<FX_FLOAT*>(GetThemeCapacity(dwCapacity));
     return fRet ? *fRet : 0;
   }
   return 0;
 }
 
-void CFWL_Widget::GetRelativeRect(CFX_RectF& rect) {
-  rect = m_pProperties->m_rtWidget;
-  rect.left = rect.top = 0;
+CFX_RectF CFWL_Widget::GetRelativeRect() {
+  CFX_RectF rect = m_pProperties->m_rtWidget;
+  rect.left = 0;
+  rect.top = 0;
+  return rect;
 }
 
 void* CFWL_Widget::GetThemeCapacity(CFWL_WidgetCapacity dwCapacity) {
   IFWL_ThemeProvider* pTheme = GetAvailableTheme();
   if (!pTheme)
     return nullptr;
 
   CFWL_ThemePart part;
   part.m_pWidget = this;
   return pTheme->GetCapacity(&part, dwCapacity);
@@ skipping 221 matching lines @@
   const CFWL_App* pApp = GetOwnerApp();
   if (!pApp)
     return;
 
   CFWL_NoteDriver* pNoteDriver = pApp->GetNoteDriver();
   if (!pNoteDriver)
     return;
   pNoteDriver->SendEvent(pEvent);
 }
 
-void CFWL_Widget::Repaint(const CFX_RectF* pRect) {
-  if (pRect) {
-    m_pWidgetMgr->RepaintWidget(this, pRect);
-    return;
-  }
+void CFWL_Widget::Repaint() {
   CFX_RectF rect;
   rect = m_pProperties->m_rtWidget;
-  rect.left = rect.top = 0;
-  m_pWidgetMgr->RepaintWidget(this, &rect);
+  rect.left = 0;
+  rect.top = 0;
+  RepaintRect(rect);
+}
+
+void CFWL_Widget::RepaintRect(const CFX_RectF& pRect) {
+  m_pWidgetMgr->RepaintWidget(this, pRect);
 }
 
 void CFWL_Widget::DrawBackground(CFX_Graphics* pGraphics,
                                  CFWL_Part iPartBk,
                                  IFWL_ThemeProvider* pTheme,
                                  const CFX_Matrix* pMatrix) {
-  CFX_RectF rtRelative;
-  GetRelativeRect(rtRelative);
   CFWL_ThemeBackground param;
   param.m_pWidget = this;
   param.m_iPart = iPartBk;
   param.m_pGraphics = pGraphics;
   if (pMatrix)
     param.m_matrix.Concat(*pMatrix, true);
-  param.m_rtPart = rtRelative;
+  param.m_rtPart = GetRelativeRect();
   pTheme->DrawBackground(&param);
 }
 
 void CFWL_Widget::DrawBorder(CFX_Graphics* pGraphics,
                              CFWL_Part iPartBorder,
                              IFWL_ThemeProvider* pTheme,
                              const CFX_Matrix* pMatrix) {
-  CFX_RectF rtRelative;
-  GetRelativeRect(rtRelative);
   CFWL_ThemeBackground param;
   param.m_pWidget = this;
   param.m_iPart = iPartBorder;
   param.m_pGraphics = pGraphics;
   if (pMatrix)
     param.m_matrix.Concat(*pMatrix, true);
-  param.m_rtPart = rtRelative;
+  param.m_rtPart = GetRelativeRect();
   pTheme->DrawBackground(&param);
 }
 
 void CFWL_Widget::DrawEdge(CFX_Graphics* pGraphics,
                            CFWL_Part iPartEdge,
                            IFWL_ThemeProvider* pTheme,
                            const CFX_Matrix* pMatrix) {
-  CFX_RectF rtEdge;
-  GetEdgeRect(rtEdge);
   CFWL_ThemeBackground param;
   param.m_pWidget = this;
   param.m_iPart = iPartEdge;
   param.m_pGraphics = pGraphics;
   if (pMatrix)
     param.m_matrix.Concat(*pMatrix, true);
-  param.m_rtPart = rtEdge;
+  param.m_rtPart = GetEdgeRect();
   pTheme->DrawBackground(&param);
 }
 
 void CFWL_Widget::NotifyDriver() {
   const CFWL_App* pApp = GetOwnerApp();
   if (!pApp)
     return;
 
   CFWL_NoteDriver* pDriver =
       static_cast<CFWL_NoteDriver*>(pApp->GetNoteDriver());
@@ skipping 49 matching lines @@
     }
     default:
       break;
   }
 }
 
 void CFWL_Widget::OnProcessEvent(CFWL_Event* pEvent) {}
 
 void CFWL_Widget::OnDrawWidget(CFX_Graphics* pGraphics,
                                const CFX_Matrix* pMatrix) {}