Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

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/PWL_Icon.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 CPWL_Image::CPWL_Image() : m_pPDFStream(NULL) {}
 
 CPWL_Image::~CPWL_Image() {}
 
 CFX_ByteString CPWL_Image::GetImageAppStream() {
   CFX_ByteTextBuf sAppStream;
 
   CFX_ByteString sAlias = GetImageAlias();
-  CFX_FloatRect rcPlate = GetClientRect();
+  CPDF_Rect rcPlate = GetClientRect();
   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 23 matching lines @@
 CPDF_Stream* CPWL_Image::GetPDFStream() {
   return m_pPDFStream;
 }
 
 void CPWL_Image::GetImageSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight) {
   fWidth = 0.0f;
   fHeight = 0.0f;
 
   if (m_pPDFStream) {
     if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) {
-      CFX_FloatRect rect = pDict->GetRectBy("BBox");
+      CPDF_Rect rect = pDict->GetRectBy("BBox");
 
       fWidth = rect.right - rect.left;
       fHeight = rect.top - rect.bottom;
     }
   }
 }
 
 CFX_Matrix CPWL_Image::GetImageMatrix() {
   if (m_pPDFStream) {
     if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) {
@@ skipping 76 matching lines @@
 }
 
 void CPWL_Icon::GetScale(FX_FLOAT& fHScale, FX_FLOAT& fVScale) {
   fHScale = 1.0f;
   fVScale = 1.0f;
 
   if (m_pPDFStream) {
     FX_FLOAT fImageWidth, fImageHeight;
     FX_FLOAT fPlateWidth, fPlateHeight;
 
-    CFX_FloatRect rcPlate = GetClientRect();
+    CPDF_Rect rcPlate = GetClientRect();
     fPlateWidth = rcPlate.right - rcPlate.left;
     fPlateHeight = rcPlate.top - rcPlate.bottom;
 
     GetImageSize(fImageWidth, fImageHeight);
 
     int32_t nScaleMethod = GetScaleMethod();
 
     switch (nScaleMethod) {
       default:
       case 0:
@@ skipping 35 matching lines @@
   FX_FLOAT fImageWidth, fImageHeight;
   GetImageSize(fImageWidth, fImageHeight);
 
   FX_FLOAT fHScale, fVScale;
   GetScale(fHScale, fVScale);
 
   FX_FLOAT fImageFactWidth = fImageWidth * fHScale;
   FX_FLOAT fImageFactHeight = fImageHeight * fVScale;
 
   FX_FLOAT fPlateWidth, fPlateHeight;
-  CFX_FloatRect rcPlate = GetClientRect();
+  CPDF_Rect rcPlate = GetClientRect();
   fPlateWidth = rcPlate.right - rcPlate.left;
   fPlateHeight = rcPlate.top - rcPlate.bottom;
 
   x = (fPlateWidth - fImageFactWidth) * fLeft;
   y = (fPlateHeight - fImageFactHeight) * fBottom;
 }