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

core/include/fpdfdoc/fpdf_ap.h

Index: core/include/fpdfdoc/fpdf_ap.h
diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h
index f9ade57d97e9c99b323cfb0dd06b539e31dccac4..5f2a3005eaff9234368d265f1d2963625e296a55 100644
--- a/core/include/fpdfdoc/fpdf_ap.h
+++ b/core/include/fpdfdoc/fpdf_ap.h
@@ -81,12 +81,12 @@ class CPVT_GenerateAP {
 
   static CFX_ByteString GenerateEditAP(IPVT_FontMap* pFontMap,
                                        IPDF_VariableText_Iterator* pIterator,
-                                       const CPDF_Point& ptOffset,
+                                       const CFX_FloatPoint& ptOffset,
                                        FX_BOOL bContinuous,
                                        FX_WORD SubWord = 0,
                                        const CPVT_WordRange* pVisible = NULL);
 
-  static CFX_ByteString GenerateBorderAP(const CPDF_Rect& rect,
+  static CFX_ByteString GenerateBorderAP(const CFX_FloatRect& rect,
                                          FX_FLOAT fWidth,
                                          const CPVT_Color& color,
                                          const CPVT_Color& crLeftTop,