Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

core/src/fpdfdoc/doc_vt.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 "core/include/fpdfdoc/fpdf_doc.h"
 #include "core/include/fpdfdoc/fpdf_vt.h"
@@ skipping 148 matching lines @@
         nMid = (nLeft + nRight) / 2;
       } else {
         place.nLineIndex = nMid;
         return;
       }
     } else {
       break;
     }
   }
 }
-CPVT_WordPlace CSection::SearchWordPlace(const CFX_FloatPoint& point) const {
+CPVT_WordPlace CSection::SearchWordPlace(const CPDF_Point& point) const {
   ASSERT(m_pVT);
   CPVT_WordPlace place = GetBeginWordPlace();
   FX_BOOL bUp = TRUE;
   FX_BOOL bDown = TRUE;
   int32_t nLeft = 0;
   int32_t nRight = m_LineArray.GetSize() - 1;
   int32_t nMid = m_LineArray.GetSize() / 2;
   FX_FLOAT fTop = 0;
   FX_FLOAT fBottom = 0;
   while (nLeft <= nRight) {
@@ skipping 948 matching lines @@
       if (CSection* pNextSection = m_SectionArray.GetAt(place.nSecIndex + 1)) {
         return pNextSection->GetBeginWordPlace();
       }
       return GetEndWordPlace();
     }
     return pSection->GetNextWordPlace(place);
   }
   return place;
 }
 CPVT_WordPlace CPDF_VariableText::SearchWordPlace(
-    const CFX_FloatPoint& point) const {
-  CFX_FloatPoint pt = OutToIn(point);
+    const CPDF_Point& point) const {
+  CPDF_Point pt = OutToIn(point);
   CPVT_WordPlace place = GetBeginWordPlace();
   int32_t nLeft = 0;
   int32_t nRight = m_SectionArray.GetSize() - 1;
   int32_t nMid = m_SectionArray.GetSize() / 2;
   FX_BOOL bUp = TRUE;
   FX_BOOL bDown = TRUE;
   while (nLeft <= nRight) {
     if (CSection* pSection = m_SectionArray.GetAt(nMid)) {
       if (IsFloatBigger(pt.y, pSection->m_SecInfo.rcSection.top)) {
         bUp = FALSE;
       }
       if (IsFloatBigger(pSection->m_SecInfo.rcSection.bottom, pt.y)) {
         bDown = FALSE;
       }
       if (IsFloatSmaller(pt.y, pSection->m_SecInfo.rcSection.top)) {
         nRight = nMid - 1;
         nMid = (nLeft + nRight) / 2;
         continue;
       } else if (IsFloatBigger(pt.y, pSection->m_SecInfo.rcSection.bottom)) {
         nLeft = nMid + 1;
         nMid = (nLeft + nRight) / 2;
         continue;
       } else {
         place = pSection->SearchWordPlace(
-            CFX_FloatPoint(pt.x - pSection->m_SecInfo.rcSection.left,
-                           pt.y - pSection->m_SecInfo.rcSection.top));
+            CPDF_Point(pt.x - pSection->m_SecInfo.rcSection.left,
+                       pt.y - pSection->m_SecInfo.rcSection.top));
         place.nSecIndex = nMid;
         return place;
       }
     } else {
       break;
     }
   }
   if (bUp) {
     place = GetBeginWordPlace();
   }
   if (bDown) {
     place = GetEndWordPlace();
   }
   return place;
 }
 CPVT_WordPlace CPDF_VariableText::GetUpWordPlace(
     const CPVT_WordPlace& place,
-    const CFX_FloatPoint& point) const {
+    const CPDF_Point& point) const {
   if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
     CPVT_WordPlace temp = place;
-    CFX_FloatPoint pt = OutToIn(point);
+    CPDF_Point pt = OutToIn(point);
     if (temp.nLineIndex-- > 0) {
       return pSection->SearchWordPlace(
           pt.x - pSection->m_SecInfo.rcSection.left, temp);
     }
     if (temp.nSecIndex-- > 0) {
       if (CSection* pLastSection = m_SectionArray.GetAt(temp.nSecIndex)) {
         temp.nLineIndex = pLastSection->m_LineArray.GetSize() - 1;
         return pLastSection->SearchWordPlace(
             pt.x - pLastSection->m_SecInfo.rcSection.left, temp);
       }
     }
   }
   return place;
 }
 CPVT_WordPlace CPDF_VariableText::GetDownWordPlace(
     const CPVT_WordPlace& place,
-    const CFX_FloatPoint& point) const {
+    const CPDF_Point& point) const {
   if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
     CPVT_WordPlace temp = place;
-    CFX_FloatPoint pt = OutToIn(point);
+    CPDF_Point pt = OutToIn(point);
     if (temp.nLineIndex++ < pSection->m_LineArray.GetSize() - 1) {
       return pSection->SearchWordPlace(
           pt.x - pSection->m_SecInfo.rcSection.left, temp);
     }
     if (temp.nSecIndex++ < m_SectionArray.GetSize() - 1) {
       if (CSection* pNextSection = m_SectionArray.GetAt(temp.nSecIndex)) {
         temp.nLineIndex = 0;
         return pNextSection->SearchWordPlace(
             pt.x - pSection->m_SecInfo.rcSection.left, temp);
       }
@@ skipping 109 matching lines @@
   return FALSE;
 }
 FX_BOOL CPDF_VariableText::GetSectionInfo(const CPVT_WordPlace& place,
                                           CPVT_SectionInfo& secinfo) {
   if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
     secinfo = pSection->m_SecInfo;
     return TRUE;
   }
   return FALSE;
 }
-CFX_FloatRect CPDF_VariableText::GetContentRect() const {
+CPDF_Rect CPDF_VariableText::GetContentRect() const {
   return InToOut(CPVT_FloatRect(CPDF_EditContainer::GetContentRect()));
 }
 FX_FLOAT CPDF_VariableText::GetWordFontSize(const CPVT_WordInfo& WordInfo,
                                             FX_BOOL bFactFontSize) {
   return m_bRichText && WordInfo.pWordProps
              ? (WordInfo.pWordProps->nScriptType == PVTWORD_SCRIPT_NORMAL ||
                         bFactFontSize
                     ? WordInfo.pWordProps->fFontSize
                     : WordInfo.pWordProps->fFontSize * PVT_HALF)
              : GetFontSize();
@@ skipping 399 matching lines @@
 FX_BOOL CPDF_VariableText_Iterator::GetWord(CPVT_Word& word) const {
   word.WordPlace = m_CurPos;
   if (CSection* pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
     if (pSection->m_LineArray.GetAt(m_CurPos.nLineIndex)) {
       if (CPVT_WordInfo* pWord =
               pSection->m_WordArray.GetAt(m_CurPos.nWordIndex)) {
         word.Word = pWord->Word;
         word.nCharset = pWord->nCharset;
         word.fWidth = m_pVT->GetWordWidth(*pWord);
         word.ptWord = m_pVT->InToOut(
-            CFX_FloatPoint(pWord->fWordX + pSection->m_SecInfo.rcSection.left,
-                           pWord->fWordY + pSection->m_SecInfo.rcSection.top));
+            CPDF_Point(pWord->fWordX + pSection->m_SecInfo.rcSection.left,
+                       pWord->fWordY + pSection->m_SecInfo.rcSection.top));
         word.fAscent = m_pVT->GetWordAscent(*pWord);
         word.fDescent = m_pVT->GetWordDescent(*pWord);
         if (pWord->pWordProps) {
           word.WordProps = *pWord->pWordProps;
         }
         word.nFontIndex = m_pVT->GetWordFontIndex(*pWord);
         word.fFontSize = m_pVT->GetWordFontSize(*pWord);
         return TRUE;
       }
     }
@@ skipping 10 matching lines @@
       return TRUE;
     }
   }
   return FALSE;
 }
 FX_BOOL CPDF_VariableText_Iterator::GetLine(CPVT_Line& line) const {
   ASSERT(m_pVT);
   line.lineplace = CPVT_WordPlace(m_CurPos.nSecIndex, m_CurPos.nLineIndex, -1);
   if (CSection* pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
     if (CLine* pLine = pSection->m_LineArray.GetAt(m_CurPos.nLineIndex)) {
-      line.ptLine = m_pVT->InToOut(CFX_FloatPoint(
+      line.ptLine = m_pVT->InToOut(CPDF_Point(
           pLine->m_LineInfo.fLineX + pSection->m_SecInfo.rcSection.left,
           pLine->m_LineInfo.fLineY + pSection->m_SecInfo.rcSection.top));
       line.fLineWidth = pLine->m_LineInfo.fLineWidth;
       line.fLineAscent = pLine->m_LineInfo.fLineAscent;
       line.fLineDescent = pLine->m_LineInfo.fLineDescent;
       line.lineEnd = pLine->GetEndWordPlace();
       return TRUE;
     }
   }
   return FALSE;
@@ skipping 17 matching lines @@
     if (pSection->m_SecInfo.pSecProps) {
       *pSection->m_SecInfo.pSecProps = section.SecProps;
     }
     if (pSection->m_SecInfo.pWordProps) {
       *pSection->m_SecInfo.pWordProps = section.WordProps;
     }
     return TRUE;
   }
   return FALSE;
 }