Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fpdfapi/fpdf_page/pageint.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_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 #define CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 
 #include <map>
@@ skipping 149 matching lines @@
   };
 } _ContentParam;
 #define _FPDF_MAX_FORM_LEVEL_ 30
 #define _FPDF_MAX_TYPE3_FORM_LEVEL_ 4
 #define _FPDF_MAX_OBJECT_STACK_SIZE_ 512
 class CPDF_StreamContentParser {
  public:
   CPDF_StreamContentParser(CPDF_Document* pDoc,
                            CPDF_Dictionary* pPageResources,
                            CPDF_Dictionary* pParentResources,
-                           CFX_AffineMatrix* pmtContentToUser,
+                           CFX_Matrix* pmtContentToUser,
                            CPDF_PageObjects* pObjList,
                            CPDF_Dictionary* pResources,
                            CFX_FloatRect* pBBox,
                            CPDF_ParseOptions* pOptions,
                            CPDF_AllStates* pAllStates,
                            int level);
   ~CPDF_StreamContentParser();
 
   CPDF_PageObjects* GetObjectList() const { return m_pObjectList; }
   CPDF_AllStates* GetCurStates() const { return m_pCurStates.get(); }
@@ skipping 124 matching lines @@
   void Handle_NextLineShowText();
   void Handle_NextLineShowText_Space();
   void Handle_Invalid();
 
   CPDF_Document* const m_pDocument;
   CPDF_Dictionary* m_pPageResources;
   CPDF_Dictionary* m_pParentResources;
   CPDF_Dictionary* m_pResources;
   CPDF_PageObjects* m_pObjectList;
   int m_Level;
-  CFX_AffineMatrix m_mtContentToUser;
+  CFX_Matrix m_mtContentToUser;
   CFX_FloatRect m_BBox;
   CPDF_ParseOptions m_Options;
   _ContentParam m_ParamBuf1[PARAM_BUF_SIZE];
   FX_DWORD m_ParamStartPos;
   FX_DWORD m_ParamCount;
   CPDF_StreamParser* m_pSyntax;
   nonstd::unique_ptr<CPDF_AllStates> m_pCurStates;
   CPDF_ContentMark m_CurContentMark;
   CFX_ArrayTemplate<CPDF_TextObject*> m_ClipTextList;
   CPDF_TextObject* m_pLastTextObject;
@@ skipping 24 matching lines @@
  public:
   enum ParseStatus { Ready, ToBeContinued, Done };
 
   CPDF_ContentParser();
   ~CPDF_ContentParser();
 
   ParseStatus GetStatus() { return m_Status; }
   void Start(CPDF_Page* pPage, CPDF_ParseOptions* pOptions);
   void Start(CPDF_Form* pForm,
              CPDF_AllStates* pGraphicStates,
-             CFX_AffineMatrix* pParentMatrix,
+             CFX_Matrix* pParentMatrix,
              CPDF_Type3Char* pType3Char,
              CPDF_ParseOptions* pOptions,
              int level);
   void Continue(IFX_Pause* pPause);
 
  protected:
   void Clear();
   ParseStatus m_Status;
   CPDF_PageObjects* m_pObjects;
   FX_BOOL m_bForm;
   CPDF_ParseOptions m_Options;
   CPDF_Type3Char* m_pType3Char;
   int m_InternalStage;
   CPDF_StreamAcc* m_pSingleStream;
   CPDF_StreamAcc** m_pStreamArray;
   FX_DWORD m_nStreams;
   uint8_t* m_pData;
   FX_DWORD m_Size;
   class CPDF_StreamContentParser* m_pParser;
   FX_DWORD m_CurrentOffset;
 };
 class CPDF_AllStates : public CPDF_GraphicStates {
  public:
   CPDF_AllStates();
   ~CPDF_AllStates();
   void Copy(const CPDF_AllStates& src);
   void ProcessExtGS(CPDF_Dictionary* pGS, CPDF_StreamContentParser* pParser);
   void SetLineDash(CPDF_Array*, FX_FLOAT, FX_FLOAT scale);
-  CFX_AffineMatrix m_TextMatrix, m_CTM, m_ParentMatrix;
+  CFX_Matrix m_TextMatrix, m_CTM, m_ParentMatrix;
   FX_FLOAT m_TextX, m_TextY, m_TextLineX, m_TextLineY;
   FX_FLOAT m_TextLeading, m_TextRise, m_TextHorzScale;
 };
 
 class CPDF_DocPageData {
  public:
   explicit CPDF_DocPageData(CPDF_Document* pPDFDoc);
   ~CPDF_DocPageData();
 
   void Clear(FX_BOOL bRelease = FALSE);
   CPDF_Font* GetFont(CPDF_Dictionary* pFontDict, FX_BOOL findOnly);
   CPDF_Font* GetStandardFont(const CFX_ByteStringC& fontName,
                              CPDF_FontEncoding* pEncoding);
   void ReleaseFont(CPDF_Dictionary* pFontDict);
   CPDF_ColorSpace* GetColorSpace(CPDF_Object* pCSObj,
                                  const CPDF_Dictionary* pResources);
   CPDF_ColorSpace* GetCopiedColorSpace(CPDF_Object* pCSObj);
   void ReleaseColorSpace(CPDF_Object* pColorSpace);
   CPDF_Pattern* GetPattern(CPDF_Object* pPatternObj,
                            FX_BOOL bShading,
-                           const CFX_AffineMatrix* matrix);
+                           const CFX_Matrix* matrix);
   void ReleasePattern(CPDF_Object* pPatternObj);
   CPDF_Image* GetImage(CPDF_Object* pImageStream);
   void ReleaseImage(CPDF_Object* pImageStream);
   CPDF_IccProfile* GetIccProfile(CPDF_Stream* pIccProfileStream);
   void ReleaseIccProfile(CPDF_IccProfile* pIccProfile);
   CPDF_StreamAcc* GetFontFileStreamAcc(CPDF_Stream* pFontStream);
   void ReleaseFontFileStreamAcc(CPDF_Stream* pFontStream,
                                 FX_BOOL bForce = FALSE);
   FX_BOOL IsForceClear() const { return m_bForceClear; }
   CPDF_CountedColorSpace* FindColorSpacePtr(CPDF_Object* pCSObj) const;
@@ skipping 98 matching lines @@
                  FX_FLOAT& G,
                  FX_FLOAT& B) const override;
   CPDF_ColorSpace* GetBaseCS() const override;
 
  private:
   CPDF_ColorSpace* m_pBaseCS;
   CPDF_CountedColorSpace* m_pCountedBaseCS;
 };
 
 #endif  // CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_