Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/include/fpdfapi/fpdf_page.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_PAGE_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_
 
 #include "core/include/fxge/fx_dib.h"
@@ skipping 45 matching lines @@
 
   FX_DWORD CountObjects() const { return m_ObjectList.GetCount(); }
 
   int GetObjectIndex(CPDF_PageObject* pObj) const;
 
   CPDF_PageObject* GetObjectByIndex(int index) const;
 
   FX_POSITION InsertObject(FX_POSITION posInsertAfter,
                            CPDF_PageObject* pNewObject);
 
-  void Transform(const CFX_AffineMatrix& matrix);
+  void Transform(const CFX_Matrix& matrix);
 
   FX_BOOL BackgroundAlphaNeeded() const { return m_bBackgroundAlphaNeeded; }
 
   CFX_FloatRect CalcBoundingBox() const;
 
   CPDF_Dictionary* m_pFormDict;
   CPDF_Stream* m_pFormStream;
   CPDF_Document* m_pDocument;
   CPDF_Dictionary* m_pPageResources;
   CPDF_Dictionary* m_pResources;
@@ skipping 25 matching lines @@
 
   void Load(CPDF_Document* pDocument,
             CPDF_Dictionary* pPageDict,
             FX_BOOL bPageCache = TRUE);
 
   void StartParse(CPDF_ParseOptions* pOptions = NULL, FX_BOOL bReParse = FALSE);
 
   void ParseContent(CPDF_ParseOptions* pOptions = NULL,
                     FX_BOOL bReParse = FALSE);
 
-  void GetDisplayMatrix(CFX_AffineMatrix& matrix,
+  void GetDisplayMatrix(CFX_Matrix& matrix,
                         int xPos,
                         int yPos,
                         int xSize,
                         int ySize,
                         int iRotate) const;
 
   FX_FLOAT GetPageWidth() const { return m_PageWidth; }
 
   FX_FLOAT GetPageHeight() const { return m_PageHeight; }
 
   CFX_FloatRect GetPageBBox() const { return m_BBox; }
 
-  const CFX_AffineMatrix& GetPageMatrix() const { return m_PageMatrix; }
+  const CFX_Matrix& GetPageMatrix() const { return m_PageMatrix; }
 
   CPDF_Object* GetPageAttr(const CFX_ByteStringC& name) const;
 
   CPDF_PageRenderCache* GetRenderCache() const { return m_pPageRender; }
 
   void ClearRenderCache();
 
  protected:
   friend class CPDF_ContentParser;
 
   FX_FLOAT m_PageWidth;
 
   FX_FLOAT m_PageHeight;
 
-  CFX_AffineMatrix m_PageMatrix;
+  CFX_Matrix m_PageMatrix;
 
   CPDF_PageRenderCache* m_pPageRender;
 };
 class CPDF_ParseOptions {
  public:
   CPDF_ParseOptions();
 
   FX_BOOL m_bTextOnly;
 
   FX_BOOL m_bMarkedContent;
 
   FX_BOOL m_bSeparateForm;
 
   FX_BOOL m_bDecodeInlineImage;
 };
 class CPDF_Form : public CPDF_PageObjects {
  public:
   CPDF_Form(CPDF_Document* pDocument,
             CPDF_Dictionary* pPageResources,
             CPDF_Stream* pFormStream,
             CPDF_Dictionary* pParentResources = NULL);
 
   ~CPDF_Form();
 
   void StartParse(CPDF_AllStates* pGraphicStates,
-                  CFX_AffineMatrix* pParentMatrix,
+                  CFX_Matrix* pParentMatrix,
                   CPDF_Type3Char* pType3Char,
                   CPDF_ParseOptions* pOptions,
                   int level = 0);
 
   void ParseContent(CPDF_AllStates* pGraphicStates,
-                    CFX_AffineMatrix* pParentMatrix,
+                    CFX_Matrix* pParentMatrix,
                     CPDF_Type3Char* pType3Char,
                     CPDF_ParseOptions* pOptions,
                     int level = 0);
 
   CPDF_Form* Clone() const;
 };
 class CPDF_PageContentGenerate {
  public:
   CPDF_PageContentGenerate(CPDF_Page* pPage);
   ~CPDF_PageContentGenerate();
@@ skipping 10 matching lines @@
   CFX_ByteString RealizeResource(CPDF_Object* pResourceObj,
                                  const FX_CHAR* szType);
 
  private:
   CPDF_Page* m_pPage;
   CPDF_Document* m_pDocument;
   CFX_ArrayTemplate<CPDF_PageObject*> m_pageObjects;
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_