Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

Index: core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
index 752a09d83d9672e7c35541b452451910700eea6c..f91ddfa5dcd4c64331e61e42a86c62a4f963e219 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
@@ -440,8 +440,8 @@ CFX_FloatRect CPDF_Array::GetRect() {
   rect.top = GetNumber(3);
   return rect;
 }
-CFX_AffineMatrix CPDF_Array::GetMatrix() {
-  CFX_AffineMatrix matrix;
+CFX_Matrix CPDF_Array::GetMatrix() {
+  CFX_Matrix matrix;
   if (!IsArray() || m_Objects.GetSize() != 6)
     return matrix;
 
@@ -702,8 +702,8 @@ CFX_FloatRect CPDF_Dictionary::GetRect(const CFX_ByteStringC& key) const {
     rect = pArray->GetRect();
   return rect;
 }
-CFX_AffineMatrix CPDF_Dictionary::GetMatrix(const CFX_ByteStringC& key) const {
-  CFX_AffineMatrix matrix;
+CFX_Matrix CPDF_Dictionary::GetMatrix(const CFX_ByteStringC& key) const {
+  CFX_Matrix matrix;
   CPDF_Array* pArray = GetArray(key);
   if (pArray)
     matrix = pArray->GetMatrix();
@@ -814,7 +814,7 @@ void CPDF_Dictionary::SetAtRect(const CFX_ByteStringC& key,
   SetAt(key, pArray);
 }
 void CPDF_Dictionary::SetAtMatrix(const CFX_ByteStringC& key,
-                                  const CFX_AffineMatrix& matrix) {
+                                  const CFX_Matrix& matrix) {
   CPDF_Array* pArray = new CPDF_Array;
   pArray->AddNumber16(matrix.a);
   pArray->AddNumber16(matrix.b);