Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fxge/skia/fx_skia_device.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_
 #define CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_
 
 #if defined(_SKIA_SUPPORT_)
 class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
  public:
   CFX_SkiaDeviceDriver(CFX_DIBitmap* pBitmap,
                        int dither_bits,
                        FX_BOOL bRgbByteOrder,
                        CFX_DIBitmap* pOriDevice,
                        FX_BOOL bGroupKnockout);
   ~CFX_SkiaDeviceDriver() override;
 
   /** Options */
   virtual int GetDeviceCaps(int caps_id);
 
   /** Save and restore all graphic states */
   virtual void SaveState();
   virtual void RestoreState(FX_BOOL bKeepSaved);
 
   /** Set clipping path using filled region */
   virtual FX_BOOL SetClip_PathFill(
-      const CFX_PathData* pPathData,           // path info
-      const CFX_AffineMatrix* pObject2Device,  // optional transformation
-      int fill_mode  // fill mode, WINDING or ALTERNATE
+      const CFX_PathData* pPathData,     // path info
+      const CFX_Matrix* pObject2Device,  // optional transformation
+      int fill_mode                      // fill mode, WINDING or ALTERNATE
       );
 
   /** Set clipping path using stroked region */
   virtual FX_BOOL SetClip_PathStroke(
-      const CFX_PathData* pPathData,           // path info
-      const CFX_AffineMatrix* pObject2Device,  // optional transformation
+      const CFX_PathData* pPathData,     // path info
+      const CFX_Matrix* pObject2Device,  // optional transformation
       const CFX_GraphStateData*
           pGraphState  // graphic state, for pen attributes
       );
 
   /** Draw a path */
   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,
                            int fill_mode,
                            int alpha_flag = 0,
                            void* pIccTransform = NULL);
 
   virtual FX_BOOL SetPixel(int x,
                            int y,
                            FX_DWORD color,
@@ skipping 43 matching lines @@
                                 int dest_width,
                                 int dest_height,
                                 const FX_RECT* pClipRect,
                                 FX_DWORD flags,
                                 int alpha_flag = 0,
                                 void* pIccTransform = NULL);
 
   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,
                               void* pIccTransform = NULL);
   virtual FX_BOOL ContinueDIBits(void* handle, IFX_Pause* pPause);
   virtual void CancelDIBits(void* handle);
 
   virtual FX_BOOL DrawDeviceText(int nChars,
                                  const FXTEXT_CHARPOS* pCharPos,
                                  CFX_Font* pFont,
                                  CFX_FontCache* pCache,
-                                 const CFX_AffineMatrix* pObject2Device,
+                                 const CFX_Matrix* pObject2Device,
                                  FX_FIXFLOAT font_size,
                                  FX_DWORD color,
                                  int alpha_flag = 0,
                                  void* pIccTransform = NULL);
 
   virtual FX_BOOL RenderRasterizer(rasterizer_scanline_aa& rasterizer,
                                    FX_DWORD color,
                                    FX_BOOL bFullCover,
                                    FX_BOOL bGroupKnockout,
                                    int alpha_flag,
                                    void* pIccTransform);
   virtual FX_BOOL RenderRasterizerSkia(SkPath& skPath,
                                        const SkPaint& origPaint,
                                        SkIRect& rect,
                                        FX_DWORD color,
                                        FX_BOOL bFullCover,
                                        FX_BOOL bGroupKnockout,
                                        int alpha_flag,
                                        void* pIccTransform,
                                        FX_BOOL bFill = TRUE);
   void SetClipMask(rasterizer_scanline_aa& rasterizer);
   void SetClipMask(SkPath& skPath, SkPaint* spaint);
   virtual uint8_t* GetBuffer() const { return m_pAggDriver->GetBuffer(); }
 
   CFX_AggDeviceDriver* m_pAggDriver;
 };
 #endif  // defined(_SKIA_SUPPORT_)
 
 #endif  // CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_