Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fpdfapi/fpdf_page/fpdf_page_doc.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 "pageint.h"
 
 #include "core/include/fdrm/fx_crypt.h"
 #include "core/include/fpdfapi/fpdf_module.h"
@@ skipping 73 matching lines @@
   return GetValidatePageData()->GetFontFileStreamAcc(pStream);
 }
 
 CPDF_ColorSpace* _CSFromName(const CFX_ByteString& name);
 CPDF_ColorSpace* CPDF_Document::LoadColorSpace(CPDF_Object* pCSObj,
                                                CPDF_Dictionary* pResources) {
   return GetValidatePageData()->GetColorSpace(pCSObj, pResources);
 }
 CPDF_Pattern* CPDF_Document::LoadPattern(CPDF_Object* pPatternObj,
                                          FX_BOOL bShading,
-                                         const CFX_AffineMatrix* matrix) {
+                                         const CFX_Matrix* matrix) {
   return GetValidatePageData()->GetPattern(pPatternObj, bShading, matrix);
 }
 CPDF_IccProfile* CPDF_Document::LoadIccProfile(CPDF_Stream* pStream) {
   return GetValidatePageData()->GetIccProfile(pStream);
 }
 CPDF_Image* CPDF_Document::LoadImageF(CPDF_Object* pObj) {
   if (!pObj) {
     return NULL;
   }
   FXSYS_assert(pObj->GetObjNum());
@@ skipping 292 matching lines @@
     csData->RemoveRef();
     if (csData->use_count() == 0) {
       csData->get()->ReleaseCS();
       csData->reset(nullptr);
     }
   }
 }
 
 CPDF_Pattern* CPDF_DocPageData::GetPattern(CPDF_Object* pPatternObj,
                                            FX_BOOL bShading,
-                                           const CFX_AffineMatrix* matrix) {
+                                           const CFX_Matrix* matrix) {
   if (!pPatternObj)
     return nullptr;
 
   CPDF_CountedPattern* ptData = nullptr;
   auto it = m_PatternMap.find(pPatternObj);
   if (it != m_PatternMap.end()) {
     ptData = it->second;
     if (ptData->get()) {
       return ptData->AddRef();
     }
@@ skipping 180 matching lines @@
 }
 
 CPDF_CountedPattern* CPDF_DocPageData::FindPatternPtr(
     CPDF_Object* pPatternObj) const {
   if (!pPatternObj)
     return nullptr;
 
   auto it = m_PatternMap.find(pPatternObj);
   return it != m_PatternMap.end() ? it->second : nullptr;
 }