Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fxge/win32/fx_win32_gdipext.cpp

Index: core/src/fxge/win32/fx_win32_gdipext.cpp
diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp
index 368b15fcc0bcd7ba90bbc2a26c5076c338cc03c7..2886ee81d0b2237b03498ea459f371b3e6172a56 100644
--- a/core/src/fxge/win32/fx_win32_gdipext.cpp
+++ b/core/src/fxge/win32/fx_win32_gdipext.cpp
@@ -965,7 +965,7 @@ FX_BOOL CGdiplusExt::StretchDIBits(HDC hDC,
   return TRUE;
 }
 static GpPen* _GdipCreatePen(const CFX_GraphStateData* pGraphState,
-                             const CFX_AffineMatrix* pMatrix,
+                             const CFX_Matrix* pMatrix,
                              DWORD argb,
                              FX_BOOL bTextMode = FALSE) {
   CGdiplusExt& GdiplusExt =
@@ -1072,7 +1072,7 @@ static GpPen* _GdipCreatePen(const CFX_GraphStateData* pGraphState,
   return pPen;
 }
 static FX_BOOL IsSmallTriangle(PointF* points,
-                               const CFX_AffineMatrix* pMatrix,
+                               const CFX_Matrix* pMatrix,
                                int& v1,
                                int& v2) {
   int pairs[] = {1, 2, 0, 2, 0, 1};
@@ -1098,7 +1098,7 @@ static FX_BOOL IsSmallTriangle(PointF* points,
 }
 FX_BOOL CGdiplusExt::DrawPath(HDC hDC,
                               const CFX_PathData* pPathData,
-                              const CFX_AffineMatrix* pObject2Device,
+                              const CFX_Matrix* pObject2Device,
                               const CFX_GraphStateData* pGraphState,
                               FX_DWORD fill_argb,
                               FX_DWORD stroke_argb,