Re-land "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/pdfwindow/PWL_Signature.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_Label.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Signature.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 CPWL_Signature_Image::CPWL_Signature_Image() : m_pImage(NULL) {}
 
 CPWL_Signature_Image::~CPWL_Signature_Image() {}
 
 void CPWL_Signature_Image::SetImage(CFX_DIBSource* pImage) {
   m_pImage = pImage;
 }
 
 CFX_DIBSource* CPWL_Signature_Image::GetImage() {
   return m_pImage;
 }
 
 void CPWL_Signature_Image::DrawThisAppearance(CFX_RenderDevice* pDevice,
                                               CFX_Matrix* pUser2Device) {
   CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
 
   if (m_pImage) {
-    CPDF_Rect rcClient = GetClientRect();
+    CFX_FloatRect rcClient = GetClientRect();
 
     FX_FLOAT x, y;
     pUser2Device->Transform(rcClient.left, rcClient.top, x, y);
 
     pDevice->StretchDIBits(m_pImage, (int32_t)x, (int32_t)y,
                            (int32_t)rcClient.Width(),
                            (int32_t)rcClient.Height());
   }
 }
 
 void CPWL_Signature_Image::GetThisAppearanceStream(
     CFX_ByteTextBuf& sAppStream) {
   sAppStream << CPWL_Image::GetImageAppStream();
 }
 
 void CPWL_Signature_Image::GetScale(FX_FLOAT& fHScale, FX_FLOAT& fVScale) {
   FX_FLOAT fImageW, fImageH;
 
   GetImageSize(fImageW, fImageH);
 
-  CPDF_Rect rcClient = GetClientRect();
+  CFX_FloatRect rcClient = GetClientRect();
 
   fHScale = rcClient.Width() / fImageW;
   fVScale = rcClient.Height() / fImageH;
 }
 
 CPWL_Signature::CPWL_Signature()
     : m_pText(NULL),
       m_pDescription(NULL),
       m_pImage(NULL),
       m_bTextExist(TRUE),
@@ skipping 38 matching lines @@
 
 void CPWL_Signature::SetImageStream(CPDF_Stream* pStream,
                                     const FX_CHAR* sImageAlias) {
   m_pImage->SetPDFStream(pStream);
   m_pImage->SetImageAlias(sImageAlias);
 
   RePosChildWnd();
 }
 
 void CPWL_Signature::RePosChildWnd() {
-  CPDF_Rect rcClient = GetClientRect();
+  CFX_FloatRect rcClient = GetClientRect();
 
-  CPDF_Rect rcText = rcClient;
-  CPDF_Rect rcDescription = rcClient;
+  CFX_FloatRect rcText = rcClient;
+  CFX_FloatRect rcDescription = rcClient;
 
   FX_BOOL bTextVisible = m_bTextExist && m_pText->GetText().GetLength() > 0;
 
   if ((bTextVisible || m_bImageExist) &&
       m_pDescription->GetText().GetLength() > 0) {
     if (rcClient.Width() >= rcClient.Height()) {
       rcText.right = rcText.left + rcClient.Width() / 2.0f;
       rcDescription.left = rcDescription.right - rcClient.Width() / 2.0f;
     } else {
       rcText.bottom = rcText.top - rcClient.Height() / 2.0f;
@@ skipping 43 matching lines @@
         pDevice, pUser2Device, PWL_ICONTYPE_FOXIT,
         CPWL_Utils::GetCenterSquare(GetClientRect()),
         CPWL_Color(COLORTYPE_RGB, 0.91f, 0.855f, 0.92f),
         CPWL_Color(COLORTYPE_TRANSPARENT), 255);
   }
 }
 
 void CPWL_Signature::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
   CPWL_Wnd::GetThisAppearanceStream(sAppStream);
 }