Convert GetWidgetRect to return rect.

xfa/fwl/core/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/core/cfwl_widget.h"
 
 #include <algorithm>
 #include <utility>
@@ skipping 47 matching lines @@
 
 CFWL_Widget::~CFWL_Widget() {
   NotifyDriver();
   m_pWidgetMgr->RemoveWidget(this);
 }
 
 bool CFWL_Widget::IsInstance(const CFX_WideStringC& wsClass) const {
   return false;
 }
 
-void CFWL_Widget::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
-  if (!bAutoSize) {
-    rect = m_pProperties->m_rtWidget;
-    return;
-  }
+CFX_RectF CFWL_Widget::GetWidgetRect(bool bAutoSize) {
+  if (!bAutoSize)
+    return m_pProperties->m_rtWidget;
+
+  CFX_RectF rect;
   InflateWidgetRect(rect);
+  return rect;
 }
 
 void CFWL_Widget::InflateWidgetRect(CFX_RectF& rect) {
   if (HasEdge()) {
     FX_FLOAT fEdge = GetEdgeWidth();
     rect.Inflate(fEdge, fEdge);
   }
   if (HasBorder()) {
     FX_FLOAT fBorder = GetBorderSize(true);
     rect.Inflate(fBorder, fBorder);
@@ skipping 110 matching lines @@
       szOffset.y = -szOffset.y;
     }
     fx += szOffset.x;
     fy += szOffset.y;
     return;
   }
   CFX_RectF r;
   CFX_Matrix m;
   CFWL_Widget* parent = GetParent();
   if (parent) {
-    GetWidgetRect(r, false);
+    InflateWidgetRect(r);
     fx += r.left;
     fy += r.top;
     GetMatrix(m, true);
     m.TransformPoint(fx, fy);
   }
   CFWL_Widget* form1 = m_pWidgetMgr->GetSystemFormWidget(this);
   if (!form1)
     return;
+
   if (!pWidget) {
-    form1->GetWidgetRect(r, false);
+    r = form1->GetWidgetRect(false);
     fx += r.left;
     fy += r.top;
     return;
   }
   CFWL_Widget* form2 = m_pWidgetMgr->GetSystemFormWidget(pWidget);
   if (!form2)
     return;
   if (form1 != form2) {
-    form1->GetWidgetRect(r, false);
+    r = form1->GetWidgetRect(false);
     fx += r.left;
     fy += r.top;
-    form2->GetWidgetRect(r, false);
+    r = form2->GetWidgetRect(false);
     fx -= r.left;
     fy -= r.top;
   }
   parent = pWidget->GetParent();
   if (parent) {
     pWidget->GetMatrix(m, true);
     CFX_Matrix m1;
     m1.SetIdentity();
     m1.SetReverse(m);
     m1.TransformPoint(fx, fy);
-    pWidget->GetWidgetRect(r, false);

[dsinclair, 2016/12/07 21:09:11]

If pWidget isn't a subclass that overrides GetWidgetRect this will be different
....

+    r = pWidget->GetWidgetRect(false);
     fx -= r.left;
     fy -= r.top;
   }
 }
 
 void CFWL_Widget::GetMatrix(CFX_Matrix& matrix, bool bGlobal) {
   if (!m_pProperties)
     return;
   if (!bGlobal) {
     matrix.SetIdentity();
     return;
   }
 
   CFWL_Widget* parent = GetParent();
   CFX_ArrayTemplate<CFWL_Widget*> parents;
   while (parent) {
     parents.Add(parent);
     parent = parent->GetParent();
   }
   matrix.SetIdentity();
   CFX_Matrix ctmOnParent;
   CFX_RectF rect;
   int32_t count = parents.GetSize();
   for (int32_t i = count - 2; i >= 0; i--) {
     parent = parents.GetAt(i);
     parent->GetMatrix(ctmOnParent, false);
-    parent->GetWidgetRect(rect, false);

[dsinclair, 2016/12/07 21:09:11]

potential difference if parent is a subclass that doesn't override
GetWidgetRect...

+    rect = parent->GetWidgetRect(false);
     matrix.Concat(ctmOnParent, true);
     matrix.Translate(rect.left, rect.top, true);
   }
   CFX_Matrix m;
   m.SetIdentity();
   matrix.Concat(m, true);
   parents.RemoveAll();
 }
 
 IFWL_ThemeProvider* CFWL_Widget::GetThemeProvider() const {
@@ skipping 404 matching lines @@
 
   CFWL_WidgetMgr* pWidgetMgr = GetOwnerApp()->GetWidgetMgr();
   if (!pWidgetMgr)
     return CFX_SizeF();
 
   CFX_SizeF szRet(m_pProperties->m_rtWidget.left,
                   m_pProperties->m_rtWidget.top);
 
   CFWL_Widget* pDstWidget = GetParent();
   while (pDstWidget && pDstWidget != pParent) {
-    CFX_RectF rtDst;
-    pDstWidget->GetWidgetRect(rtDst, false);
+    CFX_RectF rtDst = pDstWidget->GetWidgetRect(false);
     szRet += CFX_SizeF(rtDst.left, rtDst.top);
     pDstWidget = pWidgetMgr->GetParentWidget(pDstWidget);
   }
   return szRet;
 }
 
 bool CFWL_Widget::IsParent(CFWL_Widget* pParent) {
   CFWL_Widget* pUpWidget = GetParent();
   while (pUpWidget) {
     if (pUpWidget == pParent)
@@ skipping 19 matching lines @@
     }
     default:
       break;
   }
 }
 
 void CFWL_Widget::OnProcessEvent(CFWL_Event* pEvent) {}
 
 void CFWL_Widget::OnDrawWidget(CFX_Graphics* pGraphics,
                                const CFX_Matrix* pMatrix) {}