Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

fpdfsdk/include/fsdk_annothandler.h

Index: fpdfsdk/include/fsdk_annothandler.h
diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h
index 9040f402715483bddef583009714fa470d98f1b4..44d2f523c43020073af34efb0ca946d75579c2f5 100644
--- a/fpdfsdk/include/fsdk_annothandler.h
+++ b/fpdfsdk/include/fsdk_annothandler.h
@@ -22,7 +22,7 @@ class CPDFDoc_Environment;
 class CPDFSDK_Annot;
 class CPDFSDK_PageView;
 class CPDF_Annot;
-class CPDF_Matrix;
+class CFX_Matrix;
 class CPDF_Point;
 class CPDF_Rect;
 
@@ -58,13 +58,13 @@ class IPDFSDK_AnnotHandler {
   virtual void OnDraw(CPDFSDK_PageView* pPageView,
                       CPDFSDK_Annot* pAnnot,
                       CFX_RenderDevice* pDevice,
-                      CPDF_Matrix* pUser2Device,
+                      CFX_Matrix* pUser2Device,
                       FX_DWORD dwFlags) = 0;
 
   virtual void OnDrawSleep(CPDFSDK_PageView* pPageView,
                            CPDFSDK_Annot* pAnnot,
                            CFX_RenderDevice* pDevice,
-                           CPDF_Matrix* pUser2Device,
+                           CFX_Matrix* pUser2Device,
                            const CPDF_Rect& rcWindow,
                            FX_DWORD dwFlags) = 0;
 
@@ -159,12 +159,12 @@ class CPDFSDK_BFAnnotHandler : public IPDFSDK_AnnotHandler {
   void OnDraw(CPDFSDK_PageView* pPageView,
               CPDFSDK_Annot* pAnnot,
               CFX_RenderDevice* pDevice,
-              CPDF_Matrix* pUser2Device,
+              CFX_Matrix* pUser2Device,
               FX_DWORD dwFlags) override;
   void OnDrawSleep(CPDFSDK_PageView* pPageView,
                    CPDFSDK_Annot* pAnnot,
                    CFX_RenderDevice* pDevice,
-                   CPDF_Matrix* pUser2Device,
+                   CFX_Matrix* pUser2Device,
                    const CPDF_Rect& rcWindow,
                    FX_DWORD dwFlags) override {}
   void OnCreate(CPDFSDK_Annot* pAnnot) override;
@@ -269,13 +269,13 @@ class CPDFSDK_XFAAnnotHandler : public IPDFSDK_AnnotHandler {
   virtual void OnDraw(CPDFSDK_PageView* pPageView,
                       CPDFSDK_Annot* pAnnot,
                       CFX_RenderDevice* pDevice,
-                      CPDF_Matrix* pUser2Device,
+                      CFX_Matrix* pUser2Device,
                       FX_DWORD dwFlags);
 
   virtual void OnDrawSleep(CPDFSDK_PageView* pPageView,
                            CPDFSDK_Annot* pAnnot,
                            CFX_RenderDevice* pDevice,
-                           CPDF_Matrix* pUser2Device,
+                           CFX_Matrix* pUser2Device,
                            const CPDF_Rect& rcWindow,
                            FX_DWORD dwFlags) {}
 
@@ -378,7 +378,7 @@ class CPDFSDK_AnnotHandlerMgr {
   virtual void Annot_OnDraw(CPDFSDK_PageView* pPageView,
                             CPDFSDK_Annot* pAnnot,
                             CFX_RenderDevice* pDevice,
-                            CPDF_Matrix* pUser2Device,
+                            CFX_Matrix* pUser2Device,
                             FX_DWORD dwFlags);
 
   virtual void Annot_OnMouseEnter(CPDFSDK_PageView* pPageView,