Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

fpdfsdk/src/fpdfxfa/fpdfxfa_page.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 "../../include/fsdk_define.h"
 #include "../../include/fsdk_mgr.h"
 #include "../../include/fpdfxfa/fpdfxfa_util.h"
 #include "../../include/fpdfxfa/fpdfxfa_doc.h"
@@ skipping 167 matching lines @@
                                 int rotate,
                                 int device_x,
                                 int device_y,
                                 double* page_x,
                                 double* page_y) {
   ASSERT(m_pDocument != NULL);
 
   if (!m_pPDFPage && !m_pXFAPageView)
     return;
 
-  CPDF_Matrix page2device;
-  CPDF_Matrix device2page;
+  CFX_Matrix page2device;
+  CFX_Matrix device2page;
   FX_FLOAT page_x_f, page_y_f;
 
   GetDisplayMatrix(page2device, start_x, start_y, size_x, size_y, rotate);
 
   device2page.SetReverse(page2device);
   device2page.Transform((FX_FLOAT)(device_x), (FX_FLOAT)(device_y), page_x_f,
                         page_y_f);
 
   *page_x = (page_x_f);
   *page_y = (page_y_f);
 }
 
 void CPDFXFA_Page::PageToDevice(int start_x,
                                 int start_y,
                                 int size_x,
                                 int size_y,
                                 int rotate,
                                 double page_x,
                                 double page_y,
                                 int* device_x,
                                 int* device_y) {
   if (!m_pPDFPage && !m_pXFAPageView)
     return;
 
-  CPDF_Matrix page2device;
+  CFX_Matrix page2device;
   FX_FLOAT device_x_f, device_y_f;
 
   GetDisplayMatrix(page2device, start_x, start_y, size_x, size_y, rotate);
 
   page2device.Transform(((FX_FLOAT)page_x), ((FX_FLOAT)page_y), device_x_f,
                         device_y_f);
 
   *device_x = FXSYS_round(device_x_f);
   *device_y = FXSYS_round(device_y_f);
 }
 
-void CPDFXFA_Page::GetDisplayMatrix(CFX_AffineMatrix& matrix,
+void CPDFXFA_Page::GetDisplayMatrix(CFX_Matrix& matrix,
                                     int xPos,
                                     int yPos,
                                     int xSize,
                                     int ySize,
                                     int iRotate) const {
   ASSERT(m_pDocument != NULL);
 
   if (!m_pPDFPage && !m_pXFAPageView)
     return;
 
   int nDocType = m_pDocument->GetDocType();
   switch (nDocType) {
     case DOCTYPE_DYNAMIC_XFA: {
       if (m_pXFAPageView) {
         CFX_Rect rect;
         rect.Set(xPos, yPos, xSize, ySize);
         m_pXFAPageView->GetDisplayMatrix(matrix, rect, iRotate);
       }
     } break;
     case DOCTYPE_PDF:
     case DOCTYPE_STATIC_XFA: {
       if (m_pPDFPage) {
         m_pPDFPage->GetDisplayMatrix(matrix, xPos, yPos, xSize, ySize, iRotate);
       }
     } break;
     default:
       return;
   }
 }