Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fpdfdoc/doc_utils.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/fpdfdoc/fpdf_doc.h"
 #include "doc_utils.h"
 
 static const int FPDFDOC_UTILS_MAXRECURSION = 32;
@@ skipping 190 matching lines @@
   CPDF_SimpleParser syntax(m_csDA);
   if (syntax.FindTagParam("Tm", 6)) {
     for (int i = 0; i < 6; i++) {
       csTM += (CFX_ByteString)syntax.GetWord();
       csTM += " ";
     }
     csTM += (CFX_ByteString)syntax.GetWord();
   }
   return csTM;
 }
-CFX_AffineMatrix CPDF_DefaultAppearance::GetTextMatrix() {
-  CFX_AffineMatrix tm;
+CFX_Matrix CPDF_DefaultAppearance::GetTextMatrix() {
+  CFX_Matrix tm;
   if (m_csDA.IsEmpty()) {
     return tm;
   }
   CPDF_SimpleParser syntax(m_csDA);
   if (syntax.FindTagParam("Tm", 6)) {
     FX_FLOAT f[6];
     for (int i = 0; i < 6; i++) {
       f[i] = FX_atof((CFX_ByteString)syntax.GetWord());
     }
     tm.Set(f[0], f[1], f[2], f[3], f[4], f[5]);
@@ skipping 495 matching lines @@
   CPDF_Object* pAttr = pFieldDict->GetElementValue(name);
   if (pAttr) {
     return pAttr;
   }
   CPDF_Dictionary* pParent = pFieldDict->GetDict("Parent");
   if (pParent == NULL) {
     return NULL;
   }
   return FPDF_GetFieldAttr(pParent, name, nLevel + 1);
 }