Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

core/include/fpdfdoc/fpdf_vt.h

 // 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
 
 #ifndef CORE_INCLUDE_FPDFDOC_FPDF_VT_H_
 #define CORE_INCLUDE_FPDFDOC_FPDF_VT_H_
 
 #include "core/include/fpdfapi/fpdf_parser.h"
@@ skipping 208 matching lines @@
         fWidth(0.0f),
         fFontSize(0),
         WordProps() {}
 
   FX_WORD Word;
 
   int32_t nCharset;
 
   CPVT_WordPlace WordPlace;
 
-  CFX_FloatPoint ptWord;
+  CPDF_Point ptWord;
 
   FX_FLOAT fAscent;
 
   FX_FLOAT fDescent;
 
   FX_FLOAT fWidth;
 
   int32_t nFontIndex;
 
   FX_FLOAT fFontSize;
 
   CPVT_WordProps WordProps;
 };
 struct CPVT_Line {
   CPVT_Line()
       : ptLine(0, 0), fLineWidth(0.0f), fLineAscent(0.0f), fLineDescent(0.0f) {}
 
   CPVT_WordPlace lineplace;
 
   CPVT_WordPlace lineEnd;
 
-  CFX_FloatPoint ptLine;
+  CPDF_Point ptLine;
 
   FX_FLOAT fLineWidth;
 
   FX_FLOAT fLineAscent;
 
   FX_FLOAT fLineDescent;
 };
 struct CPVT_Section {
   CPVT_WordPlace secplace;
 
-  CFX_FloatRect rcSection;
+  CPDF_Rect rcSection;
 
   CPVT_SecProps SecProps;
 
   CPVT_WordProps WordProps;
 };
 class IPDF_VariableText_Provider {
  public:
   virtual ~IPDF_VariableText_Provider() {}
 
   virtual int32_t GetCharWidth(int32_t nFontIndex,
@@ skipping 48 matching lines @@
  public:
   static IPDF_VariableText* NewVariableText();
 
   static void DelVariableText(IPDF_VariableText* pVT);
 
   virtual IPDF_VariableText_Provider* SetProvider(
       IPDF_VariableText_Provider* pProvider) = 0;
 
   virtual IPDF_VariableText_Iterator* GetIterator() = 0;
 
-  virtual void SetPlateRect(const CFX_FloatRect& rect) = 0;
+  virtual void SetPlateRect(const CPDF_Rect& rect) = 0;
 
   virtual void SetAlignment(int32_t nFormat = 0) = 0;
 
   virtual void SetPasswordChar(FX_WORD wSubWord = '*') = 0;
 
   virtual void SetLimitChar(int32_t nLimitChar = 0) = 0;
 
   virtual void SetCharArray(int32_t nCharArray = 0) = 0;
 
   virtual void SetCharSpace(FX_FLOAT fCharSpace = 0.0f) = 0;
@@ skipping 46 matching lines @@
       int32_t charset = 1,
       const CPVT_SecProps* pSecProps = NULL,
       const CPVT_WordProps* pWordProps = NULL) = 0;
 
   virtual CPVT_WordPlace DeleteWords(const CPVT_WordRange& PlaceRange) = 0;
 
   virtual CPVT_WordPlace DeleteWord(const CPVT_WordPlace& place) = 0;
 
   virtual CPVT_WordPlace BackSpaceWord(const CPVT_WordPlace& place) = 0;
 
-  virtual const CFX_FloatRect& GetPlateRect() const = 0;
+  virtual const CPDF_Rect& GetPlateRect() const = 0;
 
-  virtual CFX_FloatRect GetContentRect() const = 0;
+  virtual CPDF_Rect GetContentRect() const = 0;
 
   virtual int32_t GetTotalWords() const = 0;
 
   virtual FX_FLOAT GetFontSize() const = 0;
 
   virtual int32_t GetAlignment() const = 0;
 
   virtual FX_WORD GetPasswordChar() const = 0;
 
   virtual int32_t GetCharArray() const = 0;
 
   virtual int32_t GetLimitChar() const = 0;
 
   virtual FX_BOOL IsMultiLine() const = 0;
 
   virtual int32_t GetHorzScale() const = 0;
 
   virtual FX_FLOAT GetCharSpace() const = 0;
 
   virtual CPVT_WordPlace GetBeginWordPlace() const = 0;
 
   virtual CPVT_WordPlace GetEndWordPlace() const = 0;
 
   virtual CPVT_WordPlace GetPrevWordPlace(
       const CPVT_WordPlace& place) const = 0;
 
   virtual CPVT_WordPlace GetNextWordPlace(
       const CPVT_WordPlace& place) const = 0;
 
-  virtual CPVT_WordPlace SearchWordPlace(const CFX_FloatPoint& point) const = 0;
+  virtual CPVT_WordPlace SearchWordPlace(const CPDF_Point& point) const = 0;
 
   virtual CPVT_WordPlace GetUpWordPlace(const CPVT_WordPlace& place,
-                                        const CFX_FloatPoint& point) const = 0;
+                                        const CPDF_Point& point) const = 0;
 
-  virtual CPVT_WordPlace GetDownWordPlace(
-      const CPVT_WordPlace& place,
-      const CFX_FloatPoint& point) const = 0;
+  virtual CPVT_WordPlace GetDownWordPlace(const CPVT_WordPlace& place,
+                                          const CPDF_Point& point) const = 0;
 
   virtual CPVT_WordPlace GetLineBeginPlace(
       const CPVT_WordPlace& place) const = 0;
 
   virtual CPVT_WordPlace GetLineEndPlace(const CPVT_WordPlace& place) const = 0;
 
   virtual CPVT_WordPlace GetSectionBeginPlace(
       const CPVT_WordPlace& place) const = 0;
 
   virtual CPVT_WordPlace GetSectionEndPlace(
       const CPVT_WordPlace& place) const = 0;
 
   virtual void UpdateWordPlace(CPVT_WordPlace& place) const = 0;
 
   virtual CPVT_WordPlace AdjustLineHeader(const CPVT_WordPlace& place,
                                           FX_BOOL bPrevOrNext) const = 0;
 
   virtual int32_t WordPlaceToWordIndex(const CPVT_WordPlace& place) const = 0;
 
   virtual CPVT_WordPlace WordIndexToWordPlace(int32_t index) const = 0;
 
  protected:
   ~IPDF_VariableText() {}
 };
 
 #endif  // CORE_INCLUDE_FPDFDOC_FPDF_VT_H_