Convert GetWidgetRect to return rect.

xfa/fwl/core/cfwl_checkbox.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_checkbox.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 32 matching lines @@
 CFWL_CheckBox::~CFWL_CheckBox() {}
 
 FWL_Type CFWL_CheckBox::GetClassID() const {
   return FWL_Type::CheckBox;
 }
 
 void CFWL_CheckBox::SetBoxSize(FX_FLOAT fHeight) {
   m_fBoxHeight = fHeight;
 }
 
-void CFWL_CheckBox::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
-  if (!bAutoSize) {
-    rect = m_pProperties->m_rtWidget;
-    return;
-  }
-
-  rect.Set(0, 0, 0, 0);
-  if (!m_pProperties->m_pThemeProvider)
-    m_pProperties->m_pThemeProvider = GetAvailableTheme();
-  if (!m_pProperties->m_pThemeProvider)
-    return;
-
-  CFX_SizeF sz = CalcTextSize(
-      L"Check box", m_pProperties->m_pThemeProvider,
-      !!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CKB_MultiLine));
-  rect.Set(0, 0, sz.x, sz.y);
-  rect.Inflate(kCaptionMargin, kCaptionMargin);
-
-  rect.width += m_fBoxHeight;
-  rect.height = std::max(rect.height, m_fBoxHeight);
-  InflateWidgetRect(rect);
-}
-
 void CFWL_CheckBox::Update() {
   if (IsLocked())
     return;
   if (!m_pProperties->m_pThemeProvider)
     m_pProperties->m_pThemeProvider = GetAvailableTheme();
 
   UpdateTextOutStyles();
   Layout();
 }
 
@@ skipping 215 matching lines @@
       if (!pWidgetMgr->IsFormDisabled()) {
         CFX_ArrayTemplate<CFWL_Widget*> radioarr;
         pWidgetMgr->GetSameGroupRadioButton(this, radioarr);
         CFWL_CheckBox* pCheckBox = nullptr;
         int32_t iCount = radioarr.GetSize();
         for (int32_t i = 0; i < iCount; i++) {
           pCheckBox = static_cast<CFWL_CheckBox*>(radioarr[i]);
           if (pCheckBox != this &&
               pCheckBox->GetStates() & FWL_STATE_CKB_Checked) {
             pCheckBox->SetCheckState(0);
-            CFX_RectF rt;
-            pCheckBox->GetWidgetRect(rt, false);
+            CFX_RectF rt = pCheckBox->GetWidgetRect();
             rt.left = rt.top = 0;
             m_pWidgetMgr->RepaintWidget(pCheckBox, &rt);
             break;
           }
         }
       }
       m_pProperties->m_dwStates |= FWL_STATE_CKB_Checked;
     }
   } else {
     if ((m_pProperties->m_dwStates & FWL_STATE_CKB_CheckMask) ==
@@ skipping 150 matching lines @@
 }
 
 void CFWL_CheckBox::OnKeyDown(CFWL_MsgKey* pMsg) {
   if (pMsg->m_dwKeyCode == FWL_VKEY_Tab)
     return;
   if (pMsg->m_dwKeyCode == FWL_VKEY_Return ||
       pMsg->m_dwKeyCode == FWL_VKEY_Space) {
     NextStates();
   }
 }