Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/include/fpdfdoc/fpdf_doc.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_FPDFDOC_FPDF_DOC_H_
 #define CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
 
 #include <map>
@@ skipping 384 matching lines @@
 
   FX_DWORD GetFlags() const;
 
   void GetRect(CFX_FloatRect& rect) const;
 
   const CPDF_Dictionary* GetAnnotDict() const { return m_pAnnotDict; }
   CPDF_Dictionary* GetAnnotDict() { return m_pAnnotDict; }
 
   FX_BOOL DrawAppearance(const CPDF_Page* pPage,
                          CFX_RenderDevice* pDevice,
-                         const CFX_AffineMatrix* pUser2Device,
+                         const CFX_Matrix* pUser2Device,
                          AppearanceMode mode,
                          const CPDF_RenderOptions* pOptions);
 
   FX_BOOL DrawInContext(const CPDF_Page* pPage,
                         const CPDF_RenderContext* pContext,
-                        const CFX_AffineMatrix* pUser2Device,
+                        const CFX_Matrix* pUser2Device,
                         AppearanceMode mode);
 
   void ClearCachedAP();
 
   void DrawBorder(CFX_RenderDevice* pDevice,
-                  const CFX_AffineMatrix* pUser2Device,
+                  const CFX_Matrix* pUser2Device,
                   const CPDF_RenderOptions* pOptions);
 
   CPDF_Form* GetAPForm(const CPDF_Page* pPage, AppearanceMode mode);
 
  private:
   CPDF_Dictionary* const m_pAnnotDict;
 
   CPDF_AnnotList* const m_pList;
 
   const CFX_ByteString m_sSubtype;
 
   CFX_MapPtrToPtr m_APMap;
 };
 
 class CPDF_AnnotList {
  public:
   explicit CPDF_AnnotList(CPDF_Page* pPage);
   ~CPDF_AnnotList();
 
   void DisplayAnnots(const CPDF_Page* pPage,
                      CPDF_RenderContext* pContext,
                      FX_BOOL bPrinting,
-                     CFX_AffineMatrix* pMatrix,
+                     CFX_Matrix* pMatrix,
                      FX_BOOL bShowWidget,
                      CPDF_RenderOptions* pOptions) {
     DisplayAnnots(pPage, nullptr, pContext, bPrinting, pMatrix,
                   bShowWidget ? 3 : 1, pOptions, nullptr);
   }
   void DisplayAnnots(const CPDF_Page* pPage,
                      CFX_RenderDevice* pDevice,
                      CPDF_RenderContext* pContext,
                      FX_BOOL bPrinting,
-                     CFX_AffineMatrix* pMatrix,
+                     CFX_Matrix* pMatrix,
                      FX_DWORD dwAnnotFlags,
                      CPDF_RenderOptions* pOptions,
                      FX_RECT* pClipRect);
   size_t Count() const { return m_AnnotList.size(); }
   CPDF_Annot* GetAt(size_t index) const { return m_AnnotList[index]; }
   const std::vector<CPDF_Annot*>& All() const { return m_AnnotList; }
   CPDF_Document* GetDocument() const { return m_pDocument; }
 
  protected:
   void DisplayPass(const CPDF_Page* pPage,
                    CFX_RenderDevice* pDevice,
                    CPDF_RenderContext* pContext,
                    FX_BOOL bPrinting,
-                   CFX_AffineMatrix* pMatrix,
+                   CFX_Matrix* pMatrix,
                    FX_BOOL bWidget,
                    CPDF_RenderOptions* pOptions,
                    FX_RECT* clip_rect);
 
   CPDF_Document* const m_pDocument;
   std::vector<CPDF_Annot*> m_AnnotList;
 };
 
 #define COLORTYPE_TRANSPARENT 0
 #define COLORTYPE_GRAY 1
@@ skipping 35 matching lines @@
                 FX_BOOL bStrokingOperation = FALSE);
 
   void GetColor(FX_ARGB& color,
                 int& iColorType,
                 FX_BOOL bStrokingOperation = FALSE);
 
   FX_BOOL HasTextMatrix();
 
   CFX_ByteString GetTextMatrixString();
 
-  CFX_AffineMatrix GetTextMatrix();
+  CFX_Matrix GetTextMatrix();
 
  protected:
   CFX_ByteString m_csDA;
 };
 #define FIELDTYPE_UNKNOWN 0
 #define FIELDTYPE_PUSHBUTTON 1
 #define FIELDTYPE_CHECKBOX 2
 #define FIELDTYPE_RADIOBUTTON 3
 #define FIELDTYPE_COMBOBOX 4
 #define FIELDTYPE_LISTBOX 5
@@ skipping 377 matching lines @@
 
   CPDF_InterForm* GetInterForm() const { return m_pForm; }
 
   CPDF_FormField* GetField() const { return m_pField; }
 
   CPDF_Dictionary* GetWidget() const { return m_pWidgetDict; }
 
   CFX_FloatRect GetRect() const;
 
   void DrawControl(CFX_RenderDevice* pDevice,
-                   CFX_AffineMatrix* pMatrix,
+                   CFX_Matrix* pMatrix,
                    CPDF_Page* pPage,
                    CPDF_Annot::AppearanceMode mode,
                    const CPDF_RenderOptions* pOptions = NULL);
 
   CFX_ByteString GetCheckedAPState();
 
   CFX_WideString GetExportValue();
 
   FX_BOOL IsChecked();
 
@@ skipping 228 matching lines @@
   CFX_WideString GetCaption(const CFX_ByteStringC& csEntry) const;
 
   CPDF_Stream* GetIcon(const CFX_ByteStringC& csEntry) const;
 
   CPDF_Dictionary* const m_pDict;
 };
 
 CFX_WideString FILESPEC_EncodeFileName(const CFX_WideStringC& filepath);
 
 #endif  // CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_