Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

fpdfsdk/include/fsdk_baseform.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 FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 #define FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 
 #if _FX_OS_ == _FX_ANDROID_
@@ skipping 173 matching lines @@
   void ResetAppearance_RadioButton();
   void ResetAppearance_ComboBox(const FX_WCHAR* sValue);
   void ResetAppearance_ListBox();
   void ResetAppearance_TextField(const FX_WCHAR* sValue);
 
   CPDF_Rect GetClientRect() const;
   CPDF_Rect GetRotatedRect() const;
 
   CFX_ByteString GetBackgroundAppStream() const;
   CFX_ByteString GetBorderAppStream() const;
-  CPDF_Matrix GetMatrix() const;
+  CFX_Matrix GetMatrix() const;
 
   CPWL_Color GetTextPWLColor() const;
   CPWL_Color GetBorderPWLColor() const;
   CPWL_Color GetFillPWLColor() const;
 
   void AddImageToAppearance(const CFX_ByteString& sAPType, CPDF_Stream* pImage);
   void RemoveAppearance(const CFX_ByteString& sAPType);
 
  public:
   FX_BOOL IsWidgetAppearanceValid(CPDF_Annot::AppearanceMode mode);
   void DrawAppearance(CFX_RenderDevice* pDevice,
-                      const CPDF_Matrix* pUser2Device,
+                      const CFX_Matrix* pUser2Device,
                       CPDF_Annot::AppearanceMode mode,
                       const CPDF_RenderOptions* pOptions) override;
 
   FX_BOOL HitTest(FX_FLOAT pageX, FX_FLOAT pageY);
 
 #ifndef PDF_ENABLE_XFA
  private:
 #endif  // PDF_ENABLE_XFA
   CPDFSDK_InterForm* m_pInterForm;
   FX_BOOL m_bAppModified;
@@ skipping 185 matching lines @@
   static CPDF_Rect GetAnnotRect(CPDFSDK_Annot* pAnnot);
 
   CPDFSDK_PageView* m_pPageView;
   CFX_ByteString m_sType;
   CFX_ByteString m_sSubType;
   int m_nTabs;
   CPDFSDK_Annots m_Annots;
 };
 
 #endif  // FPDFSDK_INCLUDE_FSDK_BASEFORM_H_