From 4b47214ac95ee1ac7c09688363e48c3e6eb77ea8 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 17 Aug 2017 14:30:08 -0700 Subject: Change XFA DrawWidget() code to take its CFX_Matrix by const-ref. Change-Id: Idc9dfcafe6727c1689443ce8f9568567e55d51c8 Reviewed-on: https://pdfium-review.googlesource.com/11114 Commit-Queue: Lei Zhang Reviewed-by: dsinclair --- xfa/fwl/cfwl_checkbox.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'xfa/fwl/cfwl_checkbox.cpp') diff --git a/xfa/fwl/cfwl_checkbox.cpp b/xfa/fwl/cfwl_checkbox.cpp index bc45e5a792..42b6cadc83 100644 --- a/xfa/fwl/cfwl_checkbox.cpp +++ b/xfa/fwl/cfwl_checkbox.cpp @@ -62,7 +62,7 @@ void CFWL_CheckBox::Update() { } void CFWL_CheckBox::DrawWidget(CXFA_Graphics* pGraphics, - const CFX_Matrix* pMatrix) { + const CFX_Matrix& matrix) { if (!pGraphics) return; if (!m_pProperties->m_pThemeProvider) @@ -71,7 +71,7 @@ void CFWL_CheckBox::DrawWidget(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider; if (HasBorder()) { DrawBorder(pGraphics, CFWL_Part::Border, m_pProperties->m_pThemeProvider, - pMatrix); + matrix); } int32_t dwStates = GetPartStates(); @@ -81,8 +81,7 @@ void CFWL_CheckBox::DrawWidget(CXFA_Graphics* pGraphics, param.m_iPart = CFWL_Part::Background; param.m_dwStates = dwStates; param.m_pGraphics = pGraphics; - if (pMatrix) - param.m_matrix.Concat(*pMatrix); + param.m_matrix.Concat(matrix); param.m_rtPart = m_rtClient; if (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) param.m_pData = &m_rtFocus; @@ -97,8 +96,7 @@ void CFWL_CheckBox::DrawWidget(CXFA_Graphics* pGraphics, textParam.m_iPart = CFWL_Part::Caption; textParam.m_dwStates = dwStates; textParam.m_pGraphics = pGraphics; - if (pMatrix) - textParam.m_matrix.Concat(*pMatrix); + textParam.m_matrix.Concat(matrix); textParam.m_rtPart = m_rtCaption; textParam.m_wsText = L"Check box"; textParam.m_dwTTOStyles = m_dwTTOStyles; @@ -268,8 +266,8 @@ void CFWL_CheckBox::OnProcessMessage(CFWL_Message* pMessage) { } void CFWL_CheckBox::OnDrawWidget(CXFA_Graphics* pGraphics, - const CFX_Matrix* pMatrix) { - DrawWidget(pGraphics, pMatrix); + const CFX_Matrix& matrix) { + DrawWidget(pGraphics, matrix); } void CFWL_CheckBox::OnFocusChanged(bool bSet) { -- cgit v1.2.3