Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

fpdfsdk/src/pdfwindow/PWL_Icon.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 "fpdfsdk/include/pdfwindow/PDFWindow.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Icon.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 /* ------------------------------- CPWL_Image ----------------------------------
  */
 
 CPWL_Image::CPWL_Image() : m_pPDFStream(NULL) {}
 
 CPWL_Image::~CPWL_Image() {}
 
 CFX_ByteString CPWL_Image::GetImageAppStream() {
   CFX_ByteTextBuf sAppStream;
 
   CFX_ByteString sAlias = GetImageAlias();
   CPDF_Rect rcPlate = GetClientRect();
-  CPDF_Matrix mt;
+  CFX_Matrix mt;
   mt.SetReverse(GetImageMatrix());
 
   FX_FLOAT fHScale = 1.0f;
   FX_FLOAT fVScale = 1.0f;
   GetScale(fHScale, fVScale);
 
   FX_FLOAT fx = 0.0f;
   FX_FLOAT fy = 0.0f;
   GetImageOffset(fx, fy);
 
@@ skipping 30 matching lines @@
   if (m_pPDFStream) {
     if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) {
       CPDF_Rect rect = pDict->GetRect("BBox");
 
       fWidth = rect.right - rect.left;
       fHeight = rect.top - rect.bottom;
     }
   }
 }
 
-CPDF_Matrix CPWL_Image::GetImageMatrix() {
+CFX_Matrix CPWL_Image::GetImageMatrix() {
   if (m_pPDFStream) {
     if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) {
       return pDict->GetMatrix("Matrix");
     }
   }
 
-  return CPDF_Matrix();
+  return CFX_Matrix();
 }
 
 CFX_ByteString CPWL_Image::GetImageAlias() {
   if (m_sImageAlias.IsEmpty()) {
     if (m_pPDFStream) {
       if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) {
         return pDict->GetString("Name");
       }
     }
   } else
@@ skipping 128 matching lines @@
   FX_FLOAT fImageFactHeight = fImageHeight * fVScale;
 
   FX_FLOAT fPlateWidth, fPlateHeight;
   CPDF_Rect rcPlate = GetClientRect();
   fPlateWidth = rcPlate.right - rcPlate.left;
   fPlateHeight = rcPlate.top - rcPlate.bottom;
 
   x = (fPlateWidth - fImageFactWidth) * fLeft;
   y = (fPlateHeight - fImageFactHeight) * fBottom;
 }