Replace CPDF_Rect and CPDF_Point with CFX types.

Too many rectangle types.  Remove CPDF_Rect #define, and
make an equivalent point type in CFX, but stop short of
consolidating the N different forms of rectangles in CFX.

Also banish PDF_ClipFloat to the one .cpp file that needs it,
since it was in the vicinity of the .h file changes.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1740923003 .

2 files changed, 13 insertions, 12 deletions

diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h
index f9ade57d97..5f2a3005ea 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,
diff --git a/core/include/fpdfdoc/fpdf_vt.h b/core/include/fpdfdoc/fpdf_vt.h
index 91a93884e8..b2e64cd2ed 100644
--- a/core/include/fpdfdoc/fpdf_vt.h
+++ b/core/include/fpdfdoc/fpdf_vt.h
@@ -226,7 +226,7 @@ struct CPVT_Word {
 
   CPVT_WordPlace WordPlace;
 
-  CPDF_Point ptWord;
+  CFX_FloatPoint ptWord;
 
   FX_FLOAT fAscent;
 
@@ -248,7 +248,7 @@ struct CPVT_Line {
 
   CPVT_WordPlace lineEnd;
 
-  CPDF_Point ptLine;
+  CFX_FloatPoint ptLine;
 
   FX_FLOAT fLineWidth;
 
@@ -259,7 +259,7 @@ struct CPVT_Line {
 struct CPVT_Section {
   CPVT_WordPlace secplace;
 
-  CPDF_Rect rcSection;
+  CFX_FloatRect rcSection;
 
   CPVT_SecProps SecProps;
 
@@ -328,7 +328,7 @@ class IPDF_VariableText {
 
   virtual IPDF_VariableText_Iterator* GetIterator() = 0;
 
-  virtual void SetPlateRect(const CPDF_Rect& rect) = 0;
+  virtual void SetPlateRect(const CFX_FloatRect& rect) = 0;
 
   virtual void SetAlignment(int32_t nFormat = 0) = 0;
 
@@ -395,9 +395,9 @@ class IPDF_VariableText {
 
   virtual CPVT_WordPlace BackSpaceWord(const CPVT_WordPlace& place) = 0;
 
-  virtual const CPDF_Rect& GetPlateRect() const = 0;
+  virtual const CFX_FloatRect& GetPlateRect() const = 0;
 
-  virtual CPDF_Rect GetContentRect() const = 0;
+  virtual CFX_FloatRect GetContentRect() const = 0;
 
   virtual int32_t GetTotalWords() const = 0;
 
@@ -427,13 +427,14 @@ class IPDF_VariableText {
   virtual CPVT_WordPlace GetNextWordPlace(
       const CPVT_WordPlace& place) const = 0;
 
-  virtual CPVT_WordPlace SearchWordPlace(const CPDF_Point& point) const = 0;
+  virtual CPVT_WordPlace SearchWordPlace(const CFX_FloatPoint& point) const = 0;
 
   virtual CPVT_WordPlace GetUpWordPlace(const CPVT_WordPlace& place,
-                                        const CPDF_Point& point) const = 0;
+                                        const CFX_FloatPoint& point) const = 0;
 
-  virtual CPVT_WordPlace GetDownWordPlace(const CPVT_WordPlace& place,
-                                          const CPDF_Point& point) const = 0;
+  virtual CPVT_WordPlace GetDownWordPlace(
+      const CPVT_WordPlace& place,
+      const CFX_FloatPoint& point) const = 0;
 
   virtual CPVT_WordPlace GetLineBeginPlace(
       const CPVT_WordPlace& place) const = 0;