Convert GetWidgetRect to return rect.

xfa/fwl/core/cfwl_datetimepicker.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/core/cfwl_datetimepicker.h"
 
 #include <memory>
 #include <utility>
@@ skipping 28 matching lines @@
   m_pProperties->m_dwStyleExes = FWL_STYLEEXT_DTP_ShortDateFormat;
 
   auto monthProp = pdfium::MakeUnique<CFWL_WidgetProperties>();
   monthProp->m_dwStyles = FWL_WGTSTYLE_Popup | FWL_WGTSTYLE_Border;
   monthProp->m_dwStates = FWL_WGTSTATE_Invisible;
   monthProp->m_pParent = this;
   monthProp->m_pThemeProvider = m_pProperties->m_pThemeProvider;
   m_pMonthCal.reset(
       new CFWL_MonthCalendar(m_pOwnerApp, std::move(monthProp), this));
 
-  CFX_RectF rtMonthCal;
-  m_pMonthCal->GetWidgetRect(rtMonthCal, true);
+  CFX_RectF rtMonthCal = m_pMonthCal->GetWidgetRect(true);
   rtMonthCal.Set(0, 0, rtMonthCal.width, rtMonthCal.height);
   m_pMonthCal->SetWidgetRect(rtMonthCal);
 
   auto editProp = pdfium::MakeUnique<CFWL_WidgetProperties>();
   editProp->m_pParent = this;
   editProp->m_pThemeProvider = m_pProperties->m_pThemeProvider;
 
   m_pEdit.reset(new CFWL_DateTimeEdit(m_pOwnerApp, std::move(editProp), this));
   RegisterEventTarget(m_pMonthCal.get());
   RegisterEventTarget(m_pEdit.get());
 }
 
 CFWL_DateTimePicker::~CFWL_DateTimePicker() {
   UnregisterEventTarget();
 }
 
 FWL_Type CFWL_DateTimePicker::GetClassID() const {
   return FWL_Type::DateTimePicker;
 }
 
-void CFWL_DateTimePicker::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
-  if (m_pWidgetMgr->IsFormDisabled()) {
-    DisForm_GetWidgetRect(rect, bAutoSize);
-    return;
-  }
-  if (!bAutoSize) {
-    rect = m_pProperties->m_rtWidget;
-    return;
-  }
+CFX_RectF CFWL_DateTimePicker::GetWidgetRect(bool bAutoSize) {
+  if (m_pWidgetMgr->IsFormDisabled())
+    return DisForm_GetWidgetRect(bAutoSize);
+  if (!bAutoSize)
+    return m_pProperties->m_rtWidget;
 
+  CFX_RectF rect;
   rect.Set(0, 0, kDateTimePickerWidth, kDateTimePickerHeight);
   InflateWidgetRect(rect);
+  return rect;
 }
 
 void CFWL_DateTimePicker::Update() {
   if (m_pWidgetMgr->IsFormDisabled()) {
     DisForm_Update();
     return;
   }
   if (m_iLock)
     return;
   if (!m_pProperties->m_pThemeProvider)
@@ skipping 12 matching lines @@
 
   CFX_RectF rtEdit;
   rtEdit.Set(m_rtClient.left, m_rtClient.top, m_rtClient.width - fBtn,
              m_rtClient.height);
   m_pEdit->SetWidgetRect(rtEdit);
   ResetEditAlignment();
   m_pEdit->Update();
   if (!(m_pMonthCal->GetThemeProvider()))
     m_pMonthCal->SetThemeProvider(m_pProperties->m_pThemeProvider);
 
-  CFX_RectF rtMonthCal;
-  m_pMonthCal->GetWidgetRect(rtMonthCal, true);
+  CFX_RectF rtMonthCal = m_pMonthCal->GetWidgetRect(true);
   CFX_RectF rtPopUp;
   rtPopUp.Set(rtMonthCal.left, rtMonthCal.top + kDateTimePickerHeight,
               rtMonthCal.width, rtMonthCal.height);
   m_pMonthCal->SetWidgetRect(rtPopUp);
   m_pMonthCal->Update();
   return;
 }
 
 FWL_WidgetHit CFWL_DateTimePicker::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
   if (m_pWidgetMgr->IsFormDisabled())
     return DisForm_HitTest(fx, fy);
   if (m_rtClient.Contains(fx, fy))
     return FWL_WidgetHit::Client;
   if (IsMonthCalendarVisible()) {
-    CFX_RectF rect;
-    m_pMonthCal->GetWidgetRect(rect, false);
+    CFX_RectF rect = m_pMonthCal->GetWidgetRect(false);
     if (rect.Contains(fx, fy))
       return FWL_WidgetHit::Client;
   }
   return FWL_WidgetHit::Unknown;
 }
 
 void CFWL_DateTimePicker::DrawWidget(CFX_Graphics* pGraphics,
                                      const CFX_Matrix* pMatrix) {
   if (!pGraphics)
     return;
@@ skipping 58 matching lines @@
 }
 
 void CFWL_DateTimePicker::GetBBox(CFX_RectF& rect) const {
   if (m_pWidgetMgr->IsFormDisabled()) {
     DisForm_GetBBox(rect);
     return;
   }
 
   rect = m_pProperties->m_rtWidget;
   if (IsMonthCalendarVisible()) {
-    CFX_RectF rtMonth;
-    m_pMonthCal->GetWidgetRect(rtMonth, false);
+    CFX_RectF rtMonth = m_pMonthCal->GetWidgetRect(false);
     rtMonth.Offset(m_pProperties->m_rtWidget.left,
                    m_pProperties->m_rtWidget.top);
     rect.Union(rtMonth);
   }
 }
 
 void CFWL_DateTimePicker::ModifyEditStylesEx(uint32_t dwStylesExAdded,
                                              uint32_t dwStylesExRemoved) {
   m_pEdit->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
 }
@@ skipping 36 matching lines @@
   if (IsMonthCalendarVisible() == bActivate)
     return;
   if (!m_pForm)
     InitProxyForm();
 
   if (!bActivate) {
     m_pForm->EndDoModal();
     return;
   }
 
-  CFX_RectF rtMonth;
-  m_pMonthCal->GetWidgetRect(rtMonth, false);
+  CFX_RectF rtMonth = m_pMonthCal->GetWidgetRect(false);
 
   CFX_RectF rtAnchor;
   rtAnchor.Set(0, 0, m_pProperties->m_rtWidget.width,
                m_pProperties->m_rtWidget.height);
   GetPopupPos(0, rtMonth.height, rtAnchor, rtMonth);
   m_pForm->SetWidgetRect(rtMonth);
 
   rtMonth.left = rtMonth.top = 0;
   if (bActivate)
     m_pMonthCal->RemoveStates(FWL_WGTSTATE_Invisible);
@@ skipping 95 matching lines @@
   if (!m_pMonthCal)
     return false;
   return !(m_pMonthCal->GetStates() & FWL_WGTSTATE_Invisible);
 }
 
 void CFWL_DateTimePicker::DisForm_ShowMonthCalendar(bool bActivate) {
   if (IsMonthCalendarVisible() == bActivate)
     return;
 
   if (bActivate) {
-    CFX_RectF rtMonthCal;
-    m_pMonthCal->GetWidgetRect(rtMonthCal, true);
+    CFX_RectF rtMonthCal = m_pMonthCal->GetWidgetRect(true);
     FX_FLOAT fPopupMin = rtMonthCal.height;
     FX_FLOAT fPopupMax = rtMonthCal.height;
     CFX_RectF rtAnchor(m_pProperties->m_rtWidget);
     rtAnchor.width = rtMonthCal.width;
     rtMonthCal.left = m_rtClient.left;
     rtMonthCal.top = rtAnchor.Height();
     GetPopupPos(fPopupMin, fPopupMax, rtAnchor, rtMonthCal);
     m_pMonthCal->SetWidgetRect(rtMonthCal);
     if (m_iYear > 0 && m_iMonth > 0 && m_iDay > 0)
       m_pMonthCal->SetSelect(m_iYear, m_iMonth, m_iDay);
     m_pMonthCal->Update();
   }
   if (bActivate)
     m_pMonthCal->RemoveStates(FWL_WGTSTATE_Invisible);
   else
     m_pMonthCal->SetStates(FWL_WGTSTATE_Invisible);
 
   if (bActivate) {
     CFWL_MsgSetFocus msg(m_pEdit.get(), m_pMonthCal.get());
     m_pEdit->GetDelegate()->OnProcessMessage(&msg);
   }
 
-  CFX_RectF rtInvalidate, rtCal;
+  CFX_RectF rtInvalidate;
   rtInvalidate.Set(0, 0, m_pProperties->m_rtWidget.width,
                    m_pProperties->m_rtWidget.height);
-  m_pMonthCal->GetWidgetRect(rtCal, false);
+
+  CFX_RectF rtCal = m_pMonthCal->GetWidgetRect(false);
   rtInvalidate.Union(rtCal);
   rtInvalidate.Inflate(2, 2);
   Repaint(&rtInvalidate);
 }
 
 FWL_WidgetHit CFWL_DateTimePicker::DisForm_HitTest(FX_FLOAT fx,
                                                    FX_FLOAT fy) const {
   CFX_RectF rect;
   rect.Set(0, 0, m_pProperties->m_rtWidget.width,
            m_pProperties->m_rtWidget.height);
   if (rect.Contains(fx, fy))
     return FWL_WidgetHit::Edit;
   if (DisForm_IsNeedShowButton())
     rect.width += m_fBtn;
   if (rect.Contains(fx, fy))
     return FWL_WidgetHit::Client;
   if (IsMonthCalendarVisible()) {
-    m_pMonthCal->GetWidgetRect(rect, false);
-    if (rect.Contains(fx, fy))
+    if (m_pMonthCal->GetWidgetRect(false).Contains(fx, fy))
       return FWL_WidgetHit::Client;
   }
   return FWL_WidgetHit::Unknown;
 }
 
 bool CFWL_DateTimePicker::DisForm_IsNeedShowButton() const {
   return m_pProperties->m_dwStates & FWL_WGTSTATE_Focused ||
          m_pMonthCal->GetStates() & FWL_WGTSTATE_Focused ||
          m_pEdit->GetStates() & FWL_WGTSTATE_Focused;
 }
@@ skipping 12 matching lines @@
 
   if (!m_pMonthCal->GetThemeProvider())
     m_pMonthCal->SetThemeProvider(m_pProperties->m_pThemeProvider);
 
   FX_FLOAT* pWidth = static_cast<FX_FLOAT*>(
       GetThemeCapacity(CFWL_WidgetCapacity::ScrollBarWidth));
   if (!pWidth)
     return;
 
   m_fBtn = *pWidth;
-  CFX_RectF rtMonthCal;
-  m_pMonthCal->GetWidgetRect(rtMonthCal, true);
-
+  CFX_RectF rtMonthCal = m_pMonthCal->GetWidgetRect(true);
   CFX_RectF rtPopUp;
   rtPopUp.Set(rtMonthCal.left, rtMonthCal.top + kDateTimePickerHeight,
               rtMonthCal.width, rtMonthCal.height);
   m_pMonthCal->SetWidgetRect(rtPopUp);
   m_pMonthCal->Update();
 }
 
-void CFWL_DateTimePicker::DisForm_GetWidgetRect(CFX_RectF& rect,
-                                                bool bAutoSize) {
-  rect = m_pProperties->m_rtWidget;
+CFX_RectF CFWL_DateTimePicker::DisForm_GetWidgetRect(bool bAutoSize) {
+  CFX_RectF rect = m_pProperties->m_rtWidget;
   if (DisForm_IsNeedShowButton())
     rect.width += m_fBtn;
+  return rect;
 }
 
 void CFWL_DateTimePicker::DisForm_GetBBox(CFX_RectF& rect) const {
   rect = m_pProperties->m_rtWidget;
   if (DisForm_IsNeedShowButton())
     rect.width += m_fBtn;
   if (!IsMonthCalendarVisible())
     return;
 
-  CFX_RectF rtMonth;
-  m_pMonthCal->GetWidgetRect(rtMonth, false);
+  CFX_RectF rtMonth = m_pMonthCal->GetWidgetRect(false);
   rtMonth.Offset(m_pProperties->m_rtWidget.left, m_pProperties->m_rtWidget.top);
   rect.Union(rtMonth);
 }
 
 void CFWL_DateTimePicker::DisForm_DrawWidget(CFX_Graphics* pGraphics,
                                              const CFX_Matrix* pMatrix) {
   if (!pGraphics)
     return;
   if (m_pEdit) {
-    CFX_RectF rtEdit;
-    m_pEdit->GetWidgetRect(rtEdit, false);
+    CFX_RectF rtEdit = m_pEdit->GetWidgetRect(false);
 
     CFX_Matrix mt;
     mt.Set(1, 0, 0, 1, rtEdit.left, rtEdit.top);
     if (pMatrix)
       mt.Concat(*pMatrix);
     m_pEdit->DrawWidget(pGraphics, &mt);
   }
   if (!IsMonthCalendarVisible())
     return;
 
-  CFX_RectF rtMonth;
-  m_pMonthCal->GetWidgetRect(rtMonth, false);
+  CFX_RectF rtMonth = m_pMonthCal->GetWidgetRect(false);
   CFX_Matrix mt;
   mt.Set(1, 0, 0, 1, rtMonth.left, rtMonth.top);
   if (pMatrix)
     mt.Concat(*pMatrix);
   m_pMonthCal->DrawWidget(pGraphics, &mt);
 }
 
 void CFWL_DateTimePicker::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
@@ skipping 125 matching lines @@
     if (DisForm_IsMonthCalendarVisible())
       ShowMonthCalendar(false);
     if (m_pEdit->GetStates() & FWL_WGTSTATE_Focused) {
       pMsg->m_pSrcTarget = m_pEdit.get();
       m_pEdit->GetDelegate()->OnProcessMessage(pMsg);
     }
   }
   rtInvalidate.Inflate(2, 2);
   Repaint(&rtInvalidate);
 }