Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fxge/ge/fx_ge_path.cpp

 // 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.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fxcrt/fx_system.h"
 #include "core/include/fxge/fx_ge.h"
 #include "third_party/base/numerics/safe_math.h"
 
@@ skipping 138 matching lines @@
   }
   SetPointCount(nPoints);
 }
 void CFX_PathData::AddPointCount(int addPoints) {
   pdfium::base::CheckedNumeric<int> safe_new_count = m_PointCount;
   safe_new_count += addPoints;
   int new_count = safe_new_count.ValueOrDie();
   AllocPointCount(new_count);
   m_PointCount = new_count;
 }
-void CFX_PathData::Append(const CFX_PathData* pSrc,
-                          const CFX_AffineMatrix* pMatrix) {
+void CFX_PathData::Append(const CFX_PathData* pSrc, const CFX_Matrix* pMatrix) {
   int old_count = m_PointCount;
   AddPointCount(pSrc->m_PointCount);
   FXSYS_memcpy(m_pPoints + old_count, pSrc->m_pPoints,
                pSrc->m_PointCount * sizeof(FX_PATHPOINT));
   if (pMatrix) {
     for (int i = 0; i < pSrc->m_PointCount; i++) {
       pMatrix->Transform(m_pPoints[old_count + i].m_PointX,
                          m_pPoints[old_count + i].m_PointY);
     }
   }
@@ skipping 206 matching lines @@
       FX_FLOAT middle_y = m_pPoints[iMiddlePoint].m_PointY;
       _UpdateLineJoinPoints(rect, start_x, start_y, middle_x, middle_y, end_x,
                             end_y, half_width, miter_limit);
     } else {
       _UpdateLineEndPoints(rect, start_x, start_y, end_x, end_y, half_width);
     }
     iPoint++;
   }
   return rect;
 }
-void CFX_PathData::Transform(const CFX_AffineMatrix* pMatrix) {
+void CFX_PathData::Transform(const CFX_Matrix* pMatrix) {
   if (pMatrix == NULL) {
     return;
   }
   for (int i = 0; i < m_PointCount; i++) {
     pMatrix->Transform(m_pPoints[i].m_PointX, m_pPoints[i].m_PointY);
   }
 }
 FX_BOOL CFX_PathData::GetZeroAreaPath(CFX_PathData& NewPath,
-                                      CFX_AffineMatrix* pMatrix,
+                                      CFX_Matrix* pMatrix,
                                       FX_BOOL& bThin,
                                       FX_BOOL bAdjust) const {
   if (m_PointCount < 3) {
     return FALSE;
   }
   if (m_PointCount == 3 && (m_pPoints[0].m_Flag & FXPT_TYPE) == FXPT_MOVETO &&
       (m_pPoints[1].m_Flag & FXPT_TYPE) == FXPT_LINETO &&
       (m_pPoints[2].m_Flag & FXPT_TYPE) == FXPT_LINETO &&
       m_pPoints[0].m_PointX == m_pPoints[2].m_PointX &&
       m_pPoints[0].m_PointY == m_pPoints[2].m_PointY) {
@@ skipping 149 matching lines @@
     if ((m_pPoints[i].m_Flag & FXPT_TYPE) != FXPT_LINETO) {
       return FALSE;
     }
     if (m_pPoints[i].m_PointX != m_pPoints[i - 1].m_PointX &&
         m_pPoints[i].m_PointY != m_pPoints[i - 1].m_PointY) {
       return FALSE;
     }
   }
   return m_PointCount == 5 || (m_pPoints[3].m_Flag & FXPT_CLOSEFIGURE);
 }
-FX_BOOL CFX_PathData::IsRect(const CFX_AffineMatrix* pMatrix,
+FX_BOOL CFX_PathData::IsRect(const CFX_Matrix* pMatrix,
                              CFX_FloatRect* pRect) const {
   if (pMatrix == NULL) {
     if (!IsRect()) {
       return FALSE;
     }
     if (pRect) {
       pRect->left = m_pPoints[0].m_PointX;
       pRect->right = m_pPoints[2].m_PointX;
       pRect->bottom = m_pPoints[0].m_PointY;
       pRect->top = m_pPoints[2].m_PointY;
@@ skipping 72 matching lines @@
 }
 void CFX_GraphStateData::SetDashCount(int count) {
   FX_Free(m_DashArray);
   m_DashArray = NULL;
   m_DashCount = count;
   if (count == 0) {
     return;
   }
   m_DashArray = FX_Alloc(FX_FLOAT, count);
 }