Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

fpdfsdk/src/fpdfformfill.cpp

 // 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
 
 #include "public/fpdf_formfill.h"
 
 #include "fpdfsdk/include/fsdk_define.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
@@ skipping 316 matching lines @@
     return;
   CPDF_Document* pPDFDoc = pDocument->GetPDFDoc();
   if (!pPDFDoc)
     return;
   CPDFDoc_Environment* pEnv = (CPDFDoc_Environment*)hHandle;
   CPDFSDK_Document* pFXDoc = pEnv->GetSDKDocument();
   if (!pFXDoc)
     return;
 #endif  // PDF_ENABLE_XFA
 
-  CFX_AffineMatrix matrix;
+  CFX_Matrix matrix;
   pPage->GetDisplayMatrix(matrix, start_x, start_y, size_x, size_y, rotate);
 
   FX_RECT clip;
   clip.left = start_x;
   clip.right = start_x + size_x;
   clip.top = start_y;
   clip.bottom = start_y + size_y;
 
 #ifdef _SKIA_SUPPORT_
   nonstd::unique_ptr<CFX_SkiaDevice> pDevice(new CFX_SkiaDevice);
@@ skipping 386 matching lines @@
         pActionHandler->DoAction_Page(action, CPDF_AAction::OpenPage, pSDKDoc);
       }
     } else {
       if (aa.ActionExist(CPDF_AAction::ClosePage)) {
         CPDF_Action action = aa.GetAction(CPDF_AAction::ClosePage);
         pActionHandler->DoAction_Page(action, CPDF_AAction::ClosePage, pSDKDoc);
       }
     }
   }
 }