From 8a4494034eb77bbc3453108616cc5dd67d3adbef Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 17 Aug 2017 15:07:47 -0700 Subject: Change DrawAppearance() methods to take CFX_Matrix by const-ref. Change-Id: If038850c745ac26e50c313bdbe630483434caedc Reviewed-on: https://pdfium-review.googlesource.com/11390 Commit-Queue: dsinclair Reviewed-by: dsinclair --- fpdfsdk/formfiller/cffl_button.cpp | 14 ++++++++------ fpdfsdk/formfiller/cffl_formfiller.cpp | 4 ++-- fpdfsdk/formfiller/cffl_interactiveformfiller.cpp | 8 +++++--- 3 files changed, 15 insertions(+), 11 deletions(-) (limited to 'fpdfsdk/formfiller') diff --git a/fpdfsdk/formfiller/cffl_button.cpp b/fpdfsdk/formfiller/cffl_button.cpp index 2a290ed213..4fd02ae178 100644 --- a/fpdfsdk/formfiller/cffl_button.cpp +++ b/fpdfsdk/formfiller/cffl_button.cpp @@ -67,30 +67,32 @@ void CFFL_Button::OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Widget* pWidget = static_cast(pAnnot); CPDF_FormControl* pCtrl = pWidget->GetFormControl(); if (pCtrl->GetHighlightingMode() != CPDF_FormControl::Push) { - pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr); + pWidget->DrawAppearance(pDevice, *pUser2Device, CPDF_Annot::Normal, + nullptr); return; } if (m_bMouseDown) { if (pWidget->IsWidgetAppearanceValid(CPDF_Annot::Down)) { - pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Down, nullptr); + pWidget->DrawAppearance(pDevice, *pUser2Device, CPDF_Annot::Down, + nullptr); } else { - pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, + pWidget->DrawAppearance(pDevice, *pUser2Device, CPDF_Annot::Normal, nullptr); } return; } if (m_bMouseIn) { if (pWidget->IsWidgetAppearanceValid(CPDF_Annot::Rollover)) { - pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Rollover, + pWidget->DrawAppearance(pDevice, *pUser2Device, CPDF_Annot::Rollover, nullptr); } else { - pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, + pWidget->DrawAppearance(pDevice, *pUser2Device, CPDF_Annot::Normal, nullptr); } return; } - pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr); + pWidget->DrawAppearance(pDevice, *pUser2Device, CPDF_Annot::Normal, nullptr); } void CFFL_Button::OnDrawDeactive(CPDFSDK_PageView* pPageView, diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp index f682122083..3e2e0c74e0 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.cpp +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp @@ -96,14 +96,14 @@ void CFFL_FormFiller::OnDraw(CPDFSDK_PageView* pPageView, if (!CFFL_InteractiveFormFiller::IsVisible(pWidget)) return; - pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr); + pWidget->DrawAppearance(pDevice, *pUser2Device, CPDF_Annot::Normal, nullptr); } void CFFL_FormFiller::OnDrawDeactive(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device) { - CPDFSDKAnnotToWidget(pAnnot)->DrawAppearance(pDevice, pUser2Device, + CPDFSDKAnnotToWidget(pAnnot)->DrawAppearance(pDevice, *pUser2Device, CPDF_Annot::Normal, nullptr); } diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp index 6d250408f0..27a4560581 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp @@ -96,10 +96,12 @@ void CFFL_InteractiveFormFiller::OnDraw(CPDFSDK_PageView* pPageView, } pFormFiller = GetFormFiller(pAnnot, false); - if (pFormFiller) + if (pFormFiller) { pFormFiller->OnDrawDeactive(pPageView, pAnnot, pDevice, pUser2Device); - else - pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr); + } else { + pWidget->DrawAppearance(pDevice, *pUser2Device, CPDF_Annot::Normal, + nullptr); + } if (!IsReadOnly(pWidget) && IsFillingAllowed(pWidget)) pWidget->DrawShadow(pDevice, pPageView); -- cgit v1.2.3