Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/pdfwindow/PWL_Edit.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_Edit.h"
 
 #include "core/include/fxcrt/fx_safe_types.h"
 #include "core/include/fxcrt/fx_xml.h"
@@ skipping 55 matching lines @@
 
       delete pXML;
     }
   }
 
   m_pEdit->SetText(swText.c_str());
 }
 
 void CPWL_Edit::RePosChildWnd() {
   if (CPWL_ScrollBar* pVSB = GetVScrollBar()) {
-    CFX_FloatRect rcWindow = m_rcOldWindow;
-    CFX_FloatRect rcVScroll =
-        CFX_FloatRect(rcWindow.right, rcWindow.bottom,
-                      rcWindow.right + PWL_SCROLLBAR_WIDTH, rcWindow.top);
+    CPDF_Rect rcWindow = m_rcOldWindow;
+    CPDF_Rect rcVScroll =
+        CPDF_Rect(rcWindow.right, rcWindow.bottom,
+                  rcWindow.right + PWL_SCROLLBAR_WIDTH, rcWindow.top);
     pVSB->Move(rcVScroll, TRUE, FALSE);
   }
 
   if (m_pEditCaret && !HasFlag(PES_TEXTOVERFLOW))
     m_pEditCaret->SetClipRect(CPWL_Utils::InflateRect(
         GetClientRect(), 1.0f));  // +1 for caret beside border
 
   CPWL_EditCtrl::RePosChildWnd();
 }
 
-CFX_FloatRect CPWL_Edit::GetClientRect() const {
-  CFX_FloatRect rcClient = CPWL_Utils::DeflateRect(
+CPDF_Rect CPWL_Edit::GetClientRect() const {
+  CPDF_Rect rcClient = CPWL_Utils::DeflateRect(
       GetWindowRect(), (FX_FLOAT)(GetBorderWidth() + GetInnerBorderWidth()));
 
   if (CPWL_ScrollBar* pVSB = GetVScrollBar()) {
     if (pVSB->IsVisible()) {
       rcClient.right -= PWL_SCROLLBAR_WIDTH;
     }
   }
 
   return rcClient;
 }
@@ skipping 125 matching lines @@
     m_pEdit->SetPasswordChar('*', FALSE);
   }
 
   m_pEdit->SetMultiLine(HasFlag(PES_MULTILINE), FALSE);
   m_pEdit->SetAutoReturn(HasFlag(PES_AUTORETURN), FALSE);
   m_pEdit->SetAutoFontSize(HasFlag(PWS_AUTOFONTSIZE), FALSE);
   m_pEdit->SetAutoScroll(HasFlag(PES_AUTOSCROLL), FALSE);
   m_pEdit->EnableUndo(HasFlag(PES_UNDO));
 
   if (HasFlag(PES_TEXTOVERFLOW)) {
-    SetClipRect(CFX_FloatRect(0.0f, 0.0f, 0.0f, 0.0f));
+    SetClipRect(CPDF_Rect(0.0f, 0.0f, 0.0f, 0.0f));
     m_pEdit->SetTextOverflow(TRUE, FALSE);
   } else {
     if (m_pEditCaret) {
       m_pEditCaret->SetClipRect(CPWL_Utils::InflateRect(
           GetClientRect(), 1.0f));  // +1 for caret beside border
     }
   }
 
   if (HasFlag(PES_SPELLCHECK)) {
     m_pSpellCheck = GetCreationParam().pSpellCheck;
   }
 }
 
 void CPWL_Edit::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
   CPWL_Wnd::GetThisAppearanceStream(sAppStream);
 
-  CFX_FloatRect rcClient = GetClientRect();
+  CPDF_Rect rcClient = GetClientRect();
   CFX_ByteTextBuf sLine;
 
   int32_t nCharArray = m_pEdit->GetCharArray();
 
   if (nCharArray > 0) {
     switch (GetBorderStyle()) {
       case PBS_SOLID: {
         sLine << "q\n" << GetBorderWidth() << " w\n"
               << CPWL_Utils::GetColorAppStream(GetBorderColor(), FALSE)
               << " 2 J 0 j\n";
@@ skipping 27 matching lines @@
 
         sLine << "Q\n";
       } break;
     }
   }
 
   sAppStream << sLine;
 
   CFX_ByteTextBuf sText;
 
-  CFX_FloatPoint ptOffset = CFX_FloatPoint(0.0f, 0.0f);
+  CPDF_Point ptOffset = CPDF_Point(0.0f, 0.0f);
 
   CPVT_WordRange wrWhole = m_pEdit->GetWholeWordRange();
   CPVT_WordRange wrSelect = GetSelectWordRange();
   CPVT_WordRange wrVisible =
       (HasFlag(PES_TEXTOVERFLOW) ? wrWhole : m_pEdit->GetVisibleWordRange());
   CPVT_WordRange wrSelBefore(wrWhole.BeginPos, wrSelect.BeginPos);
   CPVT_WordRange wrSelAfter(wrSelect.EndPos, wrWhole.EndPos);
 
   CPVT_WordRange wrTemp =
       CPWL_Utils::OverlapWordRange(GetSelectWordRange(), wrVisible);
@@ skipping 35 matching lines @@
   if (HasFlag(PES_SPELLCHECK)) {
     CFX_ByteString sSpellCheck = CPWL_Utils::GetSpellCheckAppStream(
         m_pEdit, m_pSpellCheck, ptOffset, &wrVisible);
     if (sSpellCheck.GetLength() > 0)
       sText << CPWL_Utils::GetColorAppStream(CPWL_Color(COLORTYPE_RGB, 1, 0, 0),
                                              FALSE)
             << sSpellCheck;
   }
 
   if (sText.GetLength() > 0) {
-    CFX_FloatRect rcClient = GetClientRect();
+    CPDF_Rect rcClient = GetClientRect();
     sAppStream << "q\n/Tx BMC\n";
 
     if (!HasFlag(PES_TEXTOVERFLOW))
       sAppStream << rcClient.left << " " << rcClient.bottom << " "
                  << rcClient.right - rcClient.left << " "
                  << rcClient.top - rcClient.bottom << " re W n\n";
 
     sAppStream << sText;
 
     sAppStream << "EMC\nQ\n";
   }
 }
 
 void CPWL_Edit::DrawThisAppearance(CFX_RenderDevice* pDevice,
                                    CFX_Matrix* pUser2Device) {
   CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
 
-  CFX_FloatRect rcClient = GetClientRect();
+  CPDF_Rect rcClient = GetClientRect();
   CFX_ByteTextBuf sLine;
 
   int32_t nCharArray = m_pEdit->GetCharArray();
   FX_SAFE_INT32 nCharArraySafe = nCharArray;
   nCharArraySafe -= 1;
   nCharArraySafe *= 2;
 
   if (nCharArray > 0 && nCharArraySafe.IsValid()) {
     switch (GetBorderStyle()) {
       case PBS_SOLID: {
@@ skipping 47 matching lines @@
         }
         if (path.GetPointCount() > 0)
           pDevice->DrawPath(
               &path, pUser2Device, &gsd, 0,
               CPWL_Utils::PWLColorToFXColor(GetBorderColor(), 255),
               FXFILL_ALTERNATE);
       } break;
     }
   }
 
-  CFX_FloatRect rcClip;
+  CPDF_Rect rcClip;
   CPVT_WordRange wrRange = m_pEdit->GetVisibleWordRange();
   CPVT_WordRange* pRange = NULL;
 
   if (!HasFlag(PES_TEXTOVERFLOW)) {
     rcClip = GetClientRect();
     pRange = &wrRange;
   }
   IFX_SystemHandler* pSysHandler = GetSystemHandler();
   IFX_Edit::DrawEdit(
       pDevice, pUser2Device, m_pEdit,
       CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()),
       CPWL_Utils::PWLColorToFXColor(GetTextStrokeColor(), GetTransparency()),
-      rcClip, CFX_FloatPoint(0.0f, 0.0f), pRange, pSysHandler, m_pFormFiller);
+      rcClip, CPDF_Point(0.0f, 0.0f), pRange, pSysHandler, m_pFormFiller);
 
   if (HasFlag(PES_SPELLCHECK)) {
     CPWL_Utils::DrawEditSpellCheck(pDevice, pUser2Device, m_pEdit, rcClip,
-                                   CFX_FloatPoint(0.0f, 0.0f), pRange,
+                                   CPDF_Point(0.0f, 0.0f), pRange,
                                    GetCreationParam().pSpellCheck);
   }
 }
 
-FX_BOOL CPWL_Edit::OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) {
+FX_BOOL CPWL_Edit::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) {
   CPWL_Wnd::OnLButtonDown(point, nFlag);
 
   if (HasFlag(PES_TEXTOVERFLOW) || ClientHitTest(point)) {
     if (m_bMouseDown)
       InvalidateRect();
 
     m_bMouseDown = TRUE;
     SetCapture();
 
     m_pEdit->OnMouseDown(point, IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
   }
 
   return TRUE;
 }
 
-FX_BOOL CPWL_Edit::OnLButtonDblClk(const CFX_FloatPoint& point,
-                                   FX_DWORD nFlag) {
+FX_BOOL CPWL_Edit::OnLButtonDblClk(const CPDF_Point& point, FX_DWORD nFlag) {
   CPWL_Wnd::OnLButtonDblClk(point, nFlag);
 
   if (HasFlag(PES_TEXTOVERFLOW) || ClientHitTest(point)) {
     m_pEdit->SelectAll();
   }
 
   return TRUE;
 }
 
 #define WM_PWLEDIT_UNDO 0x01
 #define WM_PWLEDIT_REDO 0x02
 #define WM_PWLEDIT_CUT 0x03
 #define WM_PWLEDIT_COPY 0x04
 #define WM_PWLEDIT_PASTE 0x05
 #define WM_PWLEDIT_DELETE 0x06
 #define WM_PWLEDIT_SELECTALL 0x07
 #define WM_PWLEDIT_SUGGEST 0x08
 
-FX_BOOL CPWL_Edit::OnRButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) {
+FX_BOOL CPWL_Edit::OnRButtonUp(const CPDF_Point& point, FX_DWORD nFlag) {
   if (m_bMouseDown)
     return FALSE;
 
   CPWL_Wnd::OnRButtonUp(point, nFlag);
 
   if (!HasFlag(PES_TEXTOVERFLOW) && !ClientHitTest(point))
     return TRUE;
 
   IFX_SystemHandler* pSH = GetSystemHandler();
   if (!pSH)
     return FALSE;
 
   SetFocus();
 
   CPVT_WordRange wrLatin = GetLatinWordsRange(point);
   CFX_WideString swLatin = m_pEdit->GetRangeText(wrLatin);
 
   FX_HMENU hPopup = pSH->CreatePopupMenu();
   if (!hPopup)
     return FALSE;
 
   std::vector<CFX_ByteString> sSuggestWords;
-  CFX_FloatPoint ptPopup = point;
+  CPDF_Point ptPopup = point;
 
   if (!IsReadOnly()) {
     if (HasFlag(PES_SPELLCHECK) && !swLatin.IsEmpty()) {
       if (m_pSpellCheck) {
         CFX_ByteString sLatin = CFX_ByteString::FromUnicode(swLatin);
         if (!m_pSpellCheck->CheckWord(sLatin)) {
           m_pSpellCheck->SuggestWords(sLatin, sSuggestWords);
 
           int32_t nSuggest = pdfium::CollectionSize<int32_t>(sSuggestWords);
           for (int32_t nWord = 0; nWord < nSuggest; nWord++) {
@@ skipping 142 matching lines @@
       pFocusHandler->OnSetFocus(this);
   }
 
   m_bFocus = TRUE;
 }
 
 void CPWL_Edit::OnKillFocus() {
   ShowVScrollBar(FALSE);
 
   m_pEdit->SelectNone();
-  SetCaret(FALSE, CFX_FloatPoint(0.0f, 0.0f), CFX_FloatPoint(0.0f, 0.0f));
+  SetCaret(FALSE, CPDF_Point(0.0f, 0.0f), CPDF_Point(0.0f, 0.0f));
 
   SetCharSet(0);
 
   if (!IsReadOnly()) {
     if (IPWL_FocusHandler* pFocusHandler = GetFocusHandler())
       pFocusHandler->OnKillFocus(this);
   }
 
   m_bFocus = FALSE;
 }
 
 void CPWL_Edit::SetHorzScale(int32_t nHorzScale, FX_BOOL bPaint /* = TRUE*/) {
   m_pEdit->SetHorzScale(nHorzScale, bPaint);
 }
 
 void CPWL_Edit::SetCharSpace(FX_FLOAT fCharSpace, FX_BOOL bPaint /* = TRUE*/) {
   m_pEdit->SetCharSpace(fCharSpace, bPaint);
 }
 
 void CPWL_Edit::SetLineLeading(FX_FLOAT fLineLeading,
                                FX_BOOL bPaint /* = TRUE*/) {
   m_pEdit->SetLineLeading(fLineLeading, bPaint);
 }
 
 CFX_ByteString CPWL_Edit::GetSelectAppearanceStream(
-    const CFX_FloatPoint& ptOffset) const {
+    const CPDF_Point& ptOffset) const {
   CPVT_WordRange wr = GetSelectWordRange();
   return CPWL_Utils::GetEditSelAppStream(m_pEdit, ptOffset, &wr);
 }
 
 CPVT_WordRange CPWL_Edit::GetSelectWordRange() const {
   if (m_pEdit->IsSelected()) {
     int32_t nStart = -1;
     int32_t nEnd = -1;
 
     m_pEdit->GetSel(nStart, nEnd);
 
     CPVT_WordPlace wpStart = m_pEdit->WordIndexToWordPlace(nStart);
     CPVT_WordPlace wpEnd = m_pEdit->WordIndexToWordPlace(nEnd);
 
     return CPVT_WordRange(wpStart, wpEnd);
   }
 
   return CPVT_WordRange();
 }
 
 CFX_ByteString CPWL_Edit::GetTextAppearanceStream(
-    const CFX_FloatPoint& ptOffset) const {
+    const CPDF_Point& ptOffset) const {
   CFX_ByteTextBuf sRet;
   CFX_ByteString sEdit = CPWL_Utils::GetEditAppStream(m_pEdit, ptOffset);
 
   if (sEdit.GetLength() > 0) {
     sRet << "BT\n" << CPWL_Utils::GetColorAppStream(GetTextColor()) << sEdit
          << "ET\n";
   }
 
   return sRet.GetByteString();
 }
 
 CFX_ByteString CPWL_Edit::GetCaretAppearanceStream(
-    const CFX_FloatPoint& ptOffset) const {
+    const CPDF_Point& ptOffset) const {
   if (m_pEditCaret)
     return m_pEditCaret->GetCaretAppearanceStream(ptOffset);
 
   return CFX_ByteString();
 }
 
-CFX_FloatPoint CPWL_Edit::GetWordRightBottomPoint(
-    const CPVT_WordPlace& wpWord) {
-  CFX_FloatPoint pt(0.0f, 0.0f);
+CPDF_Point CPWL_Edit::GetWordRightBottomPoint(const CPVT_WordPlace& wpWord) {
+  CPDF_Point pt(0.0f, 0.0f);
 
   if (IFX_Edit_Iterator* pIterator = m_pEdit->GetIterator()) {
     CPVT_WordPlace wpOld = pIterator->GetAt();
     pIterator->SetAt(wpWord);
     CPVT_Word word;
     if (pIterator->GetWord(word)) {
-      pt = CFX_FloatPoint(word.ptWord.x + word.fWidth,
-                          word.ptWord.y + word.fDescent);
+      pt = CPDF_Point(word.ptWord.x + word.fWidth,
+                      word.ptWord.y + word.fDescent);
     }
 
     pIterator->SetAt(wpOld);
   }
 
   return pt;
 }
 
 FX_BOOL CPWL_Edit::IsTextFull() const {
   return m_pEdit->IsTextFull();
 }
 
 FX_FLOAT CPWL_Edit::GetCharArrayAutoFontSize(CPDF_Font* pFont,
-                                             const CFX_FloatRect& rcPlate,
+                                             const CPDF_Rect& rcPlate,
                                              int32_t nCharArray) {
   if (pFont && !pFont->IsStandardFont()) {
     FX_RECT rcBBox;
     pFont->GetFontBBox(rcBBox);
 
-    CFX_FloatRect rcCell = rcPlate;
+    CPDF_Rect rcCell = rcPlate;
     FX_FLOAT xdiv = rcCell.Width() / nCharArray * 1000.0f / rcBBox.Width();
     FX_FLOAT ydiv = -rcCell.Height() * 1000.0f / rcBBox.Height();
 
     return xdiv < ydiv ? xdiv : ydiv;
   }
 
   return 0.0f;
 }
 
 void CPWL_Edit::SetCharArray(int32_t nCharArray) {
@@ skipping 16 matching lines @@
 
 void CPWL_Edit::SetLimitChar(int32_t nLimitChar) {
   m_pEdit->SetLimitChar(nLimitChar);
 }
 
 void CPWL_Edit::ReplaceSel(const FX_WCHAR* csText) {
   m_pEdit->Clear();
   m_pEdit->InsertText(csText);
 }
 
-CFX_FloatRect CPWL_Edit::GetFocusRect() const {
-  return CFX_FloatRect();
+CPDF_Rect CPWL_Edit::GetFocusRect() const {
+  return CPDF_Rect();
 }
 
 void CPWL_Edit::ShowVScrollBar(FX_BOOL bShow) {
   if (CPWL_ScrollBar* pScroll = GetVScrollBar()) {
     if (bShow) {
       if (!pScroll->IsVisible()) {
         pScroll->SetVisible(TRUE);
-        CFX_FloatRect rcWindow = GetWindowRect();
+        CPDF_Rect rcWindow = GetWindowRect();
         m_rcOldWindow = rcWindow;
         rcWindow.right += PWL_SCROLLBAR_WIDTH;
         Move(rcWindow, TRUE, TRUE);
       }
     } else {
       if (pScroll->IsVisible()) {
         pScroll->SetVisible(FALSE);
         Move(m_rcOldWindow, TRUE, TRUE);
       }
     }
@@ skipping 128 matching lines @@
     int32_t nNewCharSet = pFontMap->CharSetFromUnicode(nChar, DEFAULT_CHARSET);
     if (nOldCharSet != nNewCharSet) {
       SetCharSet(nNewCharSet);
     }
   }
 
   return CPWL_EditCtrl::OnChar(nChar, nFlag);
 }
 
 FX_BOOL CPWL_Edit::OnMouseWheel(short zDelta,
-                                const CFX_FloatPoint& point,
+                                const CPDF_Point& point,
                                 FX_DWORD nFlag) {
   if (HasFlag(PES_MULTILINE)) {
-    CFX_FloatPoint ptScroll = GetScrollPos();
+    CPDF_Point ptScroll = GetScrollPos();
 
     if (zDelta > 0) {
       ptScroll.y += GetFontSize();
     } else {
       ptScroll.y -= GetFontSize();
     }
     SetScrollPos(ptScroll);
 
     return TRUE;
   }
@@ skipping 94 matching lines @@
 
   if (wr1.EndPos.WordCmp(wr2.EndPos) < 0) {
     wrRet.EndPos = wr2.EndPos;
   } else {
     wrRet.EndPos = wr1.EndPos;
   }
 
   return wrRet;
 }
 
-CPVT_WordRange CPWL_Edit::GetLatinWordsRange(
-    const CFX_FloatPoint& point) const {
+CPVT_WordRange CPWL_Edit::GetLatinWordsRange(const CPDF_Point& point) const {
   return GetSameWordsRange(m_pEdit->SearchWordPlace(point), TRUE, FALSE);
 }
 
 CPVT_WordRange CPWL_Edit::GetLatinWordsRange(
     const CPVT_WordPlace& place) const {
   return GetSameWordsRange(place, TRUE, FALSE);
 }
 
 CPVT_WordRange CPWL_Edit::GetArabicWordsRange(
     const CPVT_WordPlace& place) const {
@@ skipping 52 matching lines @@
     }
 
     range.Set(wpStart, wpEnd);
   }
 
   return range;
 }
 
 void CPWL_Edit::GeneratePageObjects(
     CPDF_PageObjectHolder* pObjectHolder,
-    const CFX_FloatPoint& ptOffset,
+    const CPDF_Point& ptOffset,
     CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray) {
   IFX_Edit::GeneratePageObjects(
       pObjectHolder, m_pEdit, ptOffset, NULL,
       CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()),
       ObjArray);
 }
 
 void CPWL_Edit::GeneratePageObjects(CPDF_PageObjectHolder* pObjectHolder,
-                                    const CFX_FloatPoint& ptOffset) {
+                                    const CPDF_Point& ptOffset) {
   CFX_ArrayTemplate<CPDF_TextObject*> ObjArray;
   IFX_Edit::GeneratePageObjects(
       pObjectHolder, m_pEdit, ptOffset, NULL,
       CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()),
       ObjArray);
 }