From 4bae296c1eee7a1ecae8bab3d59dd9430218f730 Mon Sep 17 00:00:00 2001 From: jaepark Date: Thu, 1 Sep 2016 14:39:24 -0700 Subject: Remove unused dwFlags parameter in CPDFSDK_AnnotHandlerMgr::OnDraw and its calls. Review-Url: https://codereview.chromium.org/2305443005 --- fpdfsdk/formfiller/cffl_formfiller.cpp | 14 +++++--------- fpdfsdk/formfiller/cffl_formfiller.h | 12 ++++-------- fpdfsdk/formfiller/cffl_iformfiller.cpp | 8 +++----- fpdfsdk/formfiller/cffl_iformfiller.h | 3 +-- fpdfsdk/formfiller/cffl_pushbutton.cpp | 5 ++--- fpdfsdk/formfiller/cffl_pushbutton.h | 3 +-- 6 files changed, 16 insertions(+), 29 deletions(-) (limited to 'fpdfsdk/formfiller') diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp index 6a8ec5da33..f97df0a2b3 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.cpp +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp @@ -83,8 +83,7 @@ FX_RECT CFFL_FormFiller::GetViewBBox(CPDFSDK_PageView* pPageView, void CFFL_FormFiller::OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CFX_Matrix* pUser2Device, - uint32_t dwFlags) { + CFX_Matrix* pUser2Device) { ASSERT(pAnnot->GetPDFAnnot()->GetSubtype() == CPDF_Annot::Subtype::WIDGET); if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, FALSE)) { @@ -102,8 +101,7 @@ void CFFL_FormFiller::OnDraw(CPDFSDK_PageView* pPageView, void CFFL_FormFiller::OnDrawDeactive(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CFX_Matrix* pUser2Device, - uint32_t dwFlags) { + CFX_Matrix* pUser2Device) { CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot; pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr); } @@ -687,8 +685,7 @@ FX_BOOL CFFL_Button::OnMouseMove(CPDFSDK_PageView* pPageView, void CFFL_Button::OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CFX_Matrix* pUser2Device, - uint32_t dwFlags) { + CFX_Matrix* pUser2Device) { ASSERT(pPageView); CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot; CPDF_FormControl* pCtrl = pWidget->GetFormControl(); @@ -720,7 +717,6 @@ void CFFL_Button::OnDraw(CPDFSDK_PageView* pPageView, void CFFL_Button::OnDrawDeactive(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CFX_Matrix* pUser2Device, - uint32_t dwFlags) { - OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags); + CFX_Matrix* pUser2Device) { + OnDraw(pPageView, pAnnot, pDevice, pUser2Device); } diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h index 060eb8f9e7..d691e3f6ce 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.h +++ b/fpdfsdk/formfiller/cffl_formfiller.h @@ -28,13 +28,11 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { virtual void OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CFX_Matrix* pUser2Device, - uint32_t dwFlags); + CFX_Matrix* pUser2Device); virtual void OnDrawDeactive(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CFX_Matrix* pUser2Device, - uint32_t dwFlags); + CFX_Matrix* pUser2Device); virtual void OnCreate(CPDFSDK_Annot* pAnnot); virtual void OnLoad(CPDFSDK_Annot* pAnnot); @@ -195,13 +193,11 @@ class CFFL_Button : public CFFL_FormFiller { void OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CFX_Matrix* pUser2Device, - uint32_t dwFlags) override; + CFX_Matrix* pUser2Device) override; void OnDrawDeactive(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CFX_Matrix* pUser2Device, - uint32_t dwFlags) override; + CFX_Matrix* pUser2Device) override; protected: FX_BOOL m_bMouseIn; diff --git a/fpdfsdk/formfiller/cffl_iformfiller.cpp b/fpdfsdk/formfiller/cffl_iformfiller.cpp index 111294726c..c832a96b1e 100644 --- a/fpdfsdk/formfiller/cffl_iformfiller.cpp +++ b/fpdfsdk/formfiller/cffl_iformfiller.cpp @@ -52,8 +52,7 @@ FX_RECT CFFL_IFormFiller::GetViewBBox(CPDFSDK_PageView* pPageView, void CFFL_IFormFiller::OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CFX_Matrix* pUser2Device, - uint32_t dwFlags) { + CFX_Matrix* pUser2Device) { ASSERT(pPageView); CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot; @@ -62,7 +61,7 @@ void CFFL_IFormFiller::OnDraw(CPDFSDK_PageView* pPageView, if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) { if (pFormFiller->IsValid()) { - pFormFiller->OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags); + pFormFiller->OnDraw(pPageView, pAnnot, pDevice, pUser2Device); pAnnot->GetPDFPage(); CPDFSDK_Document* pDocument = m_pApp->GetSDKDocument(); @@ -91,8 +90,7 @@ void CFFL_IFormFiller::OnDraw(CPDFSDK_PageView* pPageView, } if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) { - pFormFiller->OnDrawDeactive(pPageView, pAnnot, pDevice, pUser2Device, - dwFlags); + pFormFiller->OnDrawDeactive(pPageView, pAnnot, pDevice, pUser2Device); } else { pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr); } diff --git a/fpdfsdk/formfiller/cffl_iformfiller.h b/fpdfsdk/formfiller/cffl_iformfiller.h index b5b0e4aed6..36cf19dd64 100644 --- a/fpdfsdk/formfiller/cffl_iformfiller.h +++ b/fpdfsdk/formfiller/cffl_iformfiller.h @@ -32,8 +32,7 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { virtual void OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CFX_Matrix* pUser2Device, - uint32_t dwFlags); + CFX_Matrix* pUser2Device); virtual void OnCreate(CPDFSDK_Annot* pAnnot); virtual void OnLoad(CPDFSDK_Annot* pAnnot); diff --git a/fpdfsdk/formfiller/cffl_pushbutton.cpp b/fpdfsdk/formfiller/cffl_pushbutton.cpp index 001560836f..d8da65a383 100644 --- a/fpdfsdk/formfiller/cffl_pushbutton.cpp +++ b/fpdfsdk/formfiller/cffl_pushbutton.cpp @@ -32,7 +32,6 @@ FX_BOOL CFFL_PushButton::OnChar(CPDFSDK_Annot* pAnnot, void CFFL_PushButton::OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CFX_Matrix* pUser2Device, - uint32_t dwFlags) { - CFFL_Button::OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags); + CFX_Matrix* pUser2Device) { + CFFL_Button::OnDraw(pPageView, pAnnot, pDevice, pUser2Device); } diff --git a/fpdfsdk/formfiller/cffl_pushbutton.h b/fpdfsdk/formfiller/cffl_pushbutton.h index ff53ce45ac..9292a76266 100644 --- a/fpdfsdk/formfiller/cffl_pushbutton.h +++ b/fpdfsdk/formfiller/cffl_pushbutton.h @@ -21,8 +21,7 @@ class CFFL_PushButton : public CFFL_Button { void OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, - CFX_Matrix* pUser2Device, - uint32_t dwFlags) override; + CFX_Matrix* pUser2Device) override; }; #endif // FPDFSDK_FORMFILLER_CFFL_PUSHBUTTON_H_ -- cgit v1.2.3