Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/include/fpdfapi/fpdf_objects.h

 // 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
 
 #ifndef CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
 
 #include "core/include/fxcrt/fx_coordinates.h"
@@ skipping 277 matching lines @@
   static CPDF_Array* Create() { return new CPDF_Array(); }
 
   CPDF_Array() : CPDF_Object(PDFOBJ_ARRAY) {}
 
   FX_DWORD GetCount() const { return m_Objects.GetSize(); }
 
   CPDF_Object* GetElement(FX_DWORD index) const;
 
   CPDF_Object* GetElementValue(FX_DWORD index) const;
 
-  CFX_AffineMatrix GetMatrix();
+  CFX_Matrix GetMatrix();
 
   CFX_FloatRect GetRect();
 
   CFX_ByteString GetString(FX_DWORD index) const;
 
   CFX_ByteStringC GetConstString(FX_DWORD index) const;
 
   int GetInteger(FX_DWORD index) const;
 
   FX_FLOAT GetNumber(FX_DWORD index) const;
@@ skipping 84 matching lines @@
   FX_FLOAT GetNumber(const CFX_ByteStringC& key) const;
 
   CPDF_Dictionary* GetDict(const CFX_ByteStringC& key) const;
 
   CPDF_Stream* GetStream(const CFX_ByteStringC& key) const;
 
   CPDF_Array* GetArray(const CFX_ByteStringC& key) const;
 
   CFX_FloatRect GetRect(const CFX_ByteStringC& key) const;
 
-  CFX_AffineMatrix GetMatrix(const CFX_ByteStringC& key) const;
+  CFX_Matrix GetMatrix(const CFX_ByteStringC& key) const;
 
   FX_FLOAT GetFloat(const CFX_ByteStringC& key) const { return GetNumber(key); }
 
   FX_BOOL KeyExist(const CFX_ByteStringC& key) const;
 
   FX_POSITION GetStartPos() const;
 
   CPDF_Object* GetNextElement(FX_POSITION& pos, CFX_ByteString& key) const;
 
   void SetAt(const CFX_ByteStringC& key, CPDF_Object* pObj);
@@ skipping 15 matching lines @@
                       CPDF_Object* obj) {
     SetAtReference(key, pDoc, obj->GetObjNum());
   }
 
   void AddReference(const CFX_ByteStringC& key,
                     CPDF_IndirectObjects* pDoc,
                     FX_DWORD objnum);
 
   void SetAtRect(const CFX_ByteStringC& key, const CFX_FloatRect& rect);
 
-  void SetAtMatrix(const CFX_ByteStringC& key, const CFX_AffineMatrix& matrix);
+  void SetAtMatrix(const CFX_ByteStringC& key, const CFX_Matrix& matrix);
 
   void SetAtBoolean(const CFX_ByteStringC& key, FX_BOOL bValue);
 
   void RemoveAt(const CFX_ByteStringC& key);
 
   void ReplaceKey(const CFX_ByteStringC& oldkey, const CFX_ByteStringC& newkey);
 
   FX_BOOL Identical(CPDF_Dictionary* pDict) const;
 
   int GetCount() const { return m_Map.GetCount(); }
@@ skipping 175 matching lines @@
 
  protected:
   CFX_MapPtrToPtr m_IndirectObjs;
 
   CPDF_Parser* m_pParser;
 
   FX_DWORD m_LastObjNum;
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_