Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/javascript/Field.cpp

 // 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
 
 #include "fpdfsdk/src/javascript/Field.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 2077 matching lines @@
     rcArray.GetElement(1, Upper_Lefty);
     rcArray.GetElement(2, Lower_Rightx);
     rcArray.GetElement(3, Lower_Righty);
 
     FX_FLOAT pArray[4] = {0.0f, 0.0f, 0.0f, 0.0f};
     pArray[0] = (FX_FLOAT)Upper_Leftx.ToInt();
     pArray[1] = (FX_FLOAT)Lower_Righty.ToInt();
     pArray[2] = (FX_FLOAT)Lower_Rightx.ToInt();
     pArray[3] = (FX_FLOAT)Upper_Lefty.ToInt();
 
-    CFX_FloatRect crRect(pArray);
+    CPDF_Rect crRect(pArray);
     if (m_bDelay) {
       AddDelay_Rect(FP_RECT, crRect);
     } else {
       Field::SetRect(m_pDocument, m_FieldName, m_nFormControlIndex, crRect);
     }
   } else {
     std::vector<CPDF_FormField*> FieldArray = GetFormFields(m_FieldName);
     if (FieldArray.empty())
       return FALSE;
 
@@ skipping 17 matching lines @@
     rcArray.SetElement(2, Lower_Rightx);
     rcArray.SetElement(3, Lower_Righty);
     vp << rcArray;
   }
   return TRUE;
 }
 
 void Field::SetRect(CPDFSDK_Document* pDocument,
                     const CFX_WideString& swFieldName,
                     int nControlIndex,
-                    const CFX_FloatRect& rect) {
+                    const CPDF_Rect& rect) {
   CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pDocument->GetInterForm();
 
   std::vector<CPDF_FormField*> FieldArray =
       GetFormFields(pDocument, swFieldName);
   for (CPDF_FormField* pFormField : FieldArray) {
     if (nControlIndex < 0) {
       FX_BOOL bSet = FALSE;
       for (int i = 0, sz = pFormField->CountControls(); i < sz; ++i) {
         CPDF_FormControl* pFormControl = pFormField->GetControl(i);
         ASSERT(pFormControl);
 
         if (CPDFSDK_Widget* pWidget = pInterForm->GetWidget(pFormControl)) {
-          CFX_FloatRect crRect = rect;
+          CPDF_Rect crRect = rect;
 
           CPDF_Page* pPDFPage = pWidget->GetPDFPage();
           crRect.Intersect(pPDFPage->GetPageBBox());
 
           if (!crRect.IsEmpty()) {
-            CFX_FloatRect rcOld = pWidget->GetRect();
+            CPDF_Rect rcOld = pWidget->GetRect();
             if (crRect.left != rcOld.left || crRect.right != rcOld.right ||
                 crRect.top != rcOld.top || crRect.bottom != rcOld.bottom) {
               pWidget->SetRect(crRect);
               bSet = TRUE;
             }
           }
         }
       }
 
       if (bSet)
         UpdateFormField(pDocument, pFormField, TRUE, TRUE, TRUE);
     } else {
       if (nControlIndex >= pFormField->CountControls())
         return;
       if (CPDF_FormControl* pFormControl =
               pFormField->GetControl(nControlIndex)) {
         if (CPDFSDK_Widget* pWidget = pInterForm->GetWidget(pFormControl)) {
-          CFX_FloatRect crRect = rect;
+          CPDF_Rect crRect = rect;
 
           CPDF_Page* pPDFPage = pWidget->GetPDFPage();
           crRect.Intersect(pPDFPage->GetPageBBox());
 
           if (!crRect.IsEmpty()) {
-            CFX_FloatRect rcOld = pWidget->GetRect();
+            CPDF_Rect rcOld = pWidget->GetRect();
             if (crRect.left != rcOld.left || crRect.right != rcOld.right ||
                 crRect.top != rcOld.top || crRect.bottom != rcOld.bottom) {
               pWidget->SetRect(crRect);
               UpdateFormControl(pDocument, pFormControl, TRUE, TRUE, TRUE);
             }
           }
         }
       }
     }
   }
@@ skipping 1205 matching lines @@
                                 const CFX_WideString& string) {
   CJS_DelayData* pNewData = new CJS_DelayData;
   pNewData->sFieldName = m_FieldName;
   pNewData->nControlIndex = m_nFormControlIndex;
   pNewData->eProp = prop;
   pNewData->widestring = string;
 
   m_pJSDoc->AddDelayData(pNewData);
 }
 
-void Field::AddDelay_Rect(enum FIELD_PROP prop, const CFX_FloatRect& rect) {
+void Field::AddDelay_Rect(enum FIELD_PROP prop, const CPDF_Rect& rect) {
   CJS_DelayData* pNewData = new CJS_DelayData;
   pNewData->sFieldName = m_FieldName;
   pNewData->nControlIndex = m_nFormControlIndex;
   pNewData->eProp = prop;
   pNewData->rect = rect;
 
   m_pJSDoc->AddDelayData(pNewData);
 }
 
 void Field::AddDelay_Color(enum FIELD_PROP prop, const CPWL_Color& color) {
@@ skipping 169 matching lines @@
       Field::SetValue(pDocument, pData->sFieldName, pData->nControlIndex,
                       pData->widestringarray);
       break;
   }
 }
 
 void Field::AddField(CPDFSDK_Document* pDocument,
                      int nPageIndex,
                      int nFieldType,
                      const CFX_WideString& sName,
-                     const CFX_FloatRect& rcCoords) {
+                     const CPDF_Rect& rcCoords) {
   // Not supported.
 }