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

fpdfsdk/include/fsdk_baseannot.h

Index: fpdfsdk/include/fsdk_baseannot.h
diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h
index 49c25de28462d3fa9d13845e8afd1693c371d0d0..c0ed5297822fd93f4a8c2bbcb47833c4eace9287 100644
--- a/fpdfsdk/include/fsdk_baseannot.h
+++ b/fpdfsdk/include/fsdk_baseannot.h
@@ -89,8 +89,8 @@ class CPDFSDK_Annot {
   virtual CFX_ByteString GetType() const { return ""; }
   virtual CFX_ByteString GetSubType() const { return ""; }
 
-  virtual void SetRect(const CPDF_Rect& rect) {}
-  virtual CPDF_Rect GetRect() const { return CPDF_Rect(); }
+  virtual void SetRect(const CFX_FloatRect& rect) {}
+  virtual CFX_FloatRect GetRect() const { return CFX_FloatRect(); }
 
   virtual void Annot_OnDraw(CFX_RenderDevice* pDevice,
                             CFX_Matrix* pUser2Device,
@@ -130,8 +130,8 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot {
 
   CFX_ByteString GetType() const override;
   CFX_ByteString GetSubType() const override;
-  void SetRect(const CPDF_Rect& rect) override;
-  CPDF_Rect GetRect() const override;
+  void SetRect(const CFX_FloatRect& rect) override;
+  CFX_FloatRect GetRect() const override;
   CPDF_Annot* GetPDFAnnot() const override;
   void Annot_OnDraw(CFX_RenderDevice* pDevice,
                     CFX_Matrix* pUser2Device,
@@ -207,7 +207,7 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot {
   void ClearCachedAP();
 
   void 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 = "");