From da911bc12558667555266425d0b7e83296e8cc7d Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 7 Dec 2016 18:47:00 -0800 Subject: Convert GetWidgetRect to return rect. Current GetWidgetRect accepts the rect as an out-param. This CL converts the code to return the rect instead. Review-Url: https://codereview.chromium.org/2556873004 --- xfa/fxfa/app/xfa_ffpushbutton.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/app/xfa_ffpushbutton.cpp') diff --git a/xfa/fxfa/app/xfa_ffpushbutton.cpp b/xfa/fxfa/app/xfa_ffpushbutton.cpp index a26714aac3..a2b11e89ae 100644 --- a/xfa/fxfa/app/xfa_ffpushbutton.cpp +++ b/xfa/fxfa/app/xfa_ffpushbutton.cpp @@ -214,8 +214,7 @@ void CXFA_FFPushButton::OnDrawWidget(CFX_Graphics* pGraphics, if (m_pNormalWidget->GetStylesEx() & XFA_FWL_PSBSTYLEEXT_HiliteInverted) { if ((m_pNormalWidget->GetStates() & FWL_STATE_PSB_Pressed) && (m_pNormalWidget->GetStates() & FWL_STATE_PSB_Hovered)) { - CFX_RectF rtFill; - m_pNormalWidget->GetWidgetRect(rtFill, false); + CFX_RectF rtFill = m_pNormalWidget->GetWidgetRect(); rtFill.left = rtFill.top = 0; FX_FLOAT fLineWith = GetLineWidth(); rtFill.Deflate(fLineWith, fLineWith); @@ -236,8 +235,8 @@ void CXFA_FFPushButton::OnDrawWidget(CFX_Graphics* pGraphics, pGraphics->SetLineWidth(fLineWidth); CFX_Path path; path.Create(); - CFX_RectF rect; - m_pNormalWidget->GetWidgetRect(rect, false); + + CFX_RectF rect = m_pNormalWidget->GetWidgetRect(); path.AddRectangle(0, 0, rect.width, rect.height); pGraphics->StrokePath(&path, (CFX_Matrix*)pMatrix); } -- cgit v1.2.3