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

fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp

Index: fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
index 2baef4c21b606de81ac28e5c2c2f42802305f37b..f9bf1705546281d54288bce44407398469883306 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
@@ -192,7 +192,7 @@ CPDFSDK_Document* CPDFXFA_Document::GetSDKDocument(
 }
 
 void CPDFXFA_Document::FXRect2PDFRect(const CFX_RectF& fxRectF,
-                                      CPDF_Rect& pdfRect) {
+                                      CFX_FloatRect& pdfRect) {
   pdfRect.left = fxRectF.left;
   pdfRect.top = fxRectF.bottom();
   pdfRect.right = fxRectF.right();
@@ -220,7 +220,7 @@ void CPDFXFA_Document::InvalidateRect(IXFA_PageView* pPageView,
   if (m_iDocType != DOCTYPE_DYNAMIC_XFA)
     return;
 
-  CPDF_Rect rcPage;
+  CFX_FloatRect rcPage;
   FXRect2PDFRect(rt, rcPage);
 
   CPDFXFA_Page* pPage = GetPage(pPageView);
@@ -285,7 +285,7 @@ void CPDFXFA_Document::DisplayCaret(IXFA_Widget* hWidget,
   if (pPage == NULL)
     return;
 
-  CPDF_Rect rcCaret;
+  CFX_FloatRect rcCaret;
   FXRect2PDFRect(*pRtAnchor, rcCaret);
 
   CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
@@ -327,7 +327,7 @@ FX_BOOL CPDFXFA_Document::GetPopupPos(IXFA_Widget* hWidget,
   FS_RECTF pageViewRect;
   pEnv->FFI_GetPageViewRect(pPage, pageViewRect);
 
-  CPDF_Rect rcAnchor;
+  CFX_FloatRect rcAnchor;
 
   rcAnchor.left = rtAnchor.left;
   rcAnchor.top = rtAnchor.bottom();