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 .

1 files changed, 3 insertions, 3 deletions

diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/src/fpdfdoc/doc_annot.cpp
index 4b0b2b54bc..dcd21be66e 100644
--- a/core/src/fpdfdoc/doc_annot.cpp
+++ b/core/src/fpdfdoc/doc_annot.cpp
@@ -77,7 +77,7 @@ void CPDF_AnnotList::DisplayPass(CPDF_Page* pPage,
         continue;
       }
     }
-    CPDF_Rect annot_rect_f;
+    CFX_FloatRect annot_rect_f;
     pAnnot->GetRect(annot_rect_f);
     CFX_Matrix matrix = *pMatrix;
     if (clip_rect) {
@@ -132,7 +132,7 @@ CFX_ByteString CPDF_Annot::GetSubType() const {
   return m_sSubtype;
 }
 
-void CPDF_Annot::GetRect(CPDF_Rect& rect) const {
+void CPDF_Annot::GetRect(CFX_FloatRect& rect) const {
   if (!m_pAnnotDict) {
     return;
   }
@@ -210,7 +210,7 @@ static CPDF_Form* FPDFDOC_Annot_GetMatrix(const CPDF_Page* pPage,
   CFX_FloatRect form_bbox = pForm->m_pFormDict->GetRectBy("BBox");
   CFX_Matrix form_matrix = pForm->m_pFormDict->GetMatrixBy("Matrix");
   form_matrix.TransformRect(form_bbox);
-  CPDF_Rect arect;
+  CFX_FloatRect arect;
   pAnnot->GetRect(arect);
   matrix.MatchRect(arect, form_bbox);
   matrix.Concat(*pUser2Device);