Convert GetWidgetRect to return rect.

xfa/fwl/core/cfwl_widgetmgr.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_widgetmgr.h"
 
 #include <utility>
 
@@ skipping 139 matching lines @@
 void CFWL_WidgetMgr::RepaintWidget(CFWL_Widget* pWidget,
                                    const CFX_RectF* pRect) {
   if (!m_pAdapter)
     return;
 
   CFWL_Widget* pNative = pWidget;
   CFX_RectF rect(*pRect);
   if (IsFormDisabled()) {
     CFWL_Widget* pOuter = pWidget->GetOuter();
     while (pOuter) {
-      CFX_RectF rtTemp;
-      pNative->GetWidgetRect(rtTemp, false);
+      CFX_RectF rtTemp = pNative->GetWidgetRect();
       rect.left += rtTemp.left;
       rect.top += rtTemp.top;
       pNative = pOuter;
       pOuter = pOuter->GetOuter();
     }
   } else if (!IsAbleNative(pWidget)) {
     pNative = GetSystemFormWidget(pWidget);
     if (!pNative)
       return;
 
@@ skipping 125 matching lines @@
   while (child) {
     if ((child->GetStates() & FWL_WGTSTATE_Invisible) == 0) {
       x1 = x;
       y1 = y;
       CFX_Matrix matrixOnParent;
       child->GetMatrix(matrixOnParent, false);
       CFX_Matrix m;
       m.SetIdentity();
       m.SetReverse(matrixOnParent);
       m.TransformPoint(x1, y1);
-      CFX_RectF bounds;
-      child->GetWidgetRect(bounds, false);
+      CFX_RectF bounds = child->GetWidgetRect();
       if (bounds.Contains(x1, y1)) {
         x1 -= bounds.left;
         y1 -= bounds.top;
         return GetWidgetAtPoint(child, x1, y1);
       }
     }
     child = GetPriorSiblingWidget(child);
   }
   return parent;
 }
@@ skipping 147 matching lines @@
 #endif
 }
 
 void CFWL_WidgetMgr::OnDrawWidget(CFWL_Widget* pWidget,
                                   CFX_Graphics* pGraphics,
                                   const CFX_Matrix* pMatrix) {
   if (!pWidget || !pGraphics)
     return;
 
   CFX_Graphics* pTemp = DrawWidgetBefore(pWidget, pGraphics, pMatrix);
-  CFX_RectF clipCopy;
-  pWidget->GetWidgetRect(clipCopy, false);
+  CFX_RectF clipCopy = pWidget->GetWidgetRect();
   clipCopy.left = clipCopy.top = 0;
 
   if (UseOffscreenDirect(pWidget)) {
     DrawWidgetAfter(pWidget, pGraphics, clipCopy, pMatrix);
     return;
   }
   CFX_RectF clipBounds;
 
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_ || \
     _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_
@@ skipping 32 matching lines @@
     return;
 
   bool bFormDisable = IsFormDisabled();
   CFWL_Widget* pNextChild = GetFirstChildWidget(parent);
   while (pNextChild) {
     CFWL_Widget* child = pNextChild;
     pNextChild = GetNextSiblingWidget(child);
     if (child->GetStates() & FWL_WGTSTATE_Invisible)
       continue;
 
-    CFX_RectF rtWidget;
-    child->GetWidgetRect(rtWidget, false);
+    CFX_RectF rtWidget = child->GetWidgetRect();
     if (rtWidget.IsEmpty())
       continue;
 
     CFX_Matrix widgetMatrix;
     CFX_RectF clipBounds(rtWidget);
     if (!bFormDisable)
       child->GetMatrix(widgetMatrix, true);
     if (pMatrix)
       widgetMatrix.Concat(*pMatrix);
 
@@ skipping 23 matching lines @@
 
 CFX_Graphics* CFWL_WidgetMgr::DrawWidgetBefore(CFWL_Widget* pWidget,
                                                CFX_Graphics* pGraphics,
                                                const CFX_Matrix* pMatrix) {
   if (!FWL_UseOffscreen(pWidget))
     return pGraphics;
 
   Item* pItem = GetWidgetMgrItem(pWidget);
   if (!pItem->pOffscreen) {
     pItem->pOffscreen.reset(new CFX_Graphics);
-    CFX_RectF rect;
-    pWidget->GetWidgetRect(rect, false);
+    CFX_RectF rect = pWidget->GetWidgetRect();
     pItem->pOffscreen->Create((int32_t)rect.width, (int32_t)rect.height,
                               FXDIB_Argb);
   }
   CFX_RectF rect;
   pGraphics->GetClipRect(rect);
   pItem->pOffscreen->SetClipRect(rect);
   return pItem->pOffscreen.get();
 }
 
 void CFWL_WidgetMgr::DrawWidgetAfter(CFWL_Widget* pWidget,
@@ skipping 14 matching lines @@
 
 bool CFWL_WidgetMgr::IsNeedRepaint(CFWL_Widget* pWidget,
                                    CFX_Matrix* pMatrix,
                                    const CFX_RectF& rtDirty) {
   Item* pItem = GetWidgetMgrItem(pWidget);
   if (pItem && pItem->iRedrawCounter > 0) {
     pItem->iRedrawCounter = 0;
     return true;
   }
 
-  CFX_RectF rtWidget;
-  pWidget->GetWidgetRect(rtWidget, false);
+  CFX_RectF rtWidget = pWidget->GetWidgetRect();
   rtWidget.left = rtWidget.top = 0;
   pMatrix->TransformRect(rtWidget);
   if (!rtWidget.IntersectWith(rtDirty))
     return false;
 
   CFWL_Widget* pChild =
       pWidget->GetOwnerApp()->GetWidgetMgr()->GetFirstChildWidget(pWidget);
   if (!pChild)
     return true;
 
@@ skipping 15 matching lines @@
   hitPoint[5].hitPoint.x = hitPoint[9].hitPoint.x =
       rtWidget.width + rtWidget.left;
   hitPoint[0].hitPoint.y = hitPoint[1].hitPoint.y = rtWidget.top;
   hitPoint[2].hitPoint.y = hitPoint[3].hitPoint.y = hitPoint[4].hitPoint.y =
       hitPoint[5].hitPoint.y = fyPiece + rtWidget.top;
   hitPoint[6].hitPoint.y = hitPoint[7].hitPoint.y = hitPoint[8].hitPoint.y =
       hitPoint[9].hitPoint.y = fyPiece * 2 + rtWidget.top;
   hitPoint[10].hitPoint.y = hitPoint[11].hitPoint.y =
       rtWidget.height + rtWidget.top;
   do {
-    CFX_RectF rect;
-    pChild->GetWidgetRect(rect, false);
+    CFX_RectF rect = pChild->GetWidgetRect();
     CFX_RectF r = rect;
     r.left += rtWidget.left;
     r.top += rtWidget.top;
     if (r.IsEmpty())
       continue;
     if (r.Contains(rtDirty))
       return false;
     if (!bChildIntersectWithDirty && r.IntersectWith(rtDirty))
       bChildIntersectWithDirty = true;
     if (bOrginPtIntersectWidthDirty && !bOrginPtIntersectWidthChild)
@@ skipping 39 matching lines @@
   return true;
 }
 
 bool CFWL_WidgetMgr::UseOffscreenDirect(CFWL_Widget* pWidget) const {
   Item* pItem = GetWidgetMgrItem(pWidget);
   if (!FWL_UseOffscreen(pWidget) || !(pItem->pOffscreen))
     return false;
 
 #if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_)
   if (pItem->bOutsideChanged) {
-    CFX_RectF r;
-    pWidget->GetWidgetRect(r, false);
+    CFX_RectF r = pWidget->GetWidgetRect();
     CFX_RectF temp(m_rtScreen);
     temp.Deflate(50, 50);
     if (!temp.Contains(r))
       return false;
 
     pItem->bOutsideChanged = false;
   }
 #endif
 
   return pItem->iRedrawCounter == 0;
@@ skipping 10 matching lines @@
       pWidget(widget),
       iRedrawCounter(0)
 #if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_)
       ,
       bOutsideChanged(false)
 #endif
 {
 }
 
 CFWL_WidgetMgr::Item::~Item() {}