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_listbox.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'xfa/fwl/cfwl_listbox.cpp') diff --git a/xfa/fwl/cfwl_listbox.cpp b/xfa/fwl/cfwl_listbox.cpp index d0455ff650..ce1c0133f9 100644 --- a/xfa/fwl/cfwl_listbox.cpp +++ b/xfa/fwl/cfwl_listbox.cpp @@ -91,7 +91,7 @@ FWL_WidgetHit CFWL_ListBox::HitTest(const CFX_PointF& point) { } void CFWL_ListBox::DrawWidget(CXFA_Graphics* pGraphics, - const CFX_Matrix* pMatrix) { + const CFX_Matrix& matrix) { if (!pGraphics) return; if (!m_pProperties->m_pThemeProvider) @@ -100,21 +100,20 @@ void CFWL_ListBox::DrawWidget(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider; pGraphics->SaveGraphState(); if (HasBorder()) - DrawBorder(pGraphics, CFWL_Part::Border, pTheme, pMatrix); + DrawBorder(pGraphics, CFWL_Part::Border, pTheme, matrix); CFX_RectF rtClip(m_rtConent); if (IsShowScrollBar(false)) rtClip.height -= m_fScorllBarWidth; if (IsShowScrollBar(true)) rtClip.width -= m_fScorllBarWidth; - if (pMatrix) - pMatrix->TransformRect(rtClip); + matrix.TransformRect(rtClip); pGraphics->SetClipRect(rtClip); if ((m_pProperties->m_dwStyles & FWL_WGTSTYLE_NoBackground) == 0) - DrawBkground(pGraphics, pTheme, pMatrix); + DrawBkground(pGraphics, pTheme, &matrix); - DrawItems(pGraphics, pTheme, pMatrix); + DrawItems(pGraphics, pTheme, &matrix); pGraphics->RestoreGraphState(); } @@ -714,8 +713,8 @@ void CFWL_ListBox::OnProcessEvent(CFWL_Event* pEvent) { } void CFWL_ListBox::OnDrawWidget(CXFA_Graphics* pGraphics, - const CFX_Matrix* pMatrix) { - DrawWidget(pGraphics, pMatrix); + const CFX_Matrix& matrix) { + DrawWidget(pGraphics, matrix); } void CFWL_ListBox::OnFocusChanged(CFWL_Message* pMsg, bool bSet) { -- cgit v1.2.3