From 566b974287ce0e81a963138152b8898f22480f52 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 26 Feb 2016 13:17:56 -0800 Subject: Revert "Replace CPDF_Rect and CPDF_Point with CFX types." This reverts commit 3b8fdd34bdf57ec45291b77008a43249f838efcb. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1743753002 . --- fpdfsdk/include/formfiller/FFL_CheckBox.h | 2 +- fpdfsdk/include/formfiller/FFL_FormFiller.h | 45 +++++++++++++--------------- fpdfsdk/include/formfiller/FFL_IFormFiller.h | 16 +++++----- fpdfsdk/include/formfiller/FFL_RadioButton.h | 2 +- 4 files changed, 31 insertions(+), 34 deletions(-) (limited to 'fpdfsdk/include/formfiller') diff --git a/fpdfsdk/include/formfiller/FFL_CheckBox.h b/fpdfsdk/include/formfiller/FFL_CheckBox.h index 7536871f16..4ffb143734 100644 --- a/fpdfsdk/include/formfiller/FFL_CheckBox.h +++ b/fpdfsdk/include/formfiller/FFL_CheckBox.h @@ -24,7 +24,7 @@ class CFFL_CheckBox : public CFFL_Button { FX_BOOL OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point) override; + const CPDF_Point& point) override; FX_BOOL IsDataChanged(CPDFSDK_PageView* pPageView) override; void SaveData(CPDFSDK_PageView* pPageView) override; }; diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h index 4ea8fdaa8b..cb14397be5 100644 --- a/fpdfsdk/include/formfiller/FFL_FormFiller.h +++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h @@ -45,32 +45,32 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { virtual FX_BOOL OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point); + const CPDF_Point& point); virtual FX_BOOL OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point); + const CPDF_Point& point); virtual FX_BOOL OnLButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point); + const CPDF_Point& point); virtual FX_BOOL OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point); + const CPDF_Point& point); virtual FX_BOOL OnMouseWheel(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, short zDelta, - const CFX_FloatPoint& point); + const CPDF_Point& point); virtual FX_BOOL OnRButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point); + const CPDF_Point& point); virtual FX_BOOL OnRButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point); + const CPDF_Point& point); virtual FX_BOOL OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, @@ -106,19 +106,16 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { CFX_Matrix GetCurMatrix(); - CFX_FloatRect FFLtoPWL(const CFX_FloatRect& rect); - CFX_FloatRect PWLtoFFL(const CFX_FloatRect& rect); - CFX_FloatPoint FFLtoPWL(const CFX_FloatPoint& point); - CFX_FloatPoint PWLtoFFL(const CFX_FloatPoint& point); + CPDF_Rect FFLtoPWL(const CPDF_Rect& rect); + CPDF_Rect PWLtoFFL(const CPDF_Rect& rect); + CPDF_Point FFLtoPWL(const CPDF_Point& point); + CPDF_Point PWLtoFFL(const CPDF_Point& point); - CFX_FloatPoint WndtoPWL(CPDFSDK_PageView* pPageView, - const CFX_FloatPoint& pt); - CFX_FloatRect FFLtoWnd(CPDFSDK_PageView* pPageView, - const CFX_FloatRect& rect); + CPDF_Point WndtoPWL(CPDFSDK_PageView* pPageView, const CPDF_Point& pt); + CPDF_Rect FFLtoWnd(CPDFSDK_PageView* pPageView, const CPDF_Rect& rect); - void SetWindowRect(CPDFSDK_PageView* pPageView, - const CFX_FloatRect& rcWindow); - CFX_FloatRect GetWindowRect(CPDFSDK_PageView* pPageView); + void SetWindowRect(CPDFSDK_PageView* pPageView, const CPDF_Rect& rcWindow); + CPDF_Rect GetWindowRect(CPDFSDK_PageView* pPageView); FX_BOOL CommitData(CPDFSDK_PageView* pPageView, FX_UINT nFlag); virtual FX_BOOL IsDataChanged(CPDFSDK_PageView* pPageView); @@ -135,10 +132,10 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { virtual PWL_CREATEPARAM GetCreateParam(); virtual CPWL_Wnd* NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView* pPageView) = 0; - virtual CFX_FloatRect GetFocusBox(CPDFSDK_PageView* pPageView); + virtual CPDF_Rect GetFocusBox(CPDFSDK_PageView* pPageView); FX_BOOL IsValid() const; - CFX_FloatRect GetPDFWindowRect() const; + CPDF_Rect GetPDFWindowRect() const; CPDFSDK_PageView* GetCurPageView(); void SetChangeMark(); @@ -159,7 +156,7 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { FX_BOOL m_bValid; CFFL_PageView2PDFWindow m_Maps; - CFX_FloatPoint m_ptOldPos; + CPDF_Point m_ptOldPos; }; class CFFL_Button : public CFFL_FormFiller { @@ -174,15 +171,15 @@ class CFFL_Button : public CFFL_FormFiller { FX_BOOL OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point) override; + const CPDF_Point& point) override; FX_BOOL OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point) override; + const CPDF_Point& point) override; FX_BOOL OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point) override; + const CPDF_Point& point) override; void OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h index cea61bf20e..93e7505f9c 100644 --- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h +++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h @@ -26,7 +26,7 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { virtual FX_BOOL Annot_HitTest(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - CFX_FloatPoint point); + CPDF_Point point); virtual FX_RECT GetViewBBox(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot); virtual void OnDraw(CPDFSDK_PageView* pPageView, @@ -49,32 +49,32 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { virtual FX_BOOL OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point); + const CPDF_Point& point); virtual FX_BOOL OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point); + const CPDF_Point& point); virtual FX_BOOL OnLButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point); + const CPDF_Point& point); virtual FX_BOOL OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point); + const CPDF_Point& point); virtual FX_BOOL OnMouseWheel(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, short zDelta, - const CFX_FloatPoint& point); + const CPDF_Point& point); virtual FX_BOOL OnRButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point); + const CPDF_Point& point); virtual FX_BOOL OnRButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point); + const CPDF_Point& point); virtual FX_BOOL OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, diff --git a/fpdfsdk/include/formfiller/FFL_RadioButton.h b/fpdfsdk/include/formfiller/FFL_RadioButton.h index dba2798e30..a4e7928e31 100644 --- a/fpdfsdk/include/formfiller/FFL_RadioButton.h +++ b/fpdfsdk/include/formfiller/FFL_RadioButton.h @@ -24,7 +24,7 @@ class CFFL_RadioButton : public CFFL_Button { FX_BOOL OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, - const CFX_FloatPoint& point) override; + const CPDF_Point& point) override; FX_BOOL IsDataChanged(CPDFSDK_PageView* pPageView) override; void SaveData(CPDFSDK_PageView* pPageView) override; }; -- cgit v1.2.3