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

core/src/fpdfdoc/doc_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/fpdfdoc/fpdf_ap.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
 #include "core/include/fpdfdoc/fpdf_vt.h"
 #include "core/src/fpdfdoc/doc_utils.h"
@@ skipping 309 matching lines @@
     pFontDict->SetAtName("Subtype", "Type1");
     pFontDict->SetAtName("BaseFont", "Helvetica");
     pFontDict->SetAtName("Encoding", "WinAnsiEncoding");
     pDoc->AddIndirectObject(pFontDict);
     pDRFontDict->SetAtReference(sFontName.Mid(1), pDoc, pFontDict);
   }
   CPDF_Font* pDefFont = pDoc->LoadFont(pFontDict);
   if (!pDefFont) {
     return FALSE;
   }
-  CPDF_Rect rcAnnot = pAnnotDict->GetRectBy("Rect");
+  CFX_FloatRect rcAnnot = pAnnotDict->GetRectBy("Rect");
   int32_t nRotate = 0;
   if (CPDF_Dictionary* pMKDict = pAnnotDict->GetDictBy("MK")) {
     nRotate = pMKDict->GetIntegerBy("R");
   }
-  CPDF_Rect rcBBox;
+  CFX_FloatRect rcBBox;
   CFX_Matrix matrix;
   switch (nRotate % 360) {
     case 0:
-      rcBBox = CPDF_Rect(0, 0, rcAnnot.right - rcAnnot.left,
-                         rcAnnot.top - rcAnnot.bottom);
+      rcBBox = CFX_FloatRect(0, 0, rcAnnot.right - rcAnnot.left,
+                             rcAnnot.top - rcAnnot.bottom);
       break;
     case 90:
       matrix = CFX_Matrix(0, 1, -1, 0, rcAnnot.right - rcAnnot.left, 0);
-      rcBBox = CPDF_Rect(0, 0, rcAnnot.top - rcAnnot.bottom,
-                         rcAnnot.right - rcAnnot.left);
+      rcBBox = CFX_FloatRect(0, 0, rcAnnot.top - rcAnnot.bottom,
+                             rcAnnot.right - rcAnnot.left);
       break;
     case 180:
       matrix = CFX_Matrix(-1, 0, 0, -1, rcAnnot.right - rcAnnot.left,
                           rcAnnot.top - rcAnnot.bottom);
-      rcBBox = CPDF_Rect(0, 0, rcAnnot.right - rcAnnot.left,
-                         rcAnnot.top - rcAnnot.bottom);
+      rcBBox = CFX_FloatRect(0, 0, rcAnnot.right - rcAnnot.left,
+                             rcAnnot.top - rcAnnot.bottom);
       break;
     case 270:
       matrix = CFX_Matrix(0, -1, 1, 0, 0, rcAnnot.top - rcAnnot.bottom);
-      rcBBox = CPDF_Rect(0, 0, rcAnnot.top - rcAnnot.bottom,
-                         rcAnnot.right - rcAnnot.left);
+      rcBBox = CFX_FloatRect(0, 0, rcAnnot.top - rcAnnot.bottom,
+                             rcAnnot.right - rcAnnot.left);
       break;
   }
   int32_t nBorderStyle = PBS_SOLID;
   FX_FLOAT fBorderWidth = 1;
   CPVT_Dash dsBorder(3, 0, 0);
   CPVT_Color crLeftTop, crRightBottom;
   if (CPDF_Dictionary* pBSDict = pAnnotDict->GetDictBy("BS")) {
     if (pBSDict->KeyExist("W")) {
       fBorderWidth = pBSDict->GetNumberBy("W");
     }
@@ skipping 40 matching lines @@
     sAppStream << "q\n" << sBG << rcBBox.left << " " << rcBBox.bottom << " "
                << rcBBox.Width() << " " << rcBBox.Height() << " re f\n"
                << "Q\n";
   }
   CFX_ByteString sBorderStream = CPVT_GenerateAP::GenerateBorderAP(
       rcBBox, fBorderWidth, crBorder, crLeftTop, crRightBottom, nBorderStyle,
       dsBorder);
   if (sBorderStream.GetLength() > 0) {
     sAppStream << "q\n" << sBorderStream << "Q\n";
   }
-  CPDF_Rect rcBody =
-      CPDF_Rect(rcBBox.left + fBorderWidth, rcBBox.bottom + fBorderWidth,
-                rcBBox.right - fBorderWidth, rcBBox.top - fBorderWidth);
+  CFX_FloatRect rcBody =
+      CFX_FloatRect(rcBBox.left + fBorderWidth, rcBBox.bottom + fBorderWidth,
+                    rcBBox.right - fBorderWidth, rcBBox.top - fBorderWidth);
   rcBody.Normalize();
   CPDF_Dictionary* pAPDict = pAnnotDict->GetDictBy("AP");
   if (!pAPDict) {
     pAPDict = new CPDF_Dictionary;
     pAnnotDict->SetAt("AP", pAPDict);
   }
   CPDF_Stream* pNormalStream = pAPDict->GetStreamBy("N");
   if (!pNormalStream) {
     pNormalStream = new CPDF_Stream(nullptr, 0, nullptr);
     int32_t objnum = pDoc->AddIndirectObject(pNormalStream);
@@ skipping 59 matching lines @@
       }
       FX_BOOL bCharArray = (dwFlags >> 24) & 1;
       if (bCharArray) {
         vt.SetCharArray(dwMaxLen);
       } else {
         vt.SetLimitChar(dwMaxLen);
       }
       vt.Initialize();
       vt.SetText(swValue.c_str());
       vt.RearrangeAll();
-      CPDF_Rect rcContent = vt.GetContentRect();
-      CPDF_Point ptOffset(0.0f, 0.0f);
+      CFX_FloatRect rcContent = vt.GetContentRect();
+      CFX_FloatPoint ptOffset(0.0f, 0.0f);
       if (!bMultiLine) {
         ptOffset =
-            CPDF_Point(0.0f, (rcContent.Height() - rcBody.Height()) / 2.0f);
+            CFX_FloatPoint(0.0f, (rcContent.Height() - rcBody.Height()) / 2.0f);
       }
       CFX_ByteString sBody = CPVT_GenerateAP::GenerateEditAP(
           &map, vt.GetIterator(), ptOffset, !bCharArray, subWord);
       if (sBody.GetLength() > 0) {
         sAppStream << "/Tx BMC\n"
                    << "q\n";
         if (rcContent.Width() > rcBody.Width() ||
             rcContent.Height() > rcBody.Height()) {
           sAppStream << rcBody.left << " " << rcBody.bottom << " "
                      << rcBody.Width() << " " << rcBody.Height()
                      << " re\nW\nn\n";
         }
         sAppStream << "BT\n" << CPVT_GenerateAP::GenerateColorAP(crText, TRUE)
                    << sBody << "ET\n"
                    << "Q\nEMC\n";
       }
     } break;
     case 1: {
       CFX_WideString swValue =
           FPDF_GetFieldAttr(pAnnotDict, "V")
               ? FPDF_GetFieldAttr(pAnnotDict, "V")->GetUnicodeText()
               : CFX_WideString();
       CPVT_FontMap map(pDoc,
                        pStreamDict ? pStreamDict->GetDictBy("Resources") : NULL,
                        pDefFont, sFontName.Right(sFontName.GetLength() - 1));
       CPVT_Provider prd(&map);
       CPDF_VariableText vt;
       vt.SetProvider(&prd);
-      CPDF_Rect rcButton = rcBody;
+      CFX_FloatRect rcButton = rcBody;
       rcButton.left = rcButton.right - 13;
       rcButton.Normalize();
-      CPDF_Rect rcEdit = rcBody;
+      CFX_FloatRect rcEdit = rcBody;
       rcEdit.right = rcButton.left;
       rcEdit.Normalize();
       vt.SetPlateRect(rcEdit);
       if (IsFloatZero(fFontSize)) {
         vt.SetAutoFontSize(TRUE);
       } else {
         vt.SetFontSize(fFontSize);
       }
       vt.Initialize();
       vt.SetText(swValue.c_str());
       vt.RearrangeAll();
-      CPDF_Rect rcContent = vt.GetContentRect();
-      CPDF_Point ptOffset =
-          CPDF_Point(0.0f, (rcContent.Height() - rcEdit.Height()) / 2.0f);
+      CFX_FloatRect rcContent = vt.GetContentRect();
+      CFX_FloatPoint ptOffset =
+          CFX_FloatPoint(0.0f, (rcContent.Height() - rcEdit.Height()) / 2.0f);
       CFX_ByteString sEdit = CPVT_GenerateAP::GenerateEditAP(
           &map, vt.GetIterator(), ptOffset, TRUE, 0);
       if (sEdit.GetLength() > 0) {
         sAppStream << "/Tx BMC\n"
                    << "q\n";
         sAppStream << rcEdit.left << " " << rcEdit.bottom << " "
                    << rcEdit.Width() << " " << rcEdit.Height() << " re\nW\nn\n";
         sAppStream << "BT\n" << CPVT_GenerateAP::GenerateColorAP(crText, TRUE)
                    << sEdit << "ET\n"
                    << "Q\nEMC\n";
       }
       CFX_ByteString sButton = CPVT_GenerateAP::GenerateColorAP(
           CPVT_Color(CPVT_Color::kRGB, 220.0f / 255.0f, 220.0f / 255.0f,
                      220.0f / 255.0f),
           TRUE);
       if (sButton.GetLength() > 0 && !rcButton.IsEmpty()) {
         sAppStream << "q\n" << sButton;
         sAppStream << rcButton.left << " " << rcButton.bottom << " "
                    << rcButton.Width() << " " << rcButton.Height() << " re f\n";
         sAppStream << "Q\n";
         CFX_ByteString sButtonBorder = CPVT_GenerateAP::GenerateBorderAP(
             rcButton, 2, CPVT_Color(CPVT_Color::kGray, 0),
             CPVT_Color(CPVT_Color::kGray, 1),
             CPVT_Color(CPVT_Color::kGray, 0.5), PBS_BEVELED,
             CPVT_Dash(3, 0, 0));
         if (sButtonBorder.GetLength() > 0) {
           sAppStream << "q\n" << sButtonBorder << "Q\n";
         }
-        CPDF_Point ptCenter = CPDF_Point((rcButton.left + rcButton.right) / 2,
-                                         (rcButton.top + rcButton.bottom) / 2);
+        CFX_FloatPoint ptCenter =
+            CFX_FloatPoint((rcButton.left + rcButton.right) / 2,
+                           (rcButton.top + rcButton.bottom) / 2);
         if (IsFloatBigger(rcButton.Width(), 6) &&
             IsFloatBigger(rcButton.Height(), 6)) {
           sAppStream << "q\n"
                      << " 0 g\n";
           sAppStream << ptCenter.x - 3 << " " << ptCenter.y + 1.5f << " m\n";
           sAppStream << ptCenter.x + 3 << " " << ptCenter.y + 1.5f << " l\n";
           sAppStream << ptCenter.x << " " << ptCenter.y - 1.5f << " l\n";
           sAppStream << ptCenter.x - 3 << " " << ptCenter.y + 1.5f << " l f\n";
           sAppStream << sButton << "Q\n";
         }
@@ skipping 31 matching lines @@
             if (pSels) {
               for (FX_DWORD s = 0, ssz = pSels->GetCount(); s < ssz; s++) {
                 if (i == pSels->GetIntegerAt(s)) {
                   bSelected = TRUE;
                   break;
                 }
               }
             }
             CPDF_VariableText vt;
             vt.SetProvider(&prd);
-            vt.SetPlateRect(CPDF_Rect(rcBody.left, 0.0f, rcBody.right, 0.0f));
+            vt.SetPlateRect(
+                CFX_FloatRect(rcBody.left, 0.0f, rcBody.right, 0.0f));
             if (IsFloatZero(fFontSize)) {
               vt.SetFontSize(12.0f);
             } else {
               vt.SetFontSize(fFontSize);
             }
             vt.Initialize();
             vt.SetText(swItem.c_str());
             vt.RearrangeAll();
             FX_FLOAT fItemHeight = vt.GetContentRect().Height();
             if (bSelected) {
-              CPDF_Rect rcItem =
-                  CPDF_Rect(rcBody.left, fy - fItemHeight, rcBody.right, fy);
+              CFX_FloatRect rcItem = CFX_FloatRect(
+                  rcBody.left, fy - fItemHeight, rcBody.right, fy);
               sBody << "q\n" << CPVT_GenerateAP::GenerateColorAP(
                                     CPVT_Color(CPVT_Color::kRGB, 0,
                                                51.0f / 255.0f, 113.0f / 255.0f),
                                     TRUE)
                     << rcItem.left << " " << rcItem.bottom << " "
                     << rcItem.Width() << " " << rcItem.Height() << " re f\n"
                     << "Q\n";
               sBody << "BT\n" << CPVT_GenerateAP::GenerateColorAP(
                                      CPVT_Color(CPVT_Color::kGray, 1), TRUE)
                     << CPVT_GenerateAP::GenerateEditAP(&map, vt.GetIterator(),
-                                                       CPDF_Point(0.0f, fy),
+                                                       CFX_FloatPoint(0.0f, fy),
                                                        TRUE, 0)
                     << "ET\n";
             } else {
               sBody << "BT\n" << CPVT_GenerateAP::GenerateColorAP(crText, TRUE)
                     << CPVT_GenerateAP::GenerateEditAP(&map, vt.GetIterator(),
-                                                       CPDF_Point(0.0f, fy),
+                                                       CFX_FloatPoint(0.0f, fy),
                                                        TRUE, 0)
                     << "ET\n";
             }
             fy -= fItemHeight;
           }
         }
       }
       if (sBody.GetSize() > 0) {
         sAppStream << "/Tx BMC\n"
                    << "q\n";
@@ skipping 36 matching lines @@
                                             CPDF_Dictionary* pAnnotDict) {
   return GenerateWidgetAP(pDoc, pAnnotDict, 1);
 }
 FX_BOOL CPVT_GenerateAP::GenerateListBoxAP(CPDF_Document* pDoc,
                                            CPDF_Dictionary* pAnnotDict) {
   return GenerateWidgetAP(pDoc, pAnnotDict, 2);
 }
 CFX_ByteString CPVT_GenerateAP::GenerateEditAP(
     IPVT_FontMap* pFontMap,
     IPDF_VariableText_Iterator* pIterator,
-    const CPDF_Point& ptOffset,
+    const CFX_FloatPoint& ptOffset,
     FX_BOOL bContinuous,
     FX_WORD SubWord,
     const CPVT_WordRange* pVisible) {
   CFX_ByteTextBuf sEditStream, sLineStream, 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 (pIterator) {
     if (pVisible) {
       pIterator->SetAt(pVisible->BeginPos);
     } else {
       pIterator->SetAt(0);
     }
     CPVT_WordPlace oldplace;
     while (pIterator->NextWord()) {
       CPVT_WordPlace place = pIterator->GetAt();
       if (pVisible && place.WordCmp(pVisible->EndPos) > 0) {
         break;
       }
       if (bContinuous) {
         if (place.LineCmp(oldplace) != 0) {
           if (sWords.GetSize() > 0) {
             sLineStream << GetWordRenderString(sWords.GetByteString());
             sEditStream << sLineStream;
             sLineStream.Clear();
             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) {
             sLineStream << ptNew.x - ptOld.x << " " << ptNew.y - ptOld.y
                         << " Td\n";
             ptOld = ptNew;
           }
         }
         CPVT_Word word;
         if (pIterator->GetWord(word)) {
           if (word.nFontIndex != nCurFontIndex) {
             if (sWords.GetSize() > 0) {
               sLineStream << GetWordRenderString(sWords.GetByteString());
               sWords.Clear();
             }
             sLineStream << GetFontSetString(pFontMap, word.nFontIndex,
                                             word.fFontSize);
             nCurFontIndex = word.nFontIndex;
           }
           sWords << GetPDFWordString(pFontMap, 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(pFontMap, word.nFontIndex,
                                             word.fFontSize);
             nCurFontIndex = word.nFontIndex;
           }
           sEditStream << GetWordRenderString(
               GetPDFWordString(pFontMap, nCurFontIndex, word.Word, SubWord));
         }
       }
     }
     if (sWords.GetSize() > 0) {
       sLineStream << GetWordRenderString(sWords.GetByteString());
       sEditStream << sLineStream;
       sWords.Clear();
     }
   }
   return sEditStream.GetByteString();
 }
 CFX_ByteString CPVT_GenerateAP::GenerateBorderAP(
-    const CPDF_Rect& rect,
+    const CFX_FloatRect& rect,
     FX_FLOAT fWidth,
     const CPVT_Color& color,
     const CPVT_Color& crLeftTop,
     const CPVT_Color& crRightBottom,
     int32_t nStyle,
     const CPVT_Dash& dash) {
   CFX_ByteTextBuf sAppStream;
   CFX_ByteString sColor;
   FX_FLOAT fLeft = rect.left;
   FX_FLOAT fRight = rect.right;
@@ skipping 107 matching lines @@
     case CPVT_Color::kCMYK:
       sColorStream << color.fColor1 << " " << color.fColor2 << " "
                    << color.fColor3 << " " << color.fColor4 << " "
                    << (bFillOrStroke ? "k" : "K") << "\n";
       break;
     case CPVT_Color::kTransparent:
       break;
   }
   return sColorStream.GetByteString();
 }