Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/include/fsdk_baseform.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 FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 #define FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 
 #if _FX_OS_ == _FX_ANDROID_
@@ skipping 169 matching lines @@
   int32_t GetValueAge() const;
 
  private:
   void ResetAppearance_PushButton();
   void ResetAppearance_CheckBox();
   void ResetAppearance_RadioButton();
   void ResetAppearance_ComboBox(const FX_WCHAR* sValue);
   void ResetAppearance_ListBox();
   void ResetAppearance_TextField(const FX_WCHAR* sValue);
 
-  CFX_FloatRect GetClientRect() const;
-  CFX_FloatRect GetRotatedRect() const;
+  CPDF_Rect GetClientRect() const;
+  CPDF_Rect GetRotatedRect() const;
 
   CFX_ByteString GetBackgroundAppStream() const;
   CFX_ByteString GetBorderAppStream() const;
   CFX_Matrix GetMatrix() const;
 
   CPWL_Color GetTextPWLColor() const;
   CPWL_Color GetBorderPWLColor() const;
   CPWL_Color GetFillPWLColor() const;
 
   void AddImageToAppearance(const CFX_ByteString& sAPType, CPDF_Stream* pImage);
@@ skipping 175 matching lines @@
                     const CFX_ByteString& sSubType);
   ~CBA_AnnotIterator();
 
   CPDFSDK_Annot* GetFirstAnnot();
   CPDFSDK_Annot* GetLastAnnot();
   CPDFSDK_Annot* GetNextAnnot(CPDFSDK_Annot* pAnnot);
   CPDFSDK_Annot* GetPrevAnnot(CPDFSDK_Annot* pAnnot);
 
  private:
   void GenerateResults();
-  static CFX_FloatRect GetAnnotRect(const CPDFSDK_Annot* pAnnot);
+  static CPDF_Rect GetAnnotRect(const CPDFSDK_Annot* pAnnot);
 
   // Function signature compatible with std::sort().
   static bool CompareByLeftAscending(const CPDFSDK_Annot* p1,
                                      const CPDFSDK_Annot* p2);
   static bool CompareByTopDescending(const CPDFSDK_Annot* p1,
                                      const CPDFSDK_Annot* p2);
 
   TabOrder m_eTabOrder;
   CPDFSDK_PageView* m_pPageView;
   CFX_ByteString m_sType;
   CFX_ByteString m_sSubType;
   std::vector<CPDFSDK_Annot*> m_Annots;
 };
 
 #endif  // FPDFSDK_INCLUDE_FSDK_BASEFORM_H_