Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/fsdk_mgr.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 <algorithm>
 #include <memory>
 
 #include "fpdfsdk/include/fsdk_mgr.h"
@@ skipping 40 matching lines @@
 
 class CFX_SystemHandler : public IFX_SystemHandler {
  public:
   explicit CFX_SystemHandler(CPDFDoc_Environment* pEnv)
       : m_pEnv(pEnv), m_nCharSet(-1) {}
   ~CFX_SystemHandler() override {}
 
  public:
   // IFX_SystemHandler
   void InvalidateRect(FX_HWND hWnd, FX_RECT rect) override;
-  void OutputSelectedRect(void* pFormFiller, CFX_FloatRect& rect) override;
+  void OutputSelectedRect(void* pFormFiller, CPDF_Rect& rect) override;
   FX_BOOL IsSelectionImplemented() override;
   CFX_WideString GetClipboardText(FX_HWND hWnd) override { return L""; }
   FX_BOOL SetClipboardText(FX_HWND hWnd, CFX_WideString string) override {
     return FALSE;
   }
   void ClientToScreen(FX_HWND hWnd, int32_t& x, int32_t& y) override {}
   void ScreenToClient(FX_HWND hWnd, int32_t& x, int32_t& y) override {}
   void SetCursor(int32_t nCursorType) override;
   FX_HMENU CreatePopupMenu() override { return NULL; }
   FX_BOOL AppendMenuItem(FX_HMENU hMenu,
@@ skipping 53 matching lines @@
   if (!pPage || !pPageView)
     return;
   CFX_Matrix page2device;
   pPageView->GetCurrentMatrix(page2device);
   CFX_Matrix device2page;
   device2page.SetReverse(page2device);
   FX_FLOAT left, top, right, bottom;
   device2page.Transform((FX_FLOAT)rect.left, (FX_FLOAT)rect.top, left, top);
   device2page.Transform((FX_FLOAT)rect.right, (FX_FLOAT)rect.bottom, right,
                         bottom);
-  CFX_FloatRect rcPDF(left, bottom, right, top);
+  CPDF_Rect rcPDF(left, bottom, right, top);
   rcPDF.Normalize();
 
   m_pEnv->FFI_Invalidate(pPage, rcPDF.left, rcPDF.top, rcPDF.right,
                          rcPDF.bottom);
 }
-void CFX_SystemHandler::OutputSelectedRect(void* pFormFiller,
-                                           CFX_FloatRect& rect) {
+void CFX_SystemHandler::OutputSelectedRect(void* pFormFiller, CPDF_Rect& rect) {
   CFFL_FormFiller* pFFL = (CFFL_FormFiller*)pFormFiller;
   if (pFFL) {
-    CFX_FloatPoint leftbottom = CFX_FloatPoint(rect.left, rect.bottom);
-    CFX_FloatPoint righttop = CFX_FloatPoint(rect.right, rect.top);
-    CFX_FloatPoint ptA = pFFL->PWLtoFFL(leftbottom);
-    CFX_FloatPoint ptB = pFFL->PWLtoFFL(righttop);
+    CPDF_Point leftbottom = CPDF_Point(rect.left, rect.bottom);
+    CPDF_Point righttop = CPDF_Point(rect.right, rect.top);
+    CPDF_Point ptA = pFFL->PWLtoFFL(leftbottom);
+    CPDF_Point ptB = pFFL->PWLtoFFL(righttop);
     CPDFSDK_Annot* pAnnot = pFFL->GetSDKAnnot();
     UnderlyingPageType* pPage = pAnnot->GetUnderlyingPage();
     ASSERT(pPage);
     m_pEnv->FFI_OutputSelectedRect(pPage, ptA.x, ptB.y, ptB.x, ptA.y);
   }
 }
 
 FX_BOOL CFX_SystemHandler::IsSelectionImplemented() {
   if (m_pEnv) {
     FPDF_FORMFILLINFO* pInfo = m_pEnv->GetFormFillInfo();
@@ skipping 593 matching lines @@
   }
   return nullptr;
 }
 
 CPDFSDK_Annot* CPDFSDK_PageView::GetFXAnnotAtPoint(FX_FLOAT pageX,
                                                    FX_FLOAT pageY) {
   CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
   CPDFSDK_AnnotHandlerMgr* pAnnotMgr = pEnv->GetAnnotHandlerMgr();
   CPDFSDK_AnnotIterator annotIterator(this, false);
   while (CPDFSDK_Annot* pSDKAnnot = annotIterator.Next()) {
-    CFX_FloatRect rc = pAnnotMgr->Annot_OnGetViewBBox(this, pSDKAnnot);
+    CPDF_Rect rc = pAnnotMgr->Annot_OnGetViewBBox(this, pSDKAnnot);
     if (rc.Contains(pageX, pageY))
       return pSDKAnnot;
   }
 
   return nullptr;
 }
 
 CPDFSDK_Annot* CPDFSDK_PageView::GetFXWidgetAtPoint(FX_FLOAT pageX,
                                                     FX_FLOAT pageY) {
   CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
   CPDFSDK_AnnotHandlerMgr* pAnnotMgr = pEnv->GetAnnotHandlerMgr();
   CPDFSDK_AnnotIterator annotIterator(this, false);
   while (CPDFSDK_Annot* pSDKAnnot = annotIterator.Next()) {
     bool bHitTest = pSDKAnnot->GetType() == "Widget";
 #ifdef PDF_ENABLE_XFA
     bHitTest = bHitTest || pSDKAnnot->GetType() == FSDK_XFAWIDGET_TYPENAME;
 #endif  // PDF_ENABLE_XFA
     if (bHitTest) {
       pAnnotMgr->Annot_OnGetViewBBox(this, pSDKAnnot);
-      CFX_FloatPoint point(pageX, pageY);
+      CPDF_Point point(pageX, pageY);
       if (pAnnotMgr->Annot_OnHitTest(this, pSDKAnnot, point))
         return pSDKAnnot;
     }
   }
 
   return nullptr;
 }
 
 void CPDFSDK_PageView::KillFocusAnnotIfNeeded() {
   // if there is a focused annot on the page, we should kill the focus first.
@@ skipping 115 matching lines @@
     return nullptr;
 
   for (CPDFSDK_Annot* pAnnot : m_fxAnnotArray) {
     if (pAnnot->GetXFAWidget() == hWidget)
       return pAnnot;
   }
   return nullptr;
 }
 #endif  // PDF_ENABLE_XFA
 
-FX_BOOL CPDFSDK_PageView::OnLButtonDown(const CFX_FloatPoint& point,
+FX_BOOL CPDFSDK_PageView::OnLButtonDown(const CPDF_Point& point,
                                         FX_UINT nFlag) {
   CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
   ASSERT(pEnv);
   CPDFSDK_Annot* pFXAnnot = GetFXWidgetAtPoint(point.x, point.y);
   if (!pFXAnnot) {
     KillFocusAnnot(nFlag);
     return FALSE;
   }
 
   CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr();
   FX_BOOL bRet =
       pAnnotHandlerMgr->Annot_OnLButtonDown(this, pFXAnnot, nFlag, point);
   if (bRet)
     SetFocusAnnot(pFXAnnot);
   return bRet;
 }
 
 #ifdef PDF_ENABLE_XFA
-FX_BOOL CPDFSDK_PageView::OnRButtonDown(const CFX_FloatPoint& point,
+FX_BOOL CPDFSDK_PageView::OnRButtonDown(const CPDF_Point& point,
                                         FX_UINT nFlag) {
   CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
   ASSERT(pEnv);
   CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr();
   ASSERT(pAnnotHandlerMgr);
 
   CPDFSDK_Annot* pFXAnnot = GetFXWidgetAtPoint(point.x, point.y);
 
   if (pFXAnnot == NULL)
     return FALSE;
 
   FX_BOOL bRet =
       pAnnotHandlerMgr->Annot_OnRButtonDown(this, pFXAnnot, nFlag, point);
   if (bRet) {
     SetFocusAnnot(pFXAnnot);
   }
   return TRUE;
 }
 
-FX_BOOL CPDFSDK_PageView::OnRButtonUp(const CFX_FloatPoint& point,
-                                      FX_UINT nFlag) {
+FX_BOOL CPDFSDK_PageView::OnRButtonUp(const CPDF_Point& point, FX_UINT nFlag) {
   CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
   ASSERT(pEnv);
   CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr();
 
   CPDFSDK_Annot* pFXAnnot = GetFXWidgetAtPoint(point.x, point.y);
 
   if (pFXAnnot == NULL)
     return FALSE;
 
   FX_BOOL bRet =
       pAnnotHandlerMgr->Annot_OnRButtonUp(this, pFXAnnot, nFlag, point);
   if (bRet) {
     SetFocusAnnot(pFXAnnot);
   }
   return TRUE;
 }
 #endif  // PDF_ENABLE_XFA
 
-FX_BOOL CPDFSDK_PageView::OnLButtonUp(const CFX_FloatPoint& point,
-                                      FX_UINT nFlag) {
+FX_BOOL CPDFSDK_PageView::OnLButtonUp(const CPDF_Point& point, FX_UINT nFlag) {
   CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
   ASSERT(pEnv);
   CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr();
   CPDFSDK_Annot* pFXAnnot = GetFXWidgetAtPoint(point.x, point.y);
   CPDFSDK_Annot* pFocusAnnot = GetFocusAnnot();
   FX_BOOL bRet = FALSE;
   if (pFocusAnnot && pFocusAnnot != pFXAnnot) {
     // Last focus Annot gets a chance to handle the event.
     bRet = pAnnotHandlerMgr->Annot_OnLButtonUp(this, pFocusAnnot, nFlag, point);
   }
   if (pFXAnnot && !bRet)
     bRet = pAnnotHandlerMgr->Annot_OnLButtonUp(this, pFXAnnot, nFlag, point);
   return bRet;
 }
 
-FX_BOOL CPDFSDK_PageView::OnMouseMove(const CFX_FloatPoint& point, int nFlag) {
+FX_BOOL CPDFSDK_PageView::OnMouseMove(const CPDF_Point& point, int nFlag) {
   CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
   CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr();
   if (CPDFSDK_Annot* pFXAnnot = GetFXWidgetAtPoint(point.x, point.y)) {
     if (m_CaptureWidget && m_CaptureWidget != pFXAnnot) {
       m_bExitWidget = TRUE;
       m_bEnterWidget = FALSE;
       pAnnotHandlerMgr->Annot_OnMouseExit(this, m_CaptureWidget, nFlag);
     }
     m_CaptureWidget = (CPDFSDK_Widget*)pFXAnnot;
     m_bOnWidget = TRUE;
@@ skipping 12 matching lines @@
     if (m_CaptureWidget) {
       pAnnotHandlerMgr->Annot_OnMouseExit(this, m_CaptureWidget, nFlag);
       m_CaptureWidget = NULL;
     }
   }
   return FALSE;
 }
 
 FX_BOOL CPDFSDK_PageView::OnMouseWheel(double deltaX,
                                        double deltaY,
-                                       const CFX_FloatPoint& point,
+                                       const CPDF_Point& point,
                                        int nFlag) {
   if (CPDFSDK_Annot* pAnnot = GetFXWidgetAtPoint(point.x, point.y)) {
     CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
     CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr();
     return pAnnotHandlerMgr->Annot_OnMouseWheel(this, pAnnot, nFlag,
                                                 (int)deltaY, point);
   }
   return FALSE;
 }
 
@@ skipping 104 matching lines @@
   m_CaptureWidget = nullptr;
   for (CPDFSDK_Annot* pAnnot : m_fxAnnotArray)
     m_pSDKDoc->GetEnv()->GetAnnotHandlerMgr()->ReleaseAnnot(pAnnot);
   m_fxAnnotArray.clear();
   m_pAnnotList.reset();
   SetLock(FALSE);
 }
 
 void CPDFSDK_PageView::UpdateRects(CFX_RectArray& rects) {
   for (int i = 0; i < rects.GetSize(); i++) {
-    CFX_FloatRect rc = rects.GetAt(i);
+    CPDF_Rect rc = rects.GetAt(i);
     CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
     pEnv->FFI_Invalidate(m_page, rc.left, rc.top, rc.right, rc.bottom);
   }
 }
 
 void CPDFSDK_PageView::UpdateView(CPDFSDK_Annot* pAnnot) {
-  CFX_FloatRect rcWindow = pAnnot->GetRect();
+  CPDF_Rect rcWindow = pAnnot->GetRect();
   CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
   pEnv->FFI_Invalidate(m_page, rcWindow.left, rcWindow.top, rcWindow.right,
                        rcWindow.bottom);
 }
 
 int CPDFSDK_PageView::GetPageIndex() {
   if (m_page) {
 #ifdef PDF_ENABLE_XFA
     CPDF_Dictionary* pDic = m_page->GetPDFPage()->m_pFormDict;
 #else   // PDF_ENABLE_XFA
@@ skipping 19 matching lines @@
   CPDFSDK_Annot* pFocusAnnot = m_pSDKDoc->GetFocusAnnot();
   if (!pFocusAnnot)
     return nullptr;
 
   for (CPDFSDK_Annot* pAnnot : m_fxAnnotArray) {
     if (pAnnot == pFocusAnnot)
       return pAnnot;
   }
   return nullptr;
 }