Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

core/include/fpdfdoc/fpdf_ap.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_AP_H_
 #define CORE_INCLUDE_FPDFDOC_FPDF_AP_H_
 
 #include "core/include/fpdfapi/fpdf_parser.h"
@@ skipping 63 matching lines @@
                                      CPDF_Dictionary* pAnnotDict);
 
   static FX_BOOL GenerateComboBoxAP(CPDF_Document* pDoc,
                                     CPDF_Dictionary* pAnnotDict);
 
   static FX_BOOL GenerateListBoxAP(CPDF_Document* pDoc,
                                    CPDF_Dictionary* pAnnotDict);
 
   static CFX_ByteString GenerateEditAP(IPVT_FontMap* pFontMap,
                                        IPDF_VariableText_Iterator* pIterator,
-                                       const CFX_FloatPoint& ptOffset,
+                                       const CPDF_Point& ptOffset,
                                        FX_BOOL bContinuous,
                                        FX_WORD SubWord = 0,
                                        const CPVT_WordRange* pVisible = NULL);
 
-  static CFX_ByteString GenerateBorderAP(const CFX_FloatRect& rect,
+  static CFX_ByteString GenerateBorderAP(const CPDF_Rect& rect,
                                          FX_FLOAT fWidth,
                                          const CPVT_Color& color,
                                          const CPVT_Color& crLeftTop,
                                          const CPVT_Color& crRightBottom,
                                          int32_t nStyle,
                                          const CPVT_Dash& dash);
 
   static CFX_ByteString GenerateColorAP(const CPVT_Color& color,
                                         const FX_BOOL& bFillOrStroke);
 };
 
 #endif  // CORE_INCLUDE_FPDFDOC_FPDF_AP_H_