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 . --- core/include/fxge/fx_dib.h | 12 ++++++------ core/include/fxge/fx_font.h | 8 ++++---- core/include/fxge/fx_ge.h | 44 ++++++++++++++++++++++---------------------- 3 files changed, 32 insertions(+), 32 deletions(-) (limited to 'core/include/fxge') diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h index e57b3c9a83..f4f4fd2e6f 100644 --- a/core/include/fxge/fx_dib.h +++ b/core/include/fxge/fx_dib.h @@ -232,7 +232,7 @@ class CFX_DIBSource { FX_DWORD flags = 0, const FX_RECT* pClip = NULL) const; - CFX_DIBitmap* TransformTo(const CFX_AffineMatrix* pMatrix, + CFX_DIBitmap* TransformTo(const CFX_Matrix* pMatrix, int& left, int& top, FX_DWORD flags = 0, @@ -639,19 +639,19 @@ class CFX_ImageTransformer { ~CFX_ImageTransformer(); FX_BOOL Start(const CFX_DIBSource* pSrc, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, int flags, const FX_RECT* pClip); FX_BOOL Continue(IFX_Pause* pPause); - CFX_AffineMatrix* m_pMatrix; + CFX_Matrix* m_pMatrix; FX_RECT m_StretchClip; int m_ResultLeft; int m_ResultTop; int m_ResultWidth; int m_ResultHeight; - CFX_AffineMatrix m_dest2stretch; + CFX_Matrix m_dest2stretch; CFX_ImageStretcher m_Stretcher; CFX_BitmapStorer m_Storer; FX_DWORD m_Flags; @@ -667,7 +667,7 @@ class CFX_ImageRenderer { const CFX_DIBSource* pSource, int bitmap_alpha, FX_DWORD mask_color, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, FX_DWORD dib_flags, FX_BOOL bRgbByteOrder = FALSE, int alpha_flag = 0, @@ -681,7 +681,7 @@ class CFX_ImageRenderer { const CFX_ClipRgn* m_pClipRgn; int m_BitmapAlpha; FX_DWORD m_MaskColor; - CFX_AffineMatrix m_Matrix; + CFX_Matrix m_Matrix; CFX_ImageTransformer* m_pTransformer; CFX_ImageStretcher m_Stretcher; CFX_BitmapComposer m_Composer; diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 0f35115eee..dd0de401ef 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -473,7 +473,7 @@ class CFX_FaceCache { const CFX_GlyphBitmap* LoadGlyphBitmap(CFX_Font* pFont, FX_DWORD glyph_index, FX_BOOL bFontStyle, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, int dest_width, int anti_alias, int& text_flags); @@ -485,16 +485,16 @@ class CFX_FaceCache { CFX_GlyphBitmap* RenderGlyph(CFX_Font* pFont, FX_DWORD glyph_index, FX_BOOL bFontStyle, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, int dest_width, int anti_alias); CFX_GlyphBitmap* RenderGlyph_Nativetext(CFX_Font* pFont, FX_DWORD glyph_index, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, int dest_width, int anti_alias); CFX_GlyphBitmap* LookUpGlyphBitmap(CFX_Font* pFont, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, CFX_ByteStringC& FaceGlyphsKey, FX_DWORD glyph_index, FX_BOOL bFontStyle, diff --git a/core/include/fxge/fx_ge.h b/core/include/fxge/fx_ge.h index 4cfe622007..01a1c72a8f 100644 --- a/core/include/fxge/fx_ge.h +++ b/core/include/fxge/fx_ge.h @@ -136,18 +136,18 @@ class CFX_PathData { CFX_FloatRect GetBoundingBox(FX_FLOAT line_width, FX_FLOAT miter_limit) const; - void Transform(const CFX_AffineMatrix* pMatrix); + void Transform(const CFX_Matrix* pMatrix); FX_BOOL IsRect() const; FX_BOOL GetZeroAreaPath(CFX_PathData& NewPath, - CFX_AffineMatrix* pMatrix, + CFX_Matrix* pMatrix, FX_BOOL& bThin, FX_BOOL bAdjust) const; - FX_BOOL IsRect(const CFX_AffineMatrix* pMatrix, CFX_FloatRect* rect) const; + FX_BOOL IsRect(const CFX_Matrix* pMatrix, CFX_FloatRect* rect) const; - void Append(const CFX_PathData* pSrc, const CFX_AffineMatrix* pMatrix); + void Append(const CFX_PathData* pSrc, const CFX_Matrix* pMatrix); void AppendRect(FX_FLOAT left, FX_FLOAT bottom, FX_FLOAT right, FX_FLOAT top); void SetPoint(int index, FX_FLOAT x, FX_FLOAT y, int flag); @@ -281,17 +281,17 @@ class CFX_RenderDevice { const FX_RECT& GetClipBox() const { return m_ClipBox; } FX_BOOL SetClip_PathFill(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, int fill_mode); FX_BOOL SetClip_Rect(const FX_RECT* pRect); FX_BOOL SetClip_PathStroke(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, const CFX_GraphStateData* pGraphState); FX_BOOL DrawPath(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, const CFX_GraphStateData* pGraphState, FX_DWORD fill_color, FX_DWORD stroke_color, @@ -364,7 +364,7 @@ class CFX_RenderDevice { FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap, int bitmap_alpha, FX_DWORD color, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, FX_DWORD flags, void*& handle, int alpha_flag = 0, @@ -380,7 +380,7 @@ class CFX_RenderDevice { CFX_Font* pFont, CFX_FontCache* pCache, FX_FLOAT font_size, - const CFX_AffineMatrix* pText2Device, + const CFX_Matrix* pText2Device, FX_DWORD fill_color, FX_DWORD text_flags, int alpha_flag = 0, @@ -391,8 +391,8 @@ class CFX_RenderDevice { CFX_Font* pFont, CFX_FontCache* pCache, FX_FLOAT font_size, - const CFX_AffineMatrix* pText2User, - const CFX_AffineMatrix* pUser2Device, + const CFX_Matrix* pText2User, + const CFX_Matrix* pUser2Device, const CFX_GraphStateData* pGraphState, FX_DWORD fill_color, FX_DWORD stroke_color, @@ -495,17 +495,17 @@ class IFX_RenderDeviceDriver { virtual void RestoreState(FX_BOOL bKeepSaved = FALSE) = 0; virtual FX_BOOL SetClip_PathFill(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, int fill_mode) = 0; virtual FX_BOOL SetClip_PathStroke(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, const CFX_GraphStateData* pGraphState) { return FALSE; } virtual FX_BOOL DrawPath(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, const CFX_GraphStateData* pGraphState, FX_DWORD fill_color, FX_DWORD stroke_color, @@ -576,7 +576,7 @@ class IFX_RenderDeviceDriver { virtual FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap, int bitmap_alpha, FX_DWORD color, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, FX_DWORD flags, void*& handle, int alpha_flag = 0, @@ -593,7 +593,7 @@ class IFX_RenderDeviceDriver { const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, CFX_FontCache* pCache, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, FX_FLOAT font_size, FX_DWORD color, int alpha_flag = 0, @@ -637,17 +637,17 @@ class CFX_PSRenderer { void RestoreState(FX_BOOL bKeepSaved = FALSE); void SetClip_PathFill(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, int fill_mode); void SetClip_PathStroke(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, const CFX_GraphStateData* pGraphState); FX_RECT GetClipBox() { return m_ClipBox; } FX_BOOL DrawPath(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, const CFX_GraphStateData* pGraphState, FX_DWORD fill_color, FX_DWORD stroke_color, @@ -674,7 +674,7 @@ class CFX_PSRenderer { FX_BOOL DrawDIBits(const CFX_DIBSource* pBitmap, FX_DWORD color, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, FX_DWORD flags, int alpha_flag = 0, void* pIccTransform = NULL); @@ -683,7 +683,7 @@ class CFX_PSRenderer { const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, CFX_FontCache* pCache, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, FX_FLOAT font_size, FX_DWORD color, int alpha_flag = 0, @@ -712,7 +712,7 @@ class CFX_PSRenderer { FX_BOOL m_bInited; void OutputPath(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device); + const CFX_Matrix* pObject2Device); void SetGraphState(const CFX_GraphStateData* pGraphState); -- cgit v1.2.3