From 7c9d4c272c57965cb1d407a156bab1110c65e0f6 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 17 Aug 2017 13:53:52 -0700 Subject: Change CXFA_FFWidget::RenderWidget() to take a const CFX_Matrix&. Change some related code to take a const CFX_Matrix* since it is not immediately obvious if the matrix can be made into a const-ref. Change-Id: I15c840222b575cc479b1f6f0b6d3b3c0e50d5515 Reviewed-on: https://pdfium-review.googlesource.com/11113 Commit-Queue: Lei Zhang Reviewed-by: dsinclair --- xfa/fxfa/cxfa_fffield.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/cxfa_fffield.cpp') diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp index 1ef8824a3b..c62f4dcaec 100644 --- a/xfa/fxfa/cxfa_fffield.cpp +++ b/xfa/fxfa/cxfa_fffield.cpp @@ -58,16 +58,15 @@ CFX_RectF CXFA_FFField::GetBBox(uint32_t dwStatus, bool bDrawFocus) { } void CXFA_FFField::RenderWidget(CXFA_Graphics* pGS, - CFX_Matrix* pMatrix, + const CFX_Matrix& matrix, uint32_t dwStatus) { if (!IsMatchVisibleStatus(dwStatus)) return; CFX_Matrix mtRotate = GetRotateMatrix(); - if (pMatrix) - mtRotate.Concat(*pMatrix); + mtRotate.Concat(matrix); - CXFA_FFWidget::RenderWidget(pGS, &mtRotate, dwStatus); + CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus); CXFA_Border borderUI = m_pDataAcc->GetUIBorder(); DrawBorder(pGS, borderUI, m_rtUI, &mtRotate); RenderCaption(pGS, &mtRotate); -- cgit v1.2.3