From 735606d84b6898a51c61b17a2d286a13d964589a Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 5 Oct 2016 15:47:02 -0700 Subject: Rename CPDFSDK_Environment to CPDFSDK_FormfillEnvironment Rename CPDFSDK_Environment to make it explicit that this is part of the formfill system. Review-Url: https://codereview.chromium.org/2391313002 --- fpdfsdk/formfiller/cffl_checkbox.cpp | 5 +++-- fpdfsdk/formfiller/cffl_checkbox.h | 2 +- fpdfsdk/formfiller/cffl_combobox.cpp | 5 +++-- fpdfsdk/formfiller/cffl_combobox.h | 2 +- fpdfsdk/formfiller/cffl_formfiller.cpp | 7 ++++--- fpdfsdk/formfiller/cffl_formfiller.h | 8 ++++---- fpdfsdk/formfiller/cffl_interactiveformfiller.cpp | 4 ++-- fpdfsdk/formfiller/cffl_interactiveformfiller.h | 6 +++--- fpdfsdk/formfiller/cffl_listbox.cpp | 5 +++-- fpdfsdk/formfiller/cffl_listbox.h | 2 +- fpdfsdk/formfiller/cffl_pushbutton.cpp | 2 +- fpdfsdk/formfiller/cffl_pushbutton.h | 2 +- fpdfsdk/formfiller/cffl_radiobutton.cpp | 4 ++-- fpdfsdk/formfiller/cffl_radiobutton.h | 2 +- fpdfsdk/formfiller/cffl_textfield.cpp | 5 +++-- fpdfsdk/formfiller/cffl_textfield.h | 2 +- 16 files changed, 34 insertions(+), 29 deletions(-) (limited to 'fpdfsdk/formfiller') diff --git a/fpdfsdk/formfiller/cffl_checkbox.cpp b/fpdfsdk/formfiller/cffl_checkbox.cpp index 27cf446990..64981f053c 100644 --- a/fpdfsdk/formfiller/cffl_checkbox.cpp +++ b/fpdfsdk/formfiller/cffl_checkbox.cpp @@ -6,13 +6,14 @@ #include "fpdfsdk/formfiller/cffl_checkbox.h" -#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/pdfwindow/PWL_SpecialButton.h" #include "public/fpdf_fwlevent.h" -CFFL_CheckBox::CFFL_CheckBox(CPDFSDK_Environment* pApp, CPDFSDK_Widget* pWidget) +CFFL_CheckBox::CFFL_CheckBox(CPDFSDK_FormFillEnvironment* pApp, + CPDFSDK_Widget* pWidget) : CFFL_Button(pApp, pWidget) {} CFFL_CheckBox::~CFFL_CheckBox() {} diff --git a/fpdfsdk/formfiller/cffl_checkbox.h b/fpdfsdk/formfiller/cffl_checkbox.h index c82d3338ee..0c62d5741b 100644 --- a/fpdfsdk/formfiller/cffl_checkbox.h +++ b/fpdfsdk/formfiller/cffl_checkbox.h @@ -11,7 +11,7 @@ class CFFL_CheckBox : public CFFL_Button { public: - CFFL_CheckBox(CPDFSDK_Environment* pApp, CPDFSDK_Widget* pWidget); + CFFL_CheckBox(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Widget* pWidget); ~CFFL_CheckBox() override; // CFFL_Button diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp index fad090fe0c..a7dda07e3b 100644 --- a/fpdfsdk/formfiller/cffl_combobox.cpp +++ b/fpdfsdk/formfiller/cffl_combobox.cpp @@ -6,7 +6,7 @@ #include "fpdfsdk/formfiller/cffl_combobox.h" -#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" @@ -14,7 +14,8 @@ #include "fpdfsdk/fsdk_common.h" #include "fpdfsdk/pdfwindow/PWL_ComboBox.h" -CFFL_ComboBox::CFFL_ComboBox(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot) +CFFL_ComboBox::CFFL_ComboBox(CPDFSDK_FormFillEnvironment* pApp, + CPDFSDK_Annot* pAnnot) : CFFL_FormFiller(pApp, pAnnot), m_pFontMap(nullptr) { m_State.nIndex = 0; m_State.nStart = 0; diff --git a/fpdfsdk/formfiller/cffl_combobox.h b/fpdfsdk/formfiller/cffl_combobox.h index acc61af0b1..6881038353 100644 --- a/fpdfsdk/formfiller/cffl_combobox.h +++ b/fpdfsdk/formfiller/cffl_combobox.h @@ -21,7 +21,7 @@ struct FFL_ComboBoxState { class CFFL_ComboBox : public CFFL_FormFiller, public IPWL_FocusHandler { public: - CFFL_ComboBox(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pWidget); + CFFL_ComboBox(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Annot* pWidget); ~CFFL_ComboBox() override; // CFFL_FormFiller: diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp index 858966c302..6369b45d7e 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.cpp +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp @@ -9,7 +9,7 @@ #include "core/fpdfapi/page/cpdf_page.h" #include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/cpdfsdk_document.h" -#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cba_fontmap.h" @@ -22,7 +22,7 @@ #define FFL_HINT_ELAPSE 800 -CFFL_FormFiller::CFFL_FormFiller(CPDFSDK_Environment* pEnv, +CFFL_FormFiller::CFFL_FormFiller(CPDFSDK_FormFillEnvironment* pEnv, CPDFSDK_Annot* pAnnot) : m_pEnv(pEnv), m_pAnnot(pAnnot), m_bValid(FALSE) { m_pWidget = static_cast(pAnnot); @@ -618,7 +618,8 @@ void CFFL_FormFiller::InvalidateRect(double left, m_pEnv->Invalidate(pPage, left, top, right, bottom); } -CFFL_Button::CFFL_Button(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pWidget) +CFFL_Button::CFFL_Button(CPDFSDK_FormFillEnvironment* pApp, + CPDFSDK_Annot* pWidget) : CFFL_FormFiller(pApp, pWidget), m_bMouseIn(FALSE), m_bMouseDown(FALSE) {} CFFL_Button::~CFFL_Button() {} diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h index 430717113d..cfce22fd12 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.h +++ b/fpdfsdk/formfiller/cffl_formfiller.h @@ -14,13 +14,13 @@ #include "fpdfsdk/pdfsdk_fieldaction.h" class CPDFSDK_Annot; -class CPDFSDK_Environment; +class CPDFSDK_FormFillEnvironment; class CPDFSDK_PageView; class CPDFSDK_Widget; class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { public: - CFFL_FormFiller(CPDFSDK_Environment* pEnv, CPDFSDK_Annot* pAnnot); + CFFL_FormFiller(CPDFSDK_FormFillEnvironment* pEnv, CPDFSDK_Annot* pAnnot); ~CFFL_FormFiller() override; virtual FX_RECT GetViewBBox(CPDFSDK_PageView* pPageView, @@ -161,7 +161,7 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { // until the PWL_Edit is done with it. pdfium:566 void DestroyWindows(); - CPDFSDK_Environment* m_pEnv; + CPDFSDK_FormFillEnvironment* m_pEnv; CPDFSDK_Widget* m_pWidget; CPDFSDK_Annot* m_pAnnot; @@ -172,7 +172,7 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { class CFFL_Button : public CFFL_FormFiller { public: - CFFL_Button(CPDFSDK_Environment* pEnv, CPDFSDK_Annot* pWidget); + CFFL_Button(CPDFSDK_FormFillEnvironment* pEnv, CPDFSDK_Annot* pWidget); ~CFFL_Button() override; // CFFL_FormFiller diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp index b2789d7f90..12c55d37b3 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp @@ -12,7 +12,7 @@ #include "core/fxge/cfx_pathdata.h" #include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/cpdfsdk_document.h" -#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_interform.h" #include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/cpdfsdk_widget.h" @@ -28,7 +28,7 @@ #define FFL_MAXLISTBOXHEIGHT 140.0f CFFL_InteractiveFormFiller::CFFL_InteractiveFormFiller( - CPDFSDK_Environment* pEnv) + CPDFSDK_FormFillEnvironment* pEnv) : m_pEnv(pEnv), m_bNotifying(FALSE) {} CFFL_InteractiveFormFiller::~CFFL_InteractiveFormFiller() {} diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.h b/fpdfsdk/formfiller/cffl_interactiveformfiller.h index 9a303b48ea..58fafe032d 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.h +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.h @@ -15,13 +15,13 @@ #include "fpdfsdk/pdfwindow/PWL_Edit.h" class CFFL_FormFiller; -class CPDFSDK_Environment; +class CPDFSDK_FormFillEnvironment; class CPDFSDK_PageView; class CPDFSDK_Widget; class CFFL_InteractiveFormFiller : public IPWL_Filler_Notify { public: - explicit CFFL_InteractiveFormFiller(CPDFSDK_Environment* pEnv); + explicit CFFL_InteractiveFormFiller(CPDFSDK_FormFillEnvironment* pEnv); ~CFFL_InteractiveFormFiller() override; FX_BOOL Annot_HitTest(CPDFSDK_PageView* pPageView, @@ -167,7 +167,7 @@ class CFFL_InteractiveFormFiller : public IPWL_Filler_Notify { #endif // PDF_ENABLE_XFA void UnRegisterFormFiller(CPDFSDK_Annot* pAnnot); - CPDFSDK_Environment* const m_pEnv; + CPDFSDK_FormFillEnvironment* const m_pEnv; CFFL_Widget2Filler m_Maps; FX_BOOL m_bNotifying; }; diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp index ab437d401e..e4ea65b846 100644 --- a/fpdfsdk/formfiller/cffl_listbox.cpp +++ b/fpdfsdk/formfiller/cffl_listbox.cpp @@ -6,7 +6,7 @@ #include "fpdfsdk/formfiller/cffl_listbox.h" -#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" @@ -17,7 +17,8 @@ #define FFL_DEFAULTLISTBOXFONTSIZE 12.0f -CFFL_ListBox::CFFL_ListBox(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pWidget) +CFFL_ListBox::CFFL_ListBox(CPDFSDK_FormFillEnvironment* pApp, + CPDFSDK_Annot* pWidget) : CFFL_FormFiller(pApp, pWidget) {} CFFL_ListBox::~CFFL_ListBox() {} diff --git a/fpdfsdk/formfiller/cffl_listbox.h b/fpdfsdk/formfiller/cffl_listbox.h index 8d8ed0d5ab..12490b8053 100644 --- a/fpdfsdk/formfiller/cffl_listbox.h +++ b/fpdfsdk/formfiller/cffl_listbox.h @@ -16,7 +16,7 @@ class CBA_FontMap; class CFFL_ListBox : public CFFL_FormFiller { public: - CFFL_ListBox(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pWidget); + CFFL_ListBox(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Annot* pWidget); ~CFFL_ListBox() override; // CFFL_FormFiller diff --git a/fpdfsdk/formfiller/cffl_pushbutton.cpp b/fpdfsdk/formfiller/cffl_pushbutton.cpp index 4b147fbfb1..4fb7b09cc8 100644 --- a/fpdfsdk/formfiller/cffl_pushbutton.cpp +++ b/fpdfsdk/formfiller/cffl_pushbutton.cpp @@ -9,7 +9,7 @@ #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/pdfwindow/PWL_SpecialButton.h" -CFFL_PushButton::CFFL_PushButton(CPDFSDK_Environment* pApp, +CFFL_PushButton::CFFL_PushButton(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Annot* pAnnot) : CFFL_Button(pApp, pAnnot) {} diff --git a/fpdfsdk/formfiller/cffl_pushbutton.h b/fpdfsdk/formfiller/cffl_pushbutton.h index cac09047e6..9b0a7b30e3 100644 --- a/fpdfsdk/formfiller/cffl_pushbutton.h +++ b/fpdfsdk/formfiller/cffl_pushbutton.h @@ -11,7 +11,7 @@ class CFFL_PushButton : public CFFL_Button { public: - CFFL_PushButton(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot); + CFFL_PushButton(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Annot* pAnnot); ~CFFL_PushButton() override; // CFFL_Button diff --git a/fpdfsdk/formfiller/cffl_radiobutton.cpp b/fpdfsdk/formfiller/cffl_radiobutton.cpp index 394521217f..73fd18d2af 100644 --- a/fpdfsdk/formfiller/cffl_radiobutton.cpp +++ b/fpdfsdk/formfiller/cffl_radiobutton.cpp @@ -6,13 +6,13 @@ #include "fpdfsdk/formfiller/cffl_radiobutton.h" -#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/pdfwindow/PWL_SpecialButton.h" #include "public/fpdf_fwlevent.h" -CFFL_RadioButton::CFFL_RadioButton(CPDFSDK_Environment* pApp, +CFFL_RadioButton::CFFL_RadioButton(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Annot* pWidget) : CFFL_Button(pApp, pWidget) {} diff --git a/fpdfsdk/formfiller/cffl_radiobutton.h b/fpdfsdk/formfiller/cffl_radiobutton.h index 28dd412100..b3656b945c 100644 --- a/fpdfsdk/formfiller/cffl_radiobutton.h +++ b/fpdfsdk/formfiller/cffl_radiobutton.h @@ -11,7 +11,7 @@ class CFFL_RadioButton : public CFFL_Button { public: - CFFL_RadioButton(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot); + CFFL_RadioButton(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Annot* pAnnot); ~CFFL_RadioButton() override; // CFFL_Button diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp index ffb3785c36..a2612f17ef 100644 --- a/fpdfsdk/formfiller/cffl_textfield.cpp +++ b/fpdfsdk/formfiller/cffl_textfield.cpp @@ -6,13 +6,14 @@ #include "fpdfsdk/formfiller/cffl_textfield.h" -#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/fsdk_common.h" #include "third_party/base/ptr_util.h" -CFFL_TextField::CFFL_TextField(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot) +CFFL_TextField::CFFL_TextField(CPDFSDK_FormFillEnvironment* pApp, + CPDFSDK_Annot* pAnnot) : CFFL_FormFiller(pApp, pAnnot) {} CFFL_TextField::~CFFL_TextField() { diff --git a/fpdfsdk/formfiller/cffl_textfield.h b/fpdfsdk/formfiller/cffl_textfield.h index 5c94b2e55d..74381e5e1c 100644 --- a/fpdfsdk/formfiller/cffl_textfield.h +++ b/fpdfsdk/formfiller/cffl_textfield.h @@ -27,7 +27,7 @@ struct FFL_TextFieldState { class CFFL_TextField : public CFFL_FormFiller, public IPWL_FocusHandler { public: - CFFL_TextField(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot); + CFFL_TextField(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Annot* pAnnot); ~CFFL_TextField() override; // CFFL_FormFiller: -- cgit v1.2.3