diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-08-17 14:30:08 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-17 21:30:51 +0000 |
| commit | 4b47214ac95ee1ac7c09688363e48c3e6eb77ea8 (patch) | |
| tree | 4bb575c4d6eda2cb40779ebaae04f98e3b95d216 /xfa/fwl/cfwl_combobox.cpp | |
| parent | 7c9d4c272c57965cb1d407a156bab1110c65e0f6 (diff) | |
| download | pdfium-chromium/3190.tar.xz | |
Change XFA DrawWidget() code to take its CFX_Matrix by const-ref.chromium/3192chromium/3191chromium/3190chromium/3189
Change-Id: Idc9dfcafe6727c1689443ce8f9568567e55d51c8
Reviewed-on: https://pdfium-review.googlesource.com/11114
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fwl/cfwl_combobox.cpp')
| -rw-r--r-- | xfa/fwl/cfwl_combobox.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/xfa/fwl/cfwl_combobox.cpp b/xfa/fwl/cfwl_combobox.cpp index ec90a15684..a3dbe8c946 100644 --- a/xfa/fwl/cfwl_combobox.cpp +++ b/xfa/fwl/cfwl_combobox.cpp @@ -126,9 +126,9 @@ FWL_WidgetHit CFWL_ComboBox::HitTest(const CFX_PointF& point) { } void CFWL_ComboBox::DrawWidget(CXFA_Graphics* pGraphics, - const CFX_Matrix* pMatrix) { + const CFX_Matrix& matrix) { if (m_pWidgetMgr->IsFormDisabled()) { - DisForm_DrawWidget(pGraphics, pMatrix); + DisForm_DrawWidget(pGraphics, &matrix); return; } @@ -139,7 +139,7 @@ void CFWL_ComboBox::DrawWidget(CXFA_Graphics* pGraphics, IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider; if (HasBorder()) - DrawBorder(pGraphics, CFWL_Part::Border, pTheme, pMatrix); + DrawBorder(pGraphics, CFWL_Part::Border, pTheme, matrix); if (!IsDropDownStyle()) { CFX_RectF rtTextBk(m_rtClient); @@ -149,8 +149,7 @@ void CFWL_ComboBox::DrawWidget(CXFA_Graphics* pGraphics, param.m_pWidget = this; param.m_iPart = CFWL_Part::Background; param.m_pGraphics = pGraphics; - if (pMatrix) - param.m_matrix.Concat(*pMatrix); + param.m_matrix.Concat(matrix); param.m_rtPart = rtTextBk; if (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) { @@ -174,7 +173,7 @@ void CFWL_ComboBox::DrawWidget(CXFA_Graphics* pGraphics, theme_text.m_iPart = CFWL_Part::Caption; theme_text.m_dwStates = m_iBtnState; theme_text.m_pGraphics = pGraphics; - theme_text.m_matrix.Concat(*pMatrix); + theme_text.m_matrix.Concat(matrix); theme_text.m_rtPart = rtTextBk; theme_text.m_dwStates = (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) ? CFWL_PartState_Selected @@ -193,7 +192,7 @@ void CFWL_ComboBox::DrawWidget(CXFA_Graphics* pGraphics, ? CFWL_PartState_Disabled : m_iBtnState; param.m_pGraphics = pGraphics; - param.m_matrix.Concat(*pMatrix); + param.m_matrix.Concat(matrix); param.m_rtPart = m_rtBtn; pTheme->DrawBackground(¶m); } @@ -639,13 +638,13 @@ void CFWL_ComboBox::DisForm_DrawWidget(CXFA_Graphics* pGraphics, CFX_RectF rtEdit = m_pEdit->GetWidgetRect(); CFX_Matrix mt(1, 0, 0, 1, rtEdit.left, rtEdit.top); mt.Concat(mtOrg); - m_pEdit->DrawWidget(pGraphics, &mt); + m_pEdit->DrawWidget(pGraphics, mt); } if (m_pListBox && DisForm_IsDropListVisible()) { CFX_RectF rtList = m_pListBox->GetWidgetRect(); CFX_Matrix mt(1, 0, 0, 1, rtList.left, rtList.top); mt.Concat(mtOrg); - m_pListBox->DrawWidget(pGraphics, &mt); + m_pListBox->DrawWidget(pGraphics, mt); } } @@ -757,8 +756,8 @@ void CFWL_ComboBox::OnProcessEvent(CFWL_Event* pEvent) { } void CFWL_ComboBox::OnDrawWidget(CXFA_Graphics* pGraphics, - const CFX_Matrix* pMatrix) { - DrawWidget(pGraphics, pMatrix); + const CFX_Matrix& matrix) { + DrawWidget(pGraphics, matrix); } void CFWL_ComboBox::OnFocusChanged(CFWL_Message* pMsg, bool bSet) { |