From 60d909e9d4444b2b8582275624ee97734d331a38 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 10 Dec 2015 15:34:55 -0800 Subject: Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix Review URL: https://codereview.chromium.org/1513363002 . (cherry picked from commit f32c969bce6743fca1e7ff796b54a1692d26d7f0) R=thestig@chromium.org Review URL: https://codereview.chromium.org/1519693002 . --- fpdfsdk/include/pdfwindow/PWL_Caret.h | 2 +- fpdfsdk/include/pdfwindow/PWL_ComboBox.h | 2 +- fpdfsdk/include/pdfwindow/PWL_Edit.h | 2 +- fpdfsdk/include/pdfwindow/PWL_Icon.h | 2 +- fpdfsdk/include/pdfwindow/PWL_IconList.h | 2 +- fpdfsdk/include/pdfwindow/PWL_Label.h | 2 +- fpdfsdk/include/pdfwindow/PWL_ListBox.h | 2 +- fpdfsdk/include/pdfwindow/PWL_ListCtrl.h | 2 +- fpdfsdk/include/pdfwindow/PWL_Note.h | 10 +++++----- fpdfsdk/include/pdfwindow/PWL_ScrollBar.h | 4 ++-- fpdfsdk/include/pdfwindow/PWL_Signature.h | 4 ++-- fpdfsdk/include/pdfwindow/PWL_Utils.h | 18 +++++++++--------- fpdfsdk/include/pdfwindow/PWL_Wnd.h | 18 +++++++++--------- 13 files changed, 35 insertions(+), 35 deletions(-) (limited to 'fpdfsdk/include/pdfwindow') diff --git a/fpdfsdk/include/pdfwindow/PWL_Caret.h b/fpdfsdk/include/pdfwindow/PWL_Caret.h index 0fe4e89c2e..c2a2caf979 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Caret.h +++ b/fpdfsdk/include/pdfwindow/PWL_Caret.h @@ -27,7 +27,7 @@ class CPWL_Caret : public CPWL_Wnd { CFX_ByteString GetClassName() const override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; void InvalidateRect(CPDF_Rect* pRect = NULL) override; void SetVisible(FX_BOOL bVisible) override {} void TimerProc() override; diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h index 9edb02c964..9860483aca 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h +++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h @@ -39,7 +39,7 @@ class CPWL_CBButton : public CPWL_Wnd { // CPWL_Wnd void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override; FX_BOOL OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override; }; diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h index 72e60a7707..1912a63748 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Edit.h +++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h @@ -56,7 +56,7 @@ class CPWL_Edit : public CPWL_EditCtrl, public IFX_Edit_OprNotify { CPDF_Rect GetClientRect() const override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override; FX_BOOL OnLButtonDblClk(const CPDF_Point& point, FX_DWORD nFlag) override; FX_BOOL OnRButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override; diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h index 8c60c7be52..0d2596f83b 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Icon.h +++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h @@ -24,7 +24,7 @@ class CPWL_Image : public CPWL_Wnd { public: void SetPDFStream(CPDF_Stream* pStream); void GetImageSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight); - CPDF_Matrix GetImageMatrix(); + CFX_Matrix GetImageMatrix(); CFX_ByteString GetImageAlias(); void SetImageAlias(const FX_CHAR* sImageAlias); diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/include/pdfwindow/PWL_IconList.h index c25f3b1994..0a21bbe8b9 100644 --- a/fpdfsdk/include/pdfwindow/PWL_IconList.h +++ b/fpdfsdk/include/pdfwindow/PWL_IconList.h @@ -43,7 +43,7 @@ class CPWL_IconList_Item : public CPWL_Wnd { void RePosChildWnd() override; FX_FLOAT GetItemHeight(FX_FLOAT fLimitWidth) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; void OnEnabled() override; void OnDisabled() override; diff --git a/fpdfsdk/include/pdfwindow/PWL_Label.h b/fpdfsdk/include/pdfwindow/PWL_Label.h index 0504bb3e0b..aba84fbf79 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Label.h +++ b/fpdfsdk/include/pdfwindow/PWL_Label.h @@ -32,7 +32,7 @@ class CPWL_Label : public CPWL_Wnd { FX_FLOAT GetFontSize() const override; void OnCreated() override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void RePosChildWnd() override; diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h index 9d5827cd26..807f11ef30 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h +++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h @@ -59,7 +59,7 @@ class CPWL_ListBox : public CPWL_Wnd { void OnDestroy() override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; FX_BOOL OnKeyDown(FX_WORD nChar, FX_DWORD nFlag) override; FX_BOOL OnChar(FX_WORD nChar, FX_DWORD nFlag) override; FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override; diff --git a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h index dbaffc5b58..4c96d436c8 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h +++ b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h @@ -33,7 +33,7 @@ class CPWL_ListCtrl : public CPWL_Wnd { // CPWL_Wnd void RePosChildWnd() override; void DrawChildAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; private: void ResetAll(FX_BOOL bMove, int32_t nStart); diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/include/pdfwindow/PWL_Note.h index b25d989ec7..0edb1e3437 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Note.h +++ b/fpdfsdk/include/pdfwindow/PWL_Note.h @@ -89,7 +89,7 @@ class CPWL_Note_Icon : public CPWL_Wnd { protected: // CPWL_Wnd void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; private: int32_t m_nType; @@ -103,7 +103,7 @@ class CPWL_Note_CloseBox : public CPWL_Button { protected: // CPWL_Button void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override; FX_BOOL OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override; @@ -119,7 +119,7 @@ class CPWL_Note_LBBox : public CPWL_Wnd { protected: // CPWL_Wnd void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; }; class CPWL_Note_RBBox : public CPWL_Wnd { @@ -130,7 +130,7 @@ class CPWL_Note_RBBox : public CPWL_Wnd { protected: // CPWL_Wnd void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; }; class CPWL_Note_Edit : public CPWL_Edit { @@ -173,7 +173,7 @@ class CPWL_Note_Options : public CPWL_Wnd { void RePosChildWnd() override; void CreateChildWnd(const PWL_CREATEPARAM& cp) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; void SetTextColor(const CPWL_Color& color) override; private: diff --git a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h index b91d467daa..891079e39e 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h +++ b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h @@ -42,7 +42,7 @@ class CPWL_SBButton : public CPWL_Wnd { void OnCreate(PWL_CREATEPARAM& cp) override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override; FX_BOOL OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override; FX_BOOL OnMouseMove(const CPDF_Point& point, FX_DWORD nFlag) override; @@ -100,7 +100,7 @@ class CPWL_ScrollBar : public CPWL_Wnd { void RePosChildWnd() override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override; FX_BOOL OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override; void OnNotify(CPWL_Wnd* pWnd, diff --git a/fpdfsdk/include/pdfwindow/PWL_Signature.h b/fpdfsdk/include/pdfwindow/PWL_Signature.h index 009dd87592..0dbd906f20 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Signature.h +++ b/fpdfsdk/include/pdfwindow/PWL_Signature.h @@ -24,7 +24,7 @@ class CPWL_Signature_Image : public CPWL_Image { protected: // CPWL_Image void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void GetScale(FX_FLOAT& fHScale, FX_FLOAT& fVScale) override; @@ -51,7 +51,7 @@ class CPWL_Signature : public CPWL_Wnd { void RePosChildWnd() override; void CreateChildWnd(const PWL_CREATEPARAM& cp) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) override; + CFX_Matrix* pUser2Device) override; void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; private: diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h index 9658341162..56f7a27350 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Utils.h +++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h @@ -193,27 +193,27 @@ class CPWL_Utils { static CFX_ByteString GetDropButtonAppStream(const CPDF_Rect& rcBBox); static void DrawFillRect(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CPDF_Rect& rect, const CPWL_Color& color, int32_t nTransparancy); static void DrawFillRect(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CPDF_Rect& rect, const FX_COLORREF& color); static void DrawStrokeRect(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CPDF_Rect& rect, const FX_COLORREF& color, FX_FLOAT fWidth); static void DrawStrokeLine(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CPDF_Point& ptMoveTo, const CPDF_Point& ptLineTo, const FX_COLORREF& color, FX_FLOAT fWidth); static void DrawBorder(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CPDF_Rect& rect, FX_FLOAT fWidth, const CPWL_Color& color, @@ -223,12 +223,12 @@ class CPWL_Utils { const CPWL_Dash& dash, int32_t nTransparancy); static void DrawFillArea(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CPDF_Point* pPts, int32_t nCount, const FX_COLORREF& color); static void DrawShadow(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, FX_BOOL bVertical, FX_BOOL bHorizontal, CPDF_Rect rect, @@ -236,7 +236,7 @@ class CPWL_Utils { int32_t nStartGray, int32_t nEndGray); static void DrawEditSpellCheck(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, IFX_Edit* pEdit, const CPDF_Rect& rcClip, const CPDF_Point& ptOffset, @@ -292,7 +292,7 @@ class CPWL_Utils { const CPWL_Color& crFill, const CPWL_Color& crStroke = PWL_DEFAULT_BLACKCOLOR); static void DrawIconAppStream(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, int32_t nType, const CPDF_Rect& rect, const CPWL_Color& crFill, diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h index 37ddefbbce..91baafa03d 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h +++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h @@ -179,7 +179,7 @@ class IPWL_Provider { virtual ~IPWL_Provider() {} // get a matrix which map user space to CWnd client space - virtual CPDF_Matrix GetWindowMatrix(void* pAttachedData) = 0; + virtual CFX_Matrix GetWindowMatrix(void* pAttachedData) = 0; /* 0 L"&Undo\tCtrl+Z" @@ -247,7 +247,7 @@ struct PWL_CREATEPARAM { CPWL_Wnd* pParentWnd; // ignore CPWL_MsgControl* pMsgControl; // ignore int32_t eCursorType; // ignore - CPDF_Matrix mtChild; // ignore + CFX_Matrix mtChild; // ignore }; class CPWL_Timer { @@ -293,7 +293,7 @@ class CPWL_Wnd : public CPWL_TimerHandler { virtual void InvalidateRect(CPDF_Rect* pRect = NULL); void GetAppearanceStream(CFX_ByteString& sAppStream); - void DrawAppearance(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device); + void DrawAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device); virtual FX_BOOL OnKeyDown(FX_WORD nChar, FX_DWORD nFlag); virtual FX_BOOL OnKeyUp(FX_WORD nChar, FX_DWORD nFlag); @@ -378,10 +378,10 @@ class CPWL_Wnd : public CPWL_TimerHandler { int32_t GetTransparency(); void SetTransparency(int32_t nTransparency); - CPDF_Matrix GetChildToRoot() const; - CPDF_Matrix GetChildMatrix() const; - void SetChildMatrix(const CPDF_Matrix& mt); - CPDF_Matrix GetWindowMatrix() const; + CFX_Matrix GetChildToRoot() const; + CFX_Matrix GetChildMatrix() const; + void SetChildMatrix(const CFX_Matrix& mt); + CFX_Matrix GetWindowMatrix() const; virtual CPDF_Point ChildToParent(const CPDF_Point& point) const; virtual CPDF_Rect ChildToParent(const CPDF_Rect& rect) const; @@ -408,9 +408,9 @@ class CPWL_Wnd : public CPWL_TimerHandler { virtual void GetChildAppearanceStream(CFX_ByteTextBuf& sAppStream); virtual void DrawThisAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device); + CFX_Matrix* pUser2Device); virtual void DrawChildAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device); + CFX_Matrix* pUser2Device); virtual void OnCreate(PWL_CREATEPARAM& cp); virtual void OnCreated(); -- cgit v1.2.3