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

fpdfsdk/src/fsdk_baseannot.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 <algorithm>
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "fpdfsdk/include/fsdk_baseannot.h"
@@ skipping 519 matching lines @@
 }
 
 void CPDFSDK_Annot::SetTabOrder(int iTabOrder) {
   m_nTabOrder = iTabOrder;
 }
 
 CPDF_Dictionary* CPDFSDK_BAAnnot::GetAnnotDict() const {
   return m_pAnnot->GetAnnotDict();
 }
 
-void CPDFSDK_BAAnnot::SetRect(const CPDF_Rect& rect) {
+void CPDFSDK_BAAnnot::SetRect(const CFX_FloatRect& rect) {
   ASSERT(rect.right - rect.left >= GetMinWidth());
   ASSERT(rect.top - rect.bottom >= GetMinHeight());
 
   m_pAnnot->GetAnnotDict()->SetAtRect("Rect", rect);
 }
 
-CPDF_Rect CPDFSDK_BAAnnot::GetRect() const {
-  CPDF_Rect rect;
+CFX_FloatRect CPDFSDK_BAAnnot::GetRect() const {
+  CFX_FloatRect rect;
   m_pAnnot->GetRect(rect);
   return rect;
 }
 
 CFX_ByteString CPDFSDK_BAAnnot::GetType() const {
   return m_pAnnot->GetSubType();
 }
 
 CFX_ByteString CPDFSDK_BAAnnot::GetSubType() const {
   return "";
@@ skipping 269 matching lines @@
       color = FXSYS_RGB((int)(r * 255), (int)(g * 255), (int)(b * 255));
 
       return TRUE;
     }
   }
 
   return FALSE;
 }
 
 void CPDFSDK_BAAnnot::WriteAppearance(const CFX_ByteString& sAPType,
-                                      const CPDF_Rect& rcBBox,
+                                      const CFX_FloatRect& rcBBox,
                                       const CFX_Matrix& matrix,
                                       const CFX_ByteString& sContents,
                                       const CFX_ByteString& sAPState) {
   CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDictBy("AP");
 
   if (!pAPDict) {
     pAPDict = new CPDF_Dictionary;
     m_pAnnot->GetAnnotDict()->SetAt("AP", pAPDict);
   }
 
@@ skipping 130 matching lines @@
 
 CPDF_Page* CPDFSDK_Annot::GetPDFPage() {
   return m_pPageView ? m_pPageView->GetPDFPage() : nullptr;
 }
 
 #ifdef PDF_ENABLE_XFA
 CPDFXFA_Page* CPDFSDK_Annot::GetPDFXFAPage() {
   return m_pPageView ? m_pPageView->GetPDFXFAPage() : nullptr;
 }
 #endif  // PDF_ENABLE_XFA