diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-12-10 15:34:55 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-12-10 15:34:55 -0800 |
| commit | 60d909e9d4444b2b8582275624ee97734d331a38 (patch) | |
| tree | 6a884e5dd0c785c141919531033de7e2fc5b0e01 /core/src/fxge/agg/include | |
| parent | 33c8c7602f8981c32d37a9b2e25496401e914391 (diff) | |
| download | pdfium-60d909e9d4444b2b8582275624ee97734d331a38.tar.xz | |
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 .
Diffstat (limited to 'core/src/fxge/agg/include')
| -rw-r--r-- | core/src/fxge/agg/include/fx_agg_driver.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h index 0e79a3fc5e..80febe1b4e 100644 --- a/core/src/fxge/agg/include/fx_agg_driver.h +++ b/core/src/fxge/agg/include/fx_agg_driver.h @@ -12,7 +12,7 @@ #include "third_party/agg23/agg_path_storage.h" #include "third_party/agg23/agg_rasterizer_scanline_aa.h" -class CFX_AffineMatrix; +class CFX_Matrix; class CFX_PathData; class CAgg_PathData { @@ -21,7 +21,7 @@ class CAgg_PathData { ~CAgg_PathData() {} FX_NAMESPACE_DECLARE(agg, path_storage) m_PathData; void BuildPath(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device); + const CFX_Matrix* pObject2Device); }; class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver { public: @@ -40,13 +40,13 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver { void SaveState() override; void RestoreState(FX_BOOL bKeepSaved) override; FX_BOOL SetClip_PathFill(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, int fill_mode) override; FX_BOOL SetClip_PathStroke(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, const CFX_GraphStateData* pGraphState) override; 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, @@ -103,7 +103,7 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver { 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, @@ -115,7 +115,7 @@ class CFX_AggDeviceDriver : public 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, |