Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/pdfwindow/PWL_EditCtrl.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/pdfwindow/PWL_EditCtrl.h"
 
 #include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
 #include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
@@ skipping 29 matching lines @@
 void CPWL_EditCtrl::OnCreated() {
   SetFontSize(GetCreationParam().fFontSize);
 
   m_pEdit->SetFontMap(GetFontMap());
   m_pEdit->SetNotify(this);
   m_pEdit->Initialize();
 }
 
 FX_BOOL CPWL_EditCtrl::IsWndHorV() {
   CFX_Matrix mt = GetWindowMatrix();
-  CFX_FloatPoint point1(0, 1);
-  CFX_FloatPoint point2(1, 1);
+  CPDF_Point point1(0, 1);
+  CPDF_Point point2(1, 1);
 
   mt.Transform(point1.x, point1.y);
   mt.Transform(point2.x, point2.y);
 
   return point2.y == point1.y;
 }
 
 void CPWL_EditCtrl::SetCursor() {
   if (IsValid()) {
     if (IFX_SystemHandler* pSH = GetSystemHandler()) {
@@ skipping 31 matching lines @@
           if (CPWL_Wnd* pChild = GetVScrollBar()) {
             pChild->OnNotify(pWnd, PNM_SETSCROLLPOS, wParam, lParam);
           }
           break;
       }
       break;
     case PNM_SCROLLWINDOW: {
       FX_FLOAT fPos = *(FX_FLOAT*)lParam;
       switch (wParam) {
         case SBT_VSCROLL:
-          m_pEdit->SetScrollPos(
-              CFX_FloatPoint(m_pEdit->GetScrollPos().x, fPos));
+          m_pEdit->SetScrollPos(CPDF_Point(m_pEdit->GetScrollPos().x, fPos));
           break;
       }
     } break;
     case PNM_SETCARETINFO: {
       if (PWL_CARET_INFO* pCaretInfo = (PWL_CARET_INFO*)wParam) {
         SetCaret(pCaretInfo->bVisible, pCaretInfo->ptHead, pCaretInfo->ptFoot);
       }
     } break;
   }
 }
 
 void CPWL_EditCtrl::CreateChildWnd(const PWL_CREATEPARAM& cp) {
   if (!IsReadOnly())
     CreateEditCaret(cp);
 }
 
 void CPWL_EditCtrl::CreateEditCaret(const PWL_CREATEPARAM& cp) {
   if (!m_pEditCaret) {
     m_pEditCaret = new CPWL_Caret;
     m_pEditCaret->SetInvalidRect(GetClientRect());
 
     PWL_CREATEPARAM ecp = cp;
     ecp.pParentWnd = this;
     ecp.dwFlags = PWS_CHILD | PWS_NOREFRESHCLIP;
     ecp.dwBorderWidth = 0;
     ecp.nBorderStyle = PBS_SOLID;
-    ecp.rcRectWnd = CFX_FloatRect(0, 0, 0, 0);
+    ecp.rcRectWnd = CPDF_Rect(0, 0, 0, 0);
 
     m_pEditCaret->Create(ecp);
   }
 }
 
 void CPWL_EditCtrl::SetFontSize(FX_FLOAT fFontSize) {
   m_pEdit->SetFontSize(fFontSize);
 }
 
 FX_FLOAT CPWL_EditCtrl::GetFontSize() const {
@@ skipping 142 matching lines @@
     default:
       if (IsINSERTpressed(nFlag))
         Delete();
       InsertWord(word, GetCharSet());
       break;
   }
 
   return TRUE;
 }
 
-FX_BOOL CPWL_EditCtrl::OnLButtonDown(const CFX_FloatPoint& point,
-                                     FX_DWORD nFlag) {
+FX_BOOL CPWL_EditCtrl::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) {
   CPWL_Wnd::OnLButtonDown(point, nFlag);
 
   if (ClientHitTest(point)) {
     if (m_bMouseDown)
       InvalidateRect();
 
     m_bMouseDown = TRUE;
     SetCapture();
 
     m_pEdit->OnMouseDown(point, IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
   }
 
   return TRUE;
 }
 
-FX_BOOL CPWL_EditCtrl::OnLButtonUp(const CFX_FloatPoint& point,
-                                   FX_DWORD nFlag) {
+FX_BOOL CPWL_EditCtrl::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) {
   CPWL_Wnd::OnLButtonUp(point, nFlag);
 
   if (m_bMouseDown) {
     // can receive keybord message
     if (ClientHitTest(point) && !IsFocused())
       SetFocus();
 
     ReleaseCapture();
     m_bMouseDown = FALSE;
   }
 
   return TRUE;
 }
 
-FX_BOOL CPWL_EditCtrl::OnMouseMove(const CFX_FloatPoint& point,
-                                   FX_DWORD nFlag) {
+FX_BOOL CPWL_EditCtrl::OnMouseMove(const CPDF_Point& point, FX_DWORD nFlag) {
   CPWL_Wnd::OnMouseMove(point, nFlag);
 
   if (m_bMouseDown)
     m_pEdit->OnMouseMove(point, FALSE, FALSE);
 
   return TRUE;
 }
 
-CFX_FloatRect CPWL_EditCtrl::GetContentRect() const {
+CPDF_Rect CPWL_EditCtrl::GetContentRect() const {
   return m_pEdit->GetContentRect();
 }
 
 void CPWL_EditCtrl::SetEditCaret(FX_BOOL bVisible) {
-  CFX_FloatPoint ptHead(0, 0), ptFoot(0, 0);
+  CPDF_Point ptHead(0, 0), ptFoot(0, 0);
 
   if (bVisible) {
     GetCaretInfo(ptHead, ptFoot);
   }
 
   CPVT_WordPlace wpTemp = m_pEdit->GetCaretWordPlace();
   IOnSetCaret(bVisible, ptHead, ptFoot, wpTemp);
 }
 
-void CPWL_EditCtrl::GetCaretInfo(CFX_FloatPoint& ptHead,
-                                 CFX_FloatPoint& ptFoot) const {
+void CPWL_EditCtrl::GetCaretInfo(CPDF_Point& ptHead, CPDF_Point& ptFoot) const {
   if (IFX_Edit_Iterator* pIterator = m_pEdit->GetIterator()) {
     pIterator->SetAt(m_pEdit->GetCaret());
     CPVT_Word word;
     CPVT_Line line;
     if (pIterator->GetWord(word)) {
       ptHead.x = word.ptWord.x + word.fWidth;
       ptHead.y = word.ptWord.y + word.fAscent;
       ptFoot.x = word.ptWord.x + word.fWidth;
       ptFoot.y = word.ptWord.y + word.fDescent;
     } else if (pIterator->GetLine(line)) {
       ptHead.x = line.ptLine.x;
       ptHead.y = line.ptLine.y + line.fLineAscent;
       ptFoot.x = line.ptLine.x;
       ptFoot.y = line.ptLine.y + line.fLineDescent;
     }
   }
 }
 
 void CPWL_EditCtrl::GetCaretPos(int32_t& x, int32_t& y) const {
-  CFX_FloatPoint ptHead(0, 0), ptFoot(0, 0);
+  CPDF_Point ptHead(0, 0), ptFoot(0, 0);
 
   GetCaretInfo(ptHead, ptFoot);
 
   PWLtoWnd(ptHead, x, y);
 }
 
 void CPWL_EditCtrl::SetCaret(FX_BOOL bVisible,
-                             const CFX_FloatPoint& ptHead,
-                             const CFX_FloatPoint& ptFoot) {
+                             const CPDF_Point& ptHead,
+                             const CPDF_Point& ptFoot) {
   if (m_pEditCaret) {
     if (!IsFocused() || m_pEdit->IsSelected())
       bVisible = FALSE;
 
     m_pEditCaret->SetCaret(bVisible, ptHead, ptFoot);
   }
 }
 
 CFX_WideString CPWL_EditCtrl::GetText() const {
   return m_pEdit->GetText();
@@ skipping 38 matching lines @@
     m_pEdit->SetCaret(nPos);
 }
 
 int32_t CPWL_EditCtrl::GetTotalWords() const {
   if (m_pEdit)
     return m_pEdit->GetTotalWords();
 
   return 0;
 }
 
-void CPWL_EditCtrl::SetScrollPos(const CFX_FloatPoint& point) {
+void CPWL_EditCtrl::SetScrollPos(const CPDF_Point& point) {
   if (m_pEdit)
     m_pEdit->SetScrollPos(point);
 }
 
-CFX_FloatPoint CPWL_EditCtrl::GetScrollPos() const {
+CPDF_Point CPWL_EditCtrl::GetScrollPos() const {
   if (m_pEdit)
     return m_pEdit->GetScrollPos();
 
-  return CFX_FloatPoint(0.0f, 0.0f);
+  return CPDF_Point(0.0f, 0.0f);
 }
 
 CPDF_Font* CPWL_EditCtrl::GetCaretFont() const {
   int32_t nFontIndex = 0;
 
   if (IFX_Edit_Iterator* pIterator = m_pEdit->GetIterator()) {
     pIterator->SetAt(m_pEdit->GetCaret());
     CPVT_Word word;
     CPVT_Section section;
     if (pIterator->GetWord(word)) {
@@ skipping 107 matching lines @@
   } else {
     ShowVScrollBar(TRUE);
   }
 }
 
 void CPWL_EditCtrl::IOnSetScrollPosY(FX_FLOAT fy) {
   OnNotify(this, PNM_SETSCROLLPOS, SBT_VSCROLL, (intptr_t)&fy);
 }
 
 void CPWL_EditCtrl::IOnSetCaret(FX_BOOL bVisible,
-                                const CFX_FloatPoint& ptHead,
-                                const CFX_FloatPoint& ptFoot,
+                                const CPDF_Point& ptHead,
+                                const CPDF_Point& ptFoot,
                                 const CPVT_WordPlace& place) {
   PWL_CARET_INFO cInfo;
   cInfo.bVisible = bVisible;
   cInfo.ptHead = ptHead;
   cInfo.ptFoot = ptFoot;
 
   OnNotify(this, PNM_SETCARETINFO, (intptr_t)&cInfo, (intptr_t)NULL);
 }
 
 void CPWL_EditCtrl::IOnCaretChange(const CPVT_SecProps& secProps,
                                    const CPVT_WordProps& wordProps) {}
 
-void CPWL_EditCtrl::IOnContentChange(const CFX_FloatRect& rcContent) {
+void CPWL_EditCtrl::IOnContentChange(const CPDF_Rect& rcContent) {
   if (IsValid()) {
     if (m_pEditNotify) {
       m_pEditNotify->OnContentChange(rcContent);
     }
   }
 }
 
-void CPWL_EditCtrl::IOnInvalidateRect(CFX_FloatRect* pRect) {
+void CPWL_EditCtrl::IOnInvalidateRect(CPDF_Rect* pRect) {
   InvalidateRect(pRect);
 }
 
 int32_t CPWL_EditCtrl::GetCharSet() const {
   return m_nCharSet < 0 ? DEFAULT_CHARSET : m_nCharSet;
 }
 
-void CPWL_EditCtrl::GetTextRange(const CFX_FloatRect& rect,
+void CPWL_EditCtrl::GetTextRange(const CPDF_Rect& rect,
                                  int32_t& nStartChar,
                                  int32_t& nEndChar) const {
   nStartChar = m_pEdit->WordPlaceToWordIndex(
-      m_pEdit->SearchWordPlace(CFX_FloatPoint(rect.left, rect.top)));
+      m_pEdit->SearchWordPlace(CPDF_Point(rect.left, rect.top)));
   nEndChar = m_pEdit->WordPlaceToWordIndex(
-      m_pEdit->SearchWordPlace(CFX_FloatPoint(rect.right, rect.bottom)));
+      m_pEdit->SearchWordPlace(CPDF_Point(rect.right, rect.bottom)));
 }
 
 CFX_WideString CPWL_EditCtrl::GetText(int32_t& nStartChar,
                                       int32_t& nEndChar) const {
   CPVT_WordPlace wpStart = m_pEdit->WordIndexToWordPlace(nStartChar);
   CPVT_WordPlace wpEnd = m_pEdit->WordIndexToWordPlace(nEndChar);
   return m_pEdit->GetRangeText(CPVT_WordRange(wpStart, wpEnd));
 }
 
 void CPWL_EditCtrl::SetReadyToInput() {
   if (m_bMouseDown) {
     ReleaseCapture();
     m_bMouseDown = FALSE;
   }
 }