Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/formfiller/FFL_IFormFiller.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/include/formfiller/FFL_IFormFiller.h"
 
 #include "fpdfsdk/include/formfiller/FFL_CheckBox.h"
 #include "fpdfsdk/include/formfiller/FFL_ComboBox.h"
@@ skipping 11 matching lines @@
     : m_pApp(pApp), m_bNotifying(FALSE) {}
 
 CFFL_IFormFiller::~CFFL_IFormFiller() {
   for (auto& it : m_Maps)
     delete it.second;
   m_Maps.clear();
 }
 
 FX_BOOL CFFL_IFormFiller::Annot_HitTest(CPDFSDK_PageView* pPageView,
                                         CPDFSDK_Annot* pAnnot,
-                                        CFX_FloatPoint point) {
-  CFX_FloatRect rc = pAnnot->GetRect();
+                                        CPDF_Point point) {
+  CPDF_Rect rc = pAnnot->GetRect();
   if (rc.Contains(point.x, point.y))
     return TRUE;
   return FALSE;
 }
 
 FX_RECT CFFL_IFormFiller::GetViewBBox(CPDFSDK_PageView* pPageView,
                                       CPDFSDK_Annot* pAnnot) {
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE))
     return pFormFiller->GetViewBBox(pPageView, pAnnot);
 
   ASSERT(pPageView);
 
   CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
-  CFX_FloatRect rcAnnot;
+  CPDF_Rect rcAnnot;
   pPDFAnnot->GetRect(rcAnnot);
 
-  CFX_FloatRect rcWin = CPWL_Utils::InflateRect(rcAnnot, 1);
+  CPDF_Rect rcWin = CPWL_Utils::InflateRect(rcAnnot, 1);
   return rcWin.GetOutterRect();
 }
 
 void CFFL_IFormFiller::OnDraw(CPDFSDK_PageView* pPageView,
                               CPDFSDK_Annot* pAnnot,
                               CFX_RenderDevice* pDevice,
                               CFX_Matrix* pUser2Device,
                               FX_DWORD dwFlags) {
   ASSERT(pPageView);
   CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
 
   if (IsVisible(pWidget)) {
     if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
       if (pFormFiller->IsValid()) {
         pFormFiller->OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
         pAnnot->GetPDFPage();
 
         CPDFSDK_Document* pDocument = m_pApp->GetSDKDocument();
         if (pDocument->GetFocusAnnot() == pAnnot) {
-          CFX_FloatRect rcFocus = pFormFiller->GetFocusBox(pPageView);
+          CPDF_Rect rcFocus = pFormFiller->GetFocusBox(pPageView);
           if (!rcFocus.IsEmpty()) {
             CFX_PathData path;
             path.SetPointCount(5);
             path.SetPoint(0, rcFocus.left, rcFocus.top, FXPT_MOVETO);
             path.SetPoint(1, rcFocus.left, rcFocus.bottom, FXPT_LINETO);
             path.SetPoint(2, rcFocus.right, rcFocus.bottom, FXPT_LINETO);
             path.SetPoint(3, rcFocus.right, rcFocus.top, FXPT_LINETO);
             path.SetPoint(4, rcFocus.left, rcFocus.top, FXPT_LINETO);
 
             CFX_GraphStateData gsd;
@@ skipping 108 matching lines @@
   }
 
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
     pFormFiller->OnMouseExit(pPageView, pAnnot);
   }
 }
 
 FX_BOOL CFFL_IFormFiller::OnLButtonDown(CPDFSDK_PageView* pPageView,
                                         CPDFSDK_Annot* pAnnot,
                                         FX_UINT nFlags,
-                                        const CFX_FloatPoint& point) {
+                                        const CPDF_Point& point) {
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   if (!m_bNotifying) {
     CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
     if (Annot_HitTest(pPageView, pAnnot, point) &&
         pWidget->GetAAction(CPDF_AAction::ButtonDown)) {
       m_bNotifying = TRUE;
       pWidget->GetAppearanceAge();
       int nValueAge = pWidget->GetValueAge();
       pWidget->ClearAppModified();
@@ skipping 21 matching lines @@
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
     return pFormFiller->OnLButtonDown(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnLButtonUp(CPDFSDK_PageView* pPageView,
                                       CPDFSDK_Annot* pAnnot,
                                       FX_UINT nFlags,
-                                      const CFX_FloatPoint& point) {
+                                      const CPDF_Point& point) {
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
   CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
   CPDFSDK_Document* pDocument = m_pApp->GetSDKDocument();
 
   switch (pWidget->GetFieldType()) {
     case FIELDTYPE_PUSHBUTTON:
     case FIELDTYPE_CHECKBOX:
     case FIELDTYPE_RADIOBUTTON:
       if (GetViewBBox(pPageView, pAnnot).Contains((int)point.x, (int)point.y))
         pDocument->SetFocusAnnot(pAnnot);
@@ skipping 59 matching lines @@
 
         bReset = TRUE;
       }
     }
   }
 }
 
 FX_BOOL CFFL_IFormFiller::OnLButtonDblClk(CPDFSDK_PageView* pPageView,
                                           CPDFSDK_Annot* pAnnot,
                                           FX_UINT nFlags,
-                                          const CFX_FloatPoint& point) {
+                                          const CPDF_Point& point) {
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
     return pFormFiller->OnLButtonDblClk(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnMouseMove(CPDFSDK_PageView* pPageView,
                                       CPDFSDK_Annot* pAnnot,
                                       FX_UINT nFlags,
-                                      const CFX_FloatPoint& point) {
+                                      const CPDF_Point& point) {
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   // change cursor
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, TRUE)) {
     return pFormFiller->OnMouseMove(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnMouseWheel(CPDFSDK_PageView* pPageView,
                                        CPDFSDK_Annot* pAnnot,
                                        FX_UINT nFlags,
                                        short zDelta,
-                                       const CFX_FloatPoint& point) {
+                                       const CPDF_Point& point) {
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
     return pFormFiller->OnMouseWheel(pPageView, pAnnot, nFlags, zDelta, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnRButtonDown(CPDFSDK_PageView* pPageView,
                                         CPDFSDK_Annot* pAnnot,
                                         FX_UINT nFlags,
-                                        const CFX_FloatPoint& point) {
+                                        const CPDF_Point& point) {
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
     return pFormFiller->OnRButtonDown(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnRButtonUp(CPDFSDK_PageView* pPageView,
                                       CPDFSDK_Annot* pAnnot,
                                       FX_UINT nFlags,
-                                      const CFX_FloatPoint& point) {
+                                      const CPDF_Point& point) {
   ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
   if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
     return pFormFiller->OnRButtonUp(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnKeyDown(CPDFSDK_Annot* pAnnot,
@@ skipping 177 matching lines @@
   m_Maps.erase(it);
 }
 
 void CFFL_IFormFiller::QueryWherePopup(void* pPrivateData,
                                        FX_FLOAT fPopupMin,
                                        FX_FLOAT fPopupMax,
                                        int32_t& nRet,
                                        FX_FLOAT& fPopupRet) {
   CFFL_PrivateData* pData = (CFFL_PrivateData*)pPrivateData;
 
-  CFX_FloatRect rcPageView(0, 0, 0, 0);
+  CPDF_Rect rcPageView(0, 0, 0, 0);
   rcPageView.right = pData->pWidget->GetPDFPage()->GetPageWidth();
   rcPageView.bottom = pData->pWidget->GetPDFPage()->GetPageHeight();
   rcPageView.Normalize();
 
-  CFX_FloatRect rcAnnot = pData->pWidget->GetRect();
+  CPDF_Rect rcAnnot = pData->pWidget->GetRect();
 
   FX_FLOAT fTop = 0.0f;
   FX_FLOAT fBottom = 0.0f;
 
   CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pData->pWidget;
   switch (pWidget->GetRotate() / 90) {
     default:
     case 0:
       fTop = rcPageView.top - rcAnnot.top;
       fBottom = rcAnnot.bottom - rcPageView.bottom;
@@ skipping 416 matching lines @@
           bExit = TRUE;
           m_bNotifying = FALSE;
           return;
         }
       }
 
       m_bNotifying = FALSE;
     }
   }
 }