Re-land "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/fxedit/fxet_ap.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 "core/include/fpdfapi/fpdf_resource.h"
 #include "fpdfsdk/include/fxedit/fx_edit.h"
 #include "fpdfsdk/include/fxedit/fxet_edit.h"
 
@@ skipping 42 matching lines @@
 
     if (sFontAlias.GetLength() > 0 && fFontSize > 0)
       sRet << "/" << sFontAlias << " " << fFontSize << " Tf\n";
   }
 
   return sRet.GetByteString();
 }
 
 CFX_ByteString IFX_Edit::GetEditAppearanceStream(
     IFX_Edit* pEdit,
-    const CPDF_Point& ptOffset,
+    const CFX_FloatPoint& ptOffset,
     const CPVT_WordRange* pRange /* = NULL*/,
     FX_BOOL bContinuous /* = TRUE*/,
     FX_WORD SubWord /* = 0*/) {
   CFX_ByteTextBuf sEditStream, sWords;
 
-  CPDF_Point ptOld(0.0f, 0.0f), ptNew(0.0f, 0.0f);
+  CFX_FloatPoint ptOld(0.0f, 0.0f), ptNew(0.0f, 0.0f);
   int32_t nCurFontIndex = -1;
 
   if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator()) {
     if (pRange)
       pIterator->SetAt(pRange->BeginPos);
     else
       pIterator->SetAt(0);
 
     CPVT_WordPlace oldplace;
 
     while (pIterator->NextWord()) {
       CPVT_WordPlace place = pIterator->GetAt();
 
       if (pRange && place.WordCmp(pRange->EndPos) > 0)
         break;
 
       if (bContinuous) {
         if (place.LineCmp(oldplace) != 0) {
           if (sWords.GetSize() > 0) {
             sEditStream << GetWordRenderString(sWords.GetByteString());
             sWords.Clear();
           }
 
           CPVT_Word word;
           if (pIterator->GetWord(word)) {
-            ptNew = CPDF_Point(word.ptWord.x + ptOffset.x,
-                               word.ptWord.y + ptOffset.y);
+            ptNew = CFX_FloatPoint(word.ptWord.x + ptOffset.x,
+                                   word.ptWord.y + ptOffset.y);
           } else {
             CPVT_Line line;
             pIterator->GetLine(line);
-            ptNew = CPDF_Point(line.ptLine.x + ptOffset.x,
-                               line.ptLine.y + ptOffset.y);
+            ptNew = CFX_FloatPoint(line.ptLine.x + ptOffset.x,
+                                   line.ptLine.y + ptOffset.y);
           }
 
           if (ptNew.x != ptOld.x || ptNew.y != ptOld.y) {
             sEditStream << ptNew.x - ptOld.x << " " << ptNew.y - ptOld.y
                         << " Td\n";
 
             ptOld = ptNew;
           }
         }
 
@@ skipping 10 matching lines @@
           }
 
           sWords << GetPDFWordString(pEdit->GetFontMap(), nCurFontIndex,
                                      word.Word, SubWord);
         }
 
         oldplace = place;
       } else {
         CPVT_Word word;
         if (pIterator->GetWord(word)) {
-          ptNew = CPDF_Point(word.ptWord.x + ptOffset.x,
-                             word.ptWord.y + ptOffset.y);
+          ptNew = CFX_FloatPoint(word.ptWord.x + ptOffset.x,
+                                 word.ptWord.y + ptOffset.y);
 
           if (ptNew.x != ptOld.x || ptNew.y != ptOld.y) {
             sEditStream << ptNew.x - ptOld.x << " " << ptNew.y - ptOld.y
                         << " Td\n";
             ptOld = ptNew;
           }
 
           if (word.nFontIndex != nCurFontIndex) {
             sEditStream << GetFontSetString(pEdit->GetFontMap(),
                                             word.nFontIndex, word.fFontSize);
@@ skipping 25 matching lines @@
     }
 
     sAppStream << sEditStream;
   }
 
   return sAppStream.GetByteString();
 }
 
 CFX_ByteString IFX_Edit::GetSelectAppearanceStream(
     IFX_Edit* pEdit,
-    const CPDF_Point& ptOffset,
+    const CFX_FloatPoint& ptOffset,
     const CPVT_WordRange* pRange) {
   CFX_ByteTextBuf sRet;
 
   if (pRange && pRange->IsExist()) {
     if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator()) {
       pIterator->SetAt(pRange->BeginPos);
 
       while (pIterator->NextWord()) {
         CPVT_WordPlace place = pIterator->GetAt();
 
         if (pRange && place.WordCmp(pRange->EndPos) > 0)
           break;
 
         CPVT_Word word;
         CPVT_Line line;
         if (pIterator->GetWord(word) && pIterator->GetLine(line)) {
           sRet << word.ptWord.x + ptOffset.x << " "
                << line.ptLine.y + line.fLineDescent << " " << word.fWidth << " "
                << line.fLineAscent - line.fLineDescent << " re\nf\n";
         }
       }
     }
   }
 
   return sRet.GetByteString();
 }