Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fxge/skia/fx_skia_device.h

Index: core/src/fxge/skia/fx_skia_device.h
diff --git a/core/src/fxge/skia/fx_skia_device.h b/core/src/fxge/skia/fx_skia_device.h
index a2cfc355b329032c518c8955533a2d98225a37c2..013962d046814301b2800d8f58d09e3437152d46 100644
--- a/core/src/fxge/skia/fx_skia_device.h
+++ b/core/src/fxge/skia/fx_skia_device.h
@@ -24,22 +24,22 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
 
   /** 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,
@@ -103,7 +103,7 @@ class CFX_SkiaDeviceDriver : public 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,
@@ -115,7 +115,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
                                  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,