Convert Get methods to return instead of using out params.

This Cl changes several Get methods to return their values instead of using
out parameters.

Change-Id: Ie9a930a5c2d0e809f2d7181ca033d801945c1cf9
Reviewed-on: https://pdfium-review.googlesource.com/2556
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>

1 files changed, 36 insertions, 42 deletions

diff --git a/xfa/fxfa/app/xfa_ffpath.cpp b/xfa/fxfa/app/xfa_ffpath.cpp
index 0620982b1c..c4e6554c1a 100644
--- a/xfa/fxfa/app/xfa_ffpath.cpp
+++ b/xfa/fxfa/app/xfa_ffpath.cpp
@@ -54,47 +54,45 @@ void CXFA_FFLine::GetRectFromHand(CFX_RectF& rect,
 void CXFA_FFLine::RenderWidget(CFX_Graphics* pGS,
                                CFX_Matrix* pMatrix,
                                uint32_t dwStatus) {
-  if (!IsMatchVisibleStatus(dwStatus)) {
+  if (!IsMatchVisibleStatus(dwStatus))
     return;
-  }
+
   CXFA_Value value = m_pDataAcc->GetFormValue();
-  if (!value) {
+  if (!value)
     return;
-  }
+
   CXFA_Line lineObj = value.GetLine();
   FX_ARGB lineColor = 0xFF000000;
   int32_t iStrokeType = 0;
   FX_FLOAT fLineWidth = 1.0f;
-  bool bSlope = lineObj.GetSlop();
   int32_t iCap = 0;
   CXFA_Edge edge = lineObj.GetEdge();
   if (edge) {
-    if (edge.GetPresence() != XFA_ATTRIBUTEENUM_Visible) {
+    if (edge.GetPresence() != XFA_ATTRIBUTEENUM_Visible)
       return;
-    }
+
     lineColor = edge.GetColor();
     iStrokeType = edge.GetStrokeType();
     fLineWidth = edge.GetThickness();
     iCap = edge.GetCapType();
   }
-  CFX_Matrix mtRotate;
-  GetRotateMatrix(mtRotate);
-  if (pMatrix) {
+
+  CFX_Matrix mtRotate = GetRotateMatrix();
+  if (pMatrix)
     mtRotate.Concat(*pMatrix);
-  }
-  CFX_RectF rtLine;
-  GetRectWithoutRotate(rtLine);
-  if (CXFA_Margin mgWidget = m_pDataAcc->GetMargin()) {
+
+  CFX_RectF rtLine = GetRectWithoutRotate();
+  if (CXFA_Margin mgWidget = m_pDataAcc->GetMargin())
     XFA_RectWidthoutMargin(rtLine, mgWidget);
-  }
+
   GetRectFromHand(rtLine, lineObj.GetHand(), fLineWidth);
   CFX_Path linePath;
   linePath.Create();
-  if (bSlope && rtLine.right() > 0.0f && rtLine.bottom() > 0.0f) {
+  if (lineObj.GetSlope() && rtLine.right() > 0.0f && rtLine.bottom() > 0.0f)
     linePath.AddLine(rtLine.right(), rtLine.top, rtLine.left, rtLine.bottom());
-  } else {
+  else
     linePath.AddLine(rtLine.left, rtLine.top, rtLine.right(), rtLine.bottom());
-  }
+
   CFX_Color color(lineColor);
   pGS->SaveGraphState();
   pGS->SetLineWidth(fLineWidth, true);
@@ -112,24 +110,22 @@ CXFA_FFArc::~CXFA_FFArc() {}
 void CXFA_FFArc::RenderWidget(CFX_Graphics* pGS,
                               CFX_Matrix* pMatrix,
                               uint32_t dwStatus) {
-  if (!IsMatchVisibleStatus(dwStatus)) {
+  if (!IsMatchVisibleStatus(dwStatus))
     return;
-  }
+
   CXFA_Value value = m_pDataAcc->GetFormValue();
-  if (!value) {
+  if (!value)
     return;
-  }
+
   CXFA_Arc arcObj = value.GetArc();
-  CFX_Matrix mtRotate;
-  GetRotateMatrix(mtRotate);
-  if (pMatrix) {
+  CFX_Matrix mtRotate = GetRotateMatrix();
+  if (pMatrix)
     mtRotate.Concat(*pMatrix);
-  }
-  CFX_RectF rtArc;
-  GetRectWithoutRotate(rtArc);
-  if (CXFA_Margin mgWidget = m_pDataAcc->GetMargin()) {
+
+  CFX_RectF rtArc = GetRectWithoutRotate();
+  if (CXFA_Margin mgWidget = m_pDataAcc->GetMargin())
     XFA_RectWidthoutMargin(rtArc, mgWidget);
-  }
+
   DrawBorder(pGS, arcObj, rtArc, &mtRotate);
 }
 
@@ -141,23 +137,21 @@ CXFA_FFRectangle::~CXFA_FFRectangle() {}
 void CXFA_FFRectangle::RenderWidget(CFX_Graphics* pGS,
                                     CFX_Matrix* pMatrix,
                                     uint32_t dwStatus) {
-  if (!IsMatchVisibleStatus(dwStatus)) {
+  if (!IsMatchVisibleStatus(dwStatus))
     return;
-  }
+
   CXFA_Value value = m_pDataAcc->GetFormValue();
-  if (!value) {
+  if (!value)
     return;
-  }
+
   CXFA_Rectangle rtObj = value.GetRectangle();
-  CFX_RectF rect;
-  GetRectWithoutRotate(rect);
-  if (CXFA_Margin mgWidget = m_pDataAcc->GetMargin()) {
+  CFX_RectF rect = GetRectWithoutRotate();
+  if (CXFA_Margin mgWidget = m_pDataAcc->GetMargin())
     XFA_RectWidthoutMargin(rect, mgWidget);
-  }
-  CFX_Matrix mtRotate;
-  GetRotateMatrix(mtRotate);
-  if (pMatrix) {
+
+  CFX_Matrix mtRotate = GetRotateMatrix();
+  if (pMatrix)
     mtRotate.Concat(*pMatrix);
-  }
+
   DrawBorder(pGS, rtObj, rect, &mtRotate);
 }