Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/pdfwindow/PWL_Utils.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_Utils.h"
 
 #include <algorithm>
 
@@ skipping 51 matching lines @@
       case PWLPT_BEZIERTO:
         path.SetPoint(i, pPathData[i].point.x, pPathData[i].point.y,
                       FXPT_BEZIERTO);
         break;
       default:
         break;
     }
   }
 }
 
-CFX_FloatRect CPWL_Utils::MaxRect(const CFX_FloatRect& rect1,
-                                  const CFX_FloatRect& rect2) {
-  CFX_FloatRect rcRet;
+CPDF_Rect CPWL_Utils::MaxRect(const CPDF_Rect& rect1, const CPDF_Rect& rect2) {
+  CPDF_Rect rcRet;
 
   rcRet.left = PWL_MIN(rect1.left, rect2.left);
   rcRet.bottom = PWL_MIN(rect1.bottom, rect2.bottom);
   rcRet.right = PWL_MAX(rect1.right, rect2.right);
   rcRet.top = PWL_MAX(rect1.top, rect2.top);
 
   return rcRet;
 }
 
-CFX_FloatRect CPWL_Utils::OffsetRect(const CFX_FloatRect& rect,
-                                     FX_FLOAT x,
-                                     FX_FLOAT y) {
-  return CFX_FloatRect(rect.left + x, rect.bottom + y, rect.right + x,
-                       rect.top + y);
+CPDF_Rect CPWL_Utils::OffsetRect(const CPDF_Rect& rect,
+                                 FX_FLOAT x,
+                                 FX_FLOAT y) {
+  return CPDF_Rect(rect.left + x, rect.bottom + y, rect.right + x,
+                   rect.top + y);
 }
 
-FX_BOOL CPWL_Utils::ContainsRect(const CFX_FloatRect& rcParent,
-                                 const CFX_FloatRect& rcChild) {
+FX_BOOL CPWL_Utils::ContainsRect(const CPDF_Rect& rcParent,
+                                 const CPDF_Rect& rcChild) {
   return rcChild.left >= rcParent.left && rcChild.bottom >= rcParent.bottom &&
          rcChild.right <= rcParent.right && rcChild.top <= rcParent.top;
 }
 
-FX_BOOL CPWL_Utils::IntersectRect(const CFX_FloatRect& rect1,
-                                  const CFX_FloatRect& rect2) {
+FX_BOOL CPWL_Utils::IntersectRect(const CPDF_Rect& rect1,
+                                  const CPDF_Rect& rect2) {
   FX_FLOAT left = rect1.left > rect2.left ? rect1.left : rect2.left;
   FX_FLOAT right = rect1.right < rect2.right ? rect1.right : rect2.right;
   FX_FLOAT bottom = rect1.bottom > rect2.bottom ? rect1.bottom : rect2.bottom;
   FX_FLOAT top = rect1.top < rect2.top ? rect1.top : rect2.top;
 
   return left < right && bottom < top;
 }
 
-CFX_FloatPoint CPWL_Utils::OffsetPoint(const CFX_FloatPoint& point,
-                                       FX_FLOAT x,
-                                       FX_FLOAT y) {
-  return CFX_FloatPoint(point.x + x, point.y + y);
+CPDF_Point CPWL_Utils::OffsetPoint(const CPDF_Point& point,
+                                   FX_FLOAT x,
+                                   FX_FLOAT y) {
+  return CPDF_Point(point.x + x, point.y + y);
 }
 
 CPVT_WordRange CPWL_Utils::OverlapWordRange(const CPVT_WordRange& wr1,
                                             const CPVT_WordRange& wr2) {
   CPVT_WordRange wrRet;
 
   if (wr2.EndPos.WordCmp(wr1.BeginPos) < 0 ||
       wr2.BeginPos.WordCmp(wr1.EndPos) > 0)
     return wrRet;
   if (wr1.EndPos.WordCmp(wr2.BeginPos) < 0 ||
       wr1.BeginPos.WordCmp(wr2.EndPos) > 0)
     return wrRet;
 
   if (wr1.BeginPos.WordCmp(wr2.BeginPos) < 0) {
     wrRet.BeginPos = wr2.BeginPos;
   } else {
     wrRet.BeginPos = wr1.BeginPos;
   }
 
   if (wr1.EndPos.WordCmp(wr2.EndPos) < 0) {
     wrRet.EndPos = wr1.EndPos;
   } else {
     wrRet.EndPos = wr2.EndPos;
   }
 
   return wrRet;
 }
 
-CFX_ByteString CPWL_Utils::GetAP_Check(const CFX_FloatRect& crBBox) {
+CFX_ByteString CPWL_Utils::GetAP_Check(const CPDF_Rect& crBBox) {
   const FX_FLOAT fWidth = crBBox.right - crBBox.left;
   const FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_Point pts[8][3] = {{CPWL_Point(0.28f, 0.52f), CPWL_Point(0.27f, 0.48f),
                            CPWL_Point(0.29f, 0.40f)},
                           {CPWL_Point(0.30f, 0.33f), CPWL_Point(0.31f, 0.29f),
                            CPWL_Point(0.31f, 0.28f)},
                           {CPWL_Point(0.39f, 0.28f), CPWL_Point(0.49f, 0.29f),
                            CPWL_Point(0.77f, 0.67f)},
                           {CPWL_Point(0.76f, 0.68f), CPWL_Point(0.78f, 0.69f),
@@ skipping 28 matching lines @@
     csAP << pts[i][0].x + px1 * FX_BEZIER << " "
          << pts[i][0].y + py1 * FX_BEZIER << " "
          << pts[nNext][0].x + px2 * FX_BEZIER << " "
          << pts[nNext][0].y + py2 * FX_BEZIER << " " << pts[nNext][0].x << " "
          << pts[nNext][0].y << " c\n";
   }
 
   return csAP.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetAP_Circle(const CFX_FloatRect& crBBox) {
+CFX_ByteString CPWL_Utils::GetAP_Circle(const CPDF_Rect& crBBox) {
   CFX_ByteTextBuf csAP;
 
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
-  CFX_FloatPoint pt1(crBBox.left, crBBox.bottom + fHeight / 2);
-  CFX_FloatPoint pt2(crBBox.left + fWidth / 2, crBBox.top);
-  CFX_FloatPoint pt3(crBBox.right, crBBox.bottom + fHeight / 2);
-  CFX_FloatPoint pt4(crBBox.left + fWidth / 2, crBBox.bottom);
+  CPDF_Point pt1(crBBox.left, crBBox.bottom + fHeight / 2);
+  CPDF_Point pt2(crBBox.left + fWidth / 2, crBBox.top);
+  CPDF_Point pt3(crBBox.right, crBBox.bottom + fHeight / 2);
+  CPDF_Point pt4(crBBox.left + fWidth / 2, crBBox.bottom);
 
   csAP << pt1.x << " " << pt1.y << " m\n";
 
   FX_FLOAT px = pt2.x - pt1.x;
   FX_FLOAT py = pt2.y - pt1.y;
 
   csAP << pt1.x << " " << pt1.y + py * FX_BEZIER << " "
        << pt2.x - px * FX_BEZIER << " " << pt2.y << " " << pt2.x << " " << pt2.y
        << " c\n";
 
@@ skipping 12 matching lines @@
 
   px = pt4.x - pt1.x;
   py = pt1.y - pt4.y;
 
   csAP << pt4.x - px * FX_BEZIER << " " << pt4.y << " " << pt1.x << " "
        << pt1.y - py * FX_BEZIER << " " << pt1.x << " " << pt1.y << " c\n";
 
   return csAP.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetAP_Cross(const CFX_FloatRect& crBBox) {
+CFX_ByteString CPWL_Utils::GetAP_Cross(const CPDF_Rect& crBBox) {
   CFX_ByteTextBuf csAP;
 
   csAP << crBBox.left << " " << crBBox.top << " m\n";
   csAP << crBBox.right << " " << crBBox.bottom << " l\n";
   csAP << crBBox.left << " " << crBBox.bottom << " m\n";
   csAP << crBBox.right << " " << crBBox.top << " l\n";
 
   return csAP.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetAP_Diamond(const CFX_FloatRect& crBBox) {
+CFX_ByteString CPWL_Utils::GetAP_Diamond(const CPDF_Rect& crBBox) {
   CFX_ByteTextBuf csAP;
 
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
-  CFX_FloatPoint pt1(crBBox.left, crBBox.bottom + fHeight / 2);
-  CFX_FloatPoint pt2(crBBox.left + fWidth / 2, crBBox.top);
-  CFX_FloatPoint pt3(crBBox.right, crBBox.bottom + fHeight / 2);
-  CFX_FloatPoint pt4(crBBox.left + fWidth / 2, crBBox.bottom);
+  CPDF_Point pt1(crBBox.left, crBBox.bottom + fHeight / 2);
+  CPDF_Point pt2(crBBox.left + fWidth / 2, crBBox.top);
+  CPDF_Point pt3(crBBox.right, crBBox.bottom + fHeight / 2);
+  CPDF_Point pt4(crBBox.left + fWidth / 2, crBBox.bottom);
 
   csAP << pt1.x << " " << pt1.y << " m\n";
   csAP << pt2.x << " " << pt2.y << " l\n";
   csAP << pt3.x << " " << pt3.y << " l\n";
   csAP << pt4.x << " " << pt4.y << " l\n";
   csAP << pt1.x << " " << pt1.y << " l\n";
 
   return csAP.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetAP_Square(const CFX_FloatRect& crBBox) {
+CFX_ByteString CPWL_Utils::GetAP_Square(const CPDF_Rect& crBBox) {
   CFX_ByteTextBuf csAP;
 
   csAP << crBBox.left << " " << crBBox.top << " m\n";
   csAP << crBBox.right << " " << crBBox.top << " l\n";
   csAP << crBBox.right << " " << crBBox.bottom << " l\n";
   csAP << crBBox.left << " " << crBBox.bottom << " l\n";
   csAP << crBBox.left << " " << crBBox.top << " l\n";
 
   return csAP.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetAP_Star(const CFX_FloatRect& crBBox) {
+CFX_ByteString CPWL_Utils::GetAP_Star(const CPDF_Rect& crBBox) {
   CFX_ByteTextBuf csAP;
 
   FX_FLOAT fRadius =
       (crBBox.top - crBBox.bottom) / (1 + (FX_FLOAT)cos(FX_PI / 5.0f));
-  CFX_FloatPoint ptCenter = CFX_FloatPoint((crBBox.left + crBBox.right) / 2.0f,
-                                           (crBBox.top + crBBox.bottom) / 2.0f);
+  CPDF_Point ptCenter = CPDF_Point((crBBox.left + crBBox.right) / 2.0f,
+                                   (crBBox.top + crBBox.bottom) / 2.0f);
 
   FX_FLOAT px[5], py[5];
 
   FX_FLOAT fAngel = FX_PI / 10.0f;
 
   for (int32_t i = 0; i < 5; i++) {
     px[i] = ptCenter.x + fRadius * (FX_FLOAT)cos(fAngel);
     py[i] = ptCenter.y + fRadius * (FX_FLOAT)sin(fAngel);
 
     fAngel += FX_PI * 2 / 5.0f;
   }
 
   csAP << px[0] << " " << py[0] << " m\n";
 
   int32_t nNext = 0;
   for (int32_t j = 0; j < 5; j++) {
     nNext += 2;
     if (nNext >= 5)
       nNext -= 5;
     csAP << px[nNext] << " " << py[nNext] << " l\n";
   }
 
   return csAP.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetAP_HalfCircle(const CFX_FloatRect& crBBox,
+CFX_ByteString CPWL_Utils::GetAP_HalfCircle(const CPDF_Rect& crBBox,
                                             FX_FLOAT fRotate) {
   CFX_ByteTextBuf csAP;
 
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
-  CFX_FloatPoint pt1(-fWidth / 2, 0);
-  CFX_FloatPoint pt2(0, fHeight / 2);
-  CFX_FloatPoint pt3(fWidth / 2, 0);
+  CPDF_Point pt1(-fWidth / 2, 0);
+  CPDF_Point pt2(0, fHeight / 2);
+  CPDF_Point pt3(fWidth / 2, 0);
 
   FX_FLOAT px, py;
 
   csAP << cos(fRotate) << " " << sin(fRotate) << " " << -sin(fRotate) << " "
        << cos(fRotate) << " " << crBBox.left + fWidth / 2 << " "
        << crBBox.bottom + fHeight / 2 << " cm\n";
 
   csAP << pt1.x << " " << pt1.y << " m\n";
 
   px = pt2.x - pt1.x;
   py = pt2.y - pt1.y;
 
   csAP << pt1.x << " " << pt1.y + py * FX_BEZIER << " "
        << pt2.x - px * FX_BEZIER << " " << pt2.y << " " << pt2.x << " " << pt2.y
        << " c\n";
 
   px = pt3.x - pt2.x;
   py = pt2.y - pt3.y;
 
   csAP << pt2.x + px * FX_BEZIER << " " << pt2.y << " " << pt3.x << " "
        << pt3.y + py * FX_BEZIER << " " << pt3.x << " " << pt3.y << " c\n";
 
   return csAP.GetByteString();
 }
 
-CFX_FloatRect CPWL_Utils::InflateRect(const CFX_FloatRect& rcRect,
-                                      FX_FLOAT fSize) {
+CPDF_Rect CPWL_Utils::InflateRect(const CPDF_Rect& rcRect, FX_FLOAT fSize) {
   if (rcRect.IsEmpty())
     return rcRect;
 
-  CFX_FloatRect rcNew(rcRect.left - fSize, rcRect.bottom - fSize,
-                      rcRect.right + fSize, rcRect.top + fSize);
+  CPDF_Rect rcNew(rcRect.left - fSize, rcRect.bottom - fSize,
+                  rcRect.right + fSize, rcRect.top + fSize);
   rcNew.Normalize();
   return rcNew;
 }
 
-CFX_FloatRect CPWL_Utils::DeflateRect(const CFX_FloatRect& rcRect,
-                                      FX_FLOAT fSize) {
+CPDF_Rect CPWL_Utils::DeflateRect(const CPDF_Rect& rcRect, FX_FLOAT fSize) {
   if (rcRect.IsEmpty())
     return rcRect;
 
-  CFX_FloatRect rcNew(rcRect.left + fSize, rcRect.bottom + fSize,
-                      rcRect.right - fSize, rcRect.top - fSize);
+  CPDF_Rect rcNew(rcRect.left + fSize, rcRect.bottom + fSize,
+                  rcRect.right - fSize, rcRect.top - fSize);
   rcNew.Normalize();
   return rcNew;
 }
 
-CFX_FloatRect CPWL_Utils::ScaleRect(const CFX_FloatRect& rcRect,
-                                    FX_FLOAT fScale) {
+CPDF_Rect CPWL_Utils::ScaleRect(const CPDF_Rect& rcRect, FX_FLOAT fScale) {
   FX_FLOAT fHalfWidth = (rcRect.right - rcRect.left) / 2.0f;
   FX_FLOAT fHalfHeight = (rcRect.top - rcRect.bottom) / 2.0f;
 
-  CFX_FloatPoint ptCenter = CFX_FloatPoint((rcRect.left + rcRect.right) / 2,
-                                           (rcRect.top + rcRect.bottom) / 2);
+  CPDF_Point ptCenter = CPDF_Point((rcRect.left + rcRect.right) / 2,
+                                   (rcRect.top + rcRect.bottom) / 2);
 
-  return CFX_FloatRect(
+  return CPDF_Rect(
       ptCenter.x - fHalfWidth * fScale, ptCenter.y - fHalfHeight * fScale,
       ptCenter.x + fHalfWidth * fScale, ptCenter.y + fHalfHeight * fScale);
 }
 
-CFX_ByteString CPWL_Utils::GetRectFillAppStream(const CFX_FloatRect& rect,
+CFX_ByteString CPWL_Utils::GetRectFillAppStream(const CPDF_Rect& rect,
                                                 const CPWL_Color& color) {
   CFX_ByteTextBuf sAppStream;
 
   CFX_ByteString sColor = GetColorAppStream(color, TRUE);
   if (sColor.GetLength() > 0) {
     sAppStream << "q\n" << sColor;
     sAppStream << rect.left << " " << rect.bottom << " "
                << rect.right - rect.left << " " << rect.top - rect.bottom
                << " re f\nQ\n";
   }
 
   return sAppStream.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetCircleFillAppStream(const CFX_FloatRect& rect,
+CFX_ByteString CPWL_Utils::GetCircleFillAppStream(const CPDF_Rect& rect,
                                                   const CPWL_Color& color) {
   CFX_ByteTextBuf sAppStream;
 
   CFX_ByteString sColor = GetColorAppStream(color, TRUE);
   if (sColor.GetLength() > 0) {
     sAppStream << "q\n" << sColor << CPWL_Utils::GetAP_Circle(rect) << "f\nQ\n";
   }
 
   return sAppStream.GetByteString();
 }
 
-CFX_FloatRect CPWL_Utils::GetCenterSquare(const CFX_FloatRect& rect) {
+CPDF_Rect CPWL_Utils::GetCenterSquare(const CPDF_Rect& rect) {
   FX_FLOAT fWidth = rect.right - rect.left;
   FX_FLOAT fHeight = rect.top - rect.bottom;
 
   FX_FLOAT fCenterX = (rect.left + rect.right) / 2.0f;
   FX_FLOAT fCenterY = (rect.top + rect.bottom) / 2.0f;
 
   FX_FLOAT fRadius = (fWidth > fHeight) ? fHeight / 2 : fWidth / 2;
 
-  return CFX_FloatRect(fCenterX - fRadius, fCenterY - fRadius,
-                       fCenterX + fRadius, fCenterY + fRadius);
+  return CPDF_Rect(fCenterX - fRadius, fCenterY - fRadius, fCenterX + fRadius,
+                   fCenterY + fRadius);
 }
 
 CFX_ByteString CPWL_Utils::GetEditAppStream(IFX_Edit* pEdit,
-                                            const CFX_FloatPoint& ptOffset,
+                                            const CPDF_Point& ptOffset,
                                             const CPVT_WordRange* pRange,
                                             FX_BOOL bContinuous,
                                             FX_WORD SubWord) {
   return IFX_Edit::GetEditAppearanceStream(pEdit, ptOffset, pRange, bContinuous,
                                            SubWord);
 }
 
 CFX_ByteString CPWL_Utils::GetEditSelAppStream(IFX_Edit* pEdit,
-                                               const CFX_FloatPoint& ptOffset,
+                                               const CPDF_Point& ptOffset,
                                                const CPVT_WordRange* pRange) {
   return IFX_Edit::GetSelectAppearanceStream(pEdit, ptOffset, pRange);
 }
 
 static CFX_ByteString GetSquigglyAppearanceStream(FX_FLOAT fStartX,
                                                   FX_FLOAT fEndX,
                                                   FX_FLOAT fY,
                                                   FX_FLOAT fStep) {
   CFX_ByteTextBuf sRet;
 
   sRet << "0 w\n" << fStartX << " " << fY << " m\n";
 
   FX_FLOAT fx;
   int32_t i;
 
   for (i = 1, fx = fStartX + fStep; fx < fEndX; fx += fStep, i++) {
     sRet << fx << " " << fY + (i & 1) * fStep << " l\n";
   }
 
   sRet << "S\n";
 
   return sRet.GetByteString();
 }
 
 static CFX_ByteString GetWordSpellCheckAppearanceStream(
     IFX_Edit_Iterator* pIterator,
-    const CFX_FloatPoint& ptOffset,
+    const CPDF_Point& ptOffset,
     const CPVT_WordRange& wrWord) {
   CFX_ByteTextBuf sRet;
 
   FX_FLOAT fStartX = 0.0f;
   FX_FLOAT fEndX = 0.0f;
   FX_FLOAT fY = 0.0f;
   FX_FLOAT fStep = 0.0f;
 
   FX_BOOL bBreak = FALSE;
 
@@ skipping 38 matching lines @@
         break;
     } while (pIterator->NextLine());
   }
 
   return sRet.GetByteString();
 }
 
 CFX_ByteString CPWL_Utils::GetSpellCheckAppStream(
     IFX_Edit* pEdit,
     IPWL_SpellCheck* pSpellCheck,
-    const CFX_FloatPoint& ptOffset,
+    const CPDF_Point& ptOffset,
     const CPVT_WordRange* pRange) {
   CFX_ByteTextBuf sRet;
 
   if (pRange && pRange->IsExist()) {
     if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator()) {
       pIterator->SetAt(pRange->BeginPos);
 
       FX_BOOL bLatinWord = FALSE;
       CPVT_WordPlace wpWordStart;
       CFX_ByteString sWord;
@@ skipping 44 matching lines @@
 
         bLatinWord = FALSE;
         sWord.Empty();
       }
     }
   }
 
   return sRet.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetTextAppStream(const CFX_FloatRect& rcBBox,
+CFX_ByteString CPWL_Utils::GetTextAppStream(const CPDF_Rect& rcBBox,
                                             IFX_Edit_FontMap* pFontMap,
                                             const CFX_WideString& sText,
                                             int32_t nAlignmentH,
                                             int32_t nAlignmentV,
                                             FX_FLOAT fFontSize,
                                             FX_BOOL bMultiLine,
                                             FX_BOOL bAutoReturn,
                                             const CPWL_Color& crText) {
   CFX_ByteTextBuf sRet;
 
   if (IFX_Edit* pEdit = IFX_Edit::NewEdit()) {
     pEdit->SetFontMap(pFontMap);
     pEdit->SetPlateRect(rcBBox);
     pEdit->SetAlignmentH(nAlignmentH);
     pEdit->SetAlignmentV(nAlignmentV);
     pEdit->SetMultiLine(bMultiLine);
     pEdit->SetAutoReturn(bAutoReturn);
     if (IsFloatZero(fFontSize))
       pEdit->SetAutoFontSize(TRUE);
     else
       pEdit->SetFontSize(fFontSize);
 
     pEdit->Initialize();
     pEdit->SetText(sText.c_str());
 
     CFX_ByteString sEdit =
-        CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, 0.0f));
+        CPWL_Utils::GetEditAppStream(pEdit, CPDF_Point(0.0f, 0.0f));
     if (sEdit.GetLength() > 0) {
       sRet << "BT\n" << CPWL_Utils::GetColorAppStream(crText) << sEdit
            << "ET\n";
     }
     IFX_Edit::DelEdit(pEdit);
   }
 
   return sRet.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CFX_FloatRect& rcBBox,
+CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CPDF_Rect& rcBBox,
                                                   IFX_Edit_FontMap* pFontMap,
                                                   CPDF_Stream* pIconStream,
                                                   CPDF_IconFit& IconFit,
                                                   const CFX_WideString& sLabel,
                                                   const CPWL_Color& crText,
                                                   FX_FLOAT fFontSize,
                                                   int32_t nLayOut) {
   const FX_FLOAT fAutoFontScale = 1.0f / 3.0f;
 
   if (IFX_Edit* pEdit = IFX_Edit::NewEdit()) {
     pEdit->SetFontMap(pFontMap);
     pEdit->SetAlignmentH(1);
     pEdit->SetAlignmentV(1);
     pEdit->SetMultiLine(FALSE);
     pEdit->SetAutoReturn(FALSE);
     if (IsFloatZero(fFontSize))
       pEdit->SetAutoFontSize(TRUE);
     else
       pEdit->SetFontSize(fFontSize);
 
     pEdit->Initialize();
     pEdit->SetText(sLabel.c_str());
 
-    CFX_FloatRect rcLabelContent = pEdit->GetContentRect();
+    CPDF_Rect rcLabelContent = pEdit->GetContentRect();
     CPWL_Icon Icon;
     PWL_CREATEPARAM cp;
     cp.dwFlags = PWS_VISIBLE;
     Icon.Create(cp);
     Icon.SetIconFit(&IconFit);
     Icon.SetPDFStream(pIconStream);
 
-    CFX_FloatRect rcLabel = CFX_FloatRect(0, 0, 0, 0);
-    CFX_FloatRect rcIcon = CFX_FloatRect(0, 0, 0, 0);
+    CPDF_Rect rcLabel = CPDF_Rect(0, 0, 0, 0);
+    CPDF_Rect rcIcon = CPDF_Rect(0, 0, 0, 0);
     FX_FLOAT fWidth = 0.0f;
     FX_FLOAT fHeight = 0.0f;
 
     switch (nLayOut) {
       case PPBL_LABEL:
         rcLabel = rcBBox;
-        rcIcon = CFX_FloatRect(0, 0, 0, 0);
+        rcIcon = CPDF_Rect(0, 0, 0, 0);
         break;
       case PPBL_ICON:
         rcIcon = rcBBox;
-        rcLabel = CFX_FloatRect(0, 0, 0, 0);
+        rcLabel = CPDF_Rect(0, 0, 0, 0);
         break;
       case PPBL_ICONTOPLABELBOTTOM:
 
         if (pIconStream) {
           if (IsFloatZero(fFontSize)) {
             fHeight = rcBBox.top - rcBBox.bottom;
-            rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcBBox.right,
-                                    rcBBox.bottom + fHeight * fAutoFontScale);
-            rcIcon = CFX_FloatRect(rcBBox.left, rcLabel.top, rcBBox.right,
-                                   rcBBox.top);
+            rcLabel = CPDF_Rect(rcBBox.left, rcBBox.bottom, rcBBox.right,
+                                rcBBox.bottom + fHeight * fAutoFontScale);
+            rcIcon =
+                CPDF_Rect(rcBBox.left, rcLabel.top, rcBBox.right, rcBBox.top);
           } else {
             fHeight = rcLabelContent.Height();
 
             if (rcBBox.bottom + fHeight > rcBBox.top) {
-              rcIcon = CFX_FloatRect(0, 0, 0, 0);
+              rcIcon = CPDF_Rect(0, 0, 0, 0);
               rcLabel = rcBBox;
             } else {
-              rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcBBox.right,
-                                      rcBBox.bottom + fHeight);
-              rcIcon = CFX_FloatRect(rcBBox.left, rcLabel.top, rcBBox.right,
-                                     rcBBox.top);
+              rcLabel = CPDF_Rect(rcBBox.left, rcBBox.bottom, rcBBox.right,
+                                  rcBBox.bottom + fHeight);
+              rcIcon =
+                  CPDF_Rect(rcBBox.left, rcLabel.top, rcBBox.right, rcBBox.top);
             }
           }
         } else {
           rcLabel = rcBBox;
-          rcIcon = CFX_FloatRect(0, 0, 0, 0);
+          rcIcon = CPDF_Rect(0, 0, 0, 0);
         }
 
         break;
       case PPBL_LABELTOPICONBOTTOM:
 
         if (pIconStream) {
           if (IsFloatZero(fFontSize)) {
             fHeight = rcBBox.top - rcBBox.bottom;
-            rcLabel = CFX_FloatRect(rcBBox.left,
-                                    rcBBox.top - fHeight * fAutoFontScale,
-                                    rcBBox.right, rcBBox.top);
-            rcIcon = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcBBox.right,
-                                   rcLabel.bottom);
+            rcLabel =
+                CPDF_Rect(rcBBox.left, rcBBox.top - fHeight * fAutoFontScale,
+                          rcBBox.right, rcBBox.top);
+            rcIcon = CPDF_Rect(rcBBox.left, rcBBox.bottom, rcBBox.right,
+                               rcLabel.bottom);
           } else {
             fHeight = rcLabelContent.Height();
 
             if (rcBBox.bottom + fHeight > rcBBox.top) {
-              rcIcon = CFX_FloatRect(0, 0, 0, 0);
+              rcIcon = CPDF_Rect(0, 0, 0, 0);
               rcLabel = rcBBox;
             } else {
-              rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.top - fHeight,
-                                      rcBBox.right, rcBBox.top);
-              rcIcon = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcBBox.right,
-                                     rcLabel.bottom);
+              rcLabel = CPDF_Rect(rcBBox.left, rcBBox.top - fHeight,
+                                  rcBBox.right, rcBBox.top);
+              rcIcon = CPDF_Rect(rcBBox.left, rcBBox.bottom, rcBBox.right,
+                                 rcLabel.bottom);
             }
           }
         } else {
           rcLabel = rcBBox;
-          rcIcon = CFX_FloatRect(0, 0, 0, 0);
+          rcIcon = CPDF_Rect(0, 0, 0, 0);
         }
 
         break;
       case PPBL_ICONLEFTLABELRIGHT:
 
         if (pIconStream) {
           if (IsFloatZero(fFontSize)) {
             fWidth = rcBBox.right - rcBBox.left;
-            rcLabel = CFX_FloatRect(rcBBox.right - fWidth * fAutoFontScale,
-                                    rcBBox.bottom, rcBBox.right, rcBBox.top);
-            rcIcon = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcLabel.left,
-                                   rcBBox.top);
+            rcLabel = CPDF_Rect(rcBBox.right - fWidth * fAutoFontScale,
+                                rcBBox.bottom, rcBBox.right, rcBBox.top);
+            rcIcon =
+                CPDF_Rect(rcBBox.left, rcBBox.bottom, rcLabel.left, rcBBox.top);
 
             if (rcLabelContent.Width() < fWidth * fAutoFontScale) {
             } else {
               if (rcLabelContent.Width() < fWidth) {
-                rcLabel =
-                    CFX_FloatRect(rcBBox.right - rcLabelContent.Width(),
-                                  rcBBox.bottom, rcBBox.right, rcBBox.top);
-                rcIcon = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcLabel.left,
-                                       rcBBox.top);
+                rcLabel = CPDF_Rect(rcBBox.right - rcLabelContent.Width(),
+                                    rcBBox.bottom, rcBBox.right, rcBBox.top);
+                rcIcon = CPDF_Rect(rcBBox.left, rcBBox.bottom, rcLabel.left,
+                                   rcBBox.top);
               } else {
                 rcLabel = rcBBox;
-                rcIcon = CFX_FloatRect(0, 0, 0, 0);
+                rcIcon = CPDF_Rect(0, 0, 0, 0);
               }
             }
           } else {
             fWidth = rcLabelContent.Width();
 
             if (rcBBox.left + fWidth > rcBBox.right) {
               rcLabel = rcBBox;
-              rcIcon = CFX_FloatRect(0, 0, 0, 0);
+              rcIcon = CPDF_Rect(0, 0, 0, 0);
             } else {
-              rcLabel = CFX_FloatRect(rcBBox.right - fWidth, rcBBox.bottom,
-                                      rcBBox.right, rcBBox.top);
-              rcIcon = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcLabel.left,
-                                     rcBBox.top);
+              rcLabel = CPDF_Rect(rcBBox.right - fWidth, rcBBox.bottom,
+                                  rcBBox.right, rcBBox.top);
+              rcIcon = CPDF_Rect(rcBBox.left, rcBBox.bottom, rcLabel.left,
+                                 rcBBox.top);
             }
           }
         } else {
           rcLabel = rcBBox;
-          rcIcon = CFX_FloatRect(0, 0, 0, 0);
+          rcIcon = CPDF_Rect(0, 0, 0, 0);
         }
 
         break;
       case PPBL_LABELLEFTICONRIGHT:
 
         if (pIconStream) {
           if (IsFloatZero(fFontSize)) {
             fWidth = rcBBox.right - rcBBox.left;
-            rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.bottom,
-                                    rcBBox.left + fWidth * fAutoFontScale,
-                                    rcBBox.top);
-            rcIcon = CFX_FloatRect(rcLabel.right, rcBBox.bottom, rcBBox.right,
-                                   rcBBox.top);
+            rcLabel =
+                CPDF_Rect(rcBBox.left, rcBBox.bottom,
+                          rcBBox.left + fWidth * fAutoFontScale, rcBBox.top);
+            rcIcon = CPDF_Rect(rcLabel.right, rcBBox.bottom, rcBBox.right,
+                               rcBBox.top);
 
             if (rcLabelContent.Width() < fWidth * fAutoFontScale) {
             } else {
               if (rcLabelContent.Width() < fWidth) {
-                rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.bottom,
-                                        rcBBox.left + rcLabelContent.Width(),
-                                        rcBBox.top);
-                rcIcon = CFX_FloatRect(rcLabel.right, rcBBox.bottom,
-                                       rcBBox.right, rcBBox.top);
+                rcLabel =
+                    CPDF_Rect(rcBBox.left, rcBBox.bottom,
+                              rcBBox.left + rcLabelContent.Width(), rcBBox.top);
+                rcIcon = CPDF_Rect(rcLabel.right, rcBBox.bottom, rcBBox.right,
+                                   rcBBox.top);
               } else {
                 rcLabel = rcBBox;
-                rcIcon = CFX_FloatRect(0, 0, 0, 0);
+                rcIcon = CPDF_Rect(0, 0, 0, 0);
               }
             }
           } else {
             fWidth = rcLabelContent.Width();
 
             if (rcBBox.left + fWidth > rcBBox.right) {
               rcLabel = rcBBox;
-              rcIcon = CFX_FloatRect(0, 0, 0, 0);
+              rcIcon = CPDF_Rect(0, 0, 0, 0);
             } else {
-              rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.bottom,
-                                      rcBBox.left + fWidth, rcBBox.top);
-              rcIcon = CFX_FloatRect(rcLabel.right, rcBBox.bottom, rcBBox.right,
-                                     rcBBox.top);
+              rcLabel = CPDF_Rect(rcBBox.left, rcBBox.bottom,
+                                  rcBBox.left + fWidth, rcBBox.top);
+              rcIcon = CPDF_Rect(rcLabel.right, rcBBox.bottom, rcBBox.right,
+                                 rcBBox.top);
             }
           }
         } else {
           rcLabel = rcBBox;
-          rcIcon = CFX_FloatRect(0, 0, 0, 0);
+          rcIcon = CPDF_Rect(0, 0, 0, 0);
         }
 
         break;
       case PPBL_LABELOVERICON:
         rcLabel = rcBBox;
         rcIcon = rcBBox;
         break;
     }
 
     CFX_ByteTextBuf sAppStream, sTemp;
 
     if (!rcIcon.IsEmpty()) {
       Icon.Move(rcIcon, FALSE, FALSE);
       sTemp << Icon.GetImageAppStream();
     }
 
     Icon.Destroy();
 
     if (!rcLabel.IsEmpty()) {
       pEdit->SetPlateRect(rcLabel);
       CFX_ByteString sEdit =
-          CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, 0.0f));
+          CPWL_Utils::GetEditAppStream(pEdit, CPDF_Point(0.0f, 0.0f));
       if (sEdit.GetLength() > 0) {
         sTemp << "BT\n" << CPWL_Utils::GetColorAppStream(crText) << sEdit
               << "ET\n";
       }
     }
 
     IFX_Edit::DelEdit(pEdit);
 
     if (sTemp.GetSize() > 0) {
       sAppStream << "q\n" << rcBBox.left << " " << rcBBox.bottom << " "
@@ skipping 25 matching lines @@
     case COLORTYPE_CMYK:
       sColorStream << color.fColor1 << " " << color.fColor2 << " "
                    << color.fColor3 << " " << color.fColor4 << " "
                    << (bFillOrStroke ? "k" : "K") << "\n";
       break;
   }
 
   return sColorStream.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetBorderAppStream(const CFX_FloatRect& rect,
+CFX_ByteString CPWL_Utils::GetBorderAppStream(const CPDF_Rect& rect,
                                               FX_FLOAT fWidth,
                                               const CPWL_Color& color,
                                               const CPWL_Color& crLeftTop,
                                               const CPWL_Color& crRightBottom,
                                               int32_t nStyle,
                                               const CPWL_Dash& dash) {
   CFX_ByteTextBuf sAppStream;
   CFX_ByteString sColor;
 
   FX_FLOAT fLeft = rect.left;
@@ skipping 96 matching lines @@
         break;
     }
 
     sAppStream << "Q\n";
   }
 
   return sAppStream.GetByteString();
 }
 
 CFX_ByteString CPWL_Utils::GetCircleBorderAppStream(
-    const CFX_FloatRect& rect,
+    const CPDF_Rect& rect,
     FX_FLOAT fWidth,
     const CPWL_Color& color,
     const CPWL_Color& crLeftTop,
     const CPWL_Color& crRightBottom,
     int32_t nStyle,
     const CPWL_Dash& dash) {
   CFX_ByteTextBuf sAppStream;
   CFX_ByteString sColor;
 
   if (fWidth > 0.0f) {
@@ skipping 128 matching lines @@
       sRet.fColor1 /= fColorDevide;
       sRet.fColor2 /= fColorDevide;
       sRet.fColor3 /= fColorDevide;
       sRet.fColor4 /= fColorDevide;
       break;
   }
 
   return sRet;
 }
 
-CFX_ByteString CPWL_Utils::GetAppStream_Check(const CFX_FloatRect& rcBBox,
+CFX_ByteString CPWL_Utils::GetAppStream_Check(const CPDF_Rect& rcBBox,
                                               const CPWL_Color& crText) {
   CFX_ByteTextBuf sAP;
   sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, TRUE)
       << CPWL_Utils::GetAP_Check(rcBBox) << "f\nQ\n";
   return sAP.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetAppStream_Circle(const CFX_FloatRect& rcBBox,
+CFX_ByteString CPWL_Utils::GetAppStream_Circle(const CPDF_Rect& rcBBox,
                                                const CPWL_Color& crText) {
   CFX_ByteTextBuf sAP;
   sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, TRUE)
       << CPWL_Utils::GetAP_Circle(rcBBox) << "f\nQ\n";
   return sAP.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetAppStream_Cross(const CFX_FloatRect& rcBBox,
+CFX_ByteString CPWL_Utils::GetAppStream_Cross(const CPDF_Rect& rcBBox,
                                               const CPWL_Color& crText) {
   CFX_ByteTextBuf sAP;
   sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, FALSE)
       << CPWL_Utils::GetAP_Cross(rcBBox) << "S\nQ\n";
   return sAP.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetAppStream_Diamond(const CFX_FloatRect& rcBBox,
+CFX_ByteString CPWL_Utils::GetAppStream_Diamond(const CPDF_Rect& rcBBox,
                                                 const CPWL_Color& crText) {
   CFX_ByteTextBuf sAP;
   sAP << "q\n1 w\n" << CPWL_Utils::GetColorAppStream(crText, TRUE)
       << CPWL_Utils::GetAP_Diamond(rcBBox) << "f\nQ\n";
   return sAP.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetAppStream_Square(const CFX_FloatRect& rcBBox,
+CFX_ByteString CPWL_Utils::GetAppStream_Square(const CPDF_Rect& rcBBox,
                                                const CPWL_Color& crText) {
   CFX_ByteTextBuf sAP;
   sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, TRUE)
       << CPWL_Utils::GetAP_Square(rcBBox) << "f\nQ\n";
   return sAP.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetAppStream_Star(const CFX_FloatRect& rcBBox,
+CFX_ByteString CPWL_Utils::GetAppStream_Star(const CPDF_Rect& rcBBox,
                                              const CPWL_Color& crText) {
   CFX_ByteTextBuf sAP;
   sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, TRUE)
       << CPWL_Utils::GetAP_Star(rcBBox) << "f\nQ\n";
   return sAP.GetByteString();
 }
 
-CFX_ByteString CPWL_Utils::GetCheckBoxAppStream(const CFX_FloatRect& rcBBox,
+CFX_ByteString CPWL_Utils::GetCheckBoxAppStream(const CPDF_Rect& rcBBox,
                                                 int32_t nStyle,
                                                 const CPWL_Color& crText) {
-  CFX_FloatRect rcCenter = GetCenterSquare(rcBBox);
+  CPDF_Rect rcCenter = GetCenterSquare(rcBBox);
   switch (nStyle) {
     default:
     case PCS_CHECK:
       return GetAppStream_Check(rcCenter, crText);
     case PCS_CIRCLE:
       return GetAppStream_Circle(ScaleRect(rcCenter, 2.0f / 3.0f), crText);
     case PCS_CROSS:
       return GetAppStream_Cross(rcCenter, crText);
     case PCS_DIAMOND:
       return GetAppStream_Diamond(ScaleRect(rcCenter, 2.0f / 3.0f), crText);
     case PCS_SQUARE:
       return GetAppStream_Square(ScaleRect(rcCenter, 2.0f / 3.0f), crText);
     case PCS_STAR:
       return GetAppStream_Star(ScaleRect(rcCenter, 2.0f / 3.0f), crText);
   }
 }
 
-CFX_ByteString CPWL_Utils::GetRadioButtonAppStream(const CFX_FloatRect& rcBBox,
+CFX_ByteString CPWL_Utils::GetRadioButtonAppStream(const CPDF_Rect& rcBBox,
                                                    int32_t nStyle,
                                                    const CPWL_Color& crText) {
-  CFX_FloatRect rcCenter = GetCenterSquare(rcBBox);
+  CPDF_Rect rcCenter = GetCenterSquare(rcBBox);
   switch (nStyle) {
     default:
     case PCS_CHECK:
       return GetAppStream_Check(rcCenter, crText);
     case PCS_CIRCLE:
       return GetAppStream_Circle(ScaleRect(rcCenter, 1.0f / 2.0f), crText);
     case PCS_CROSS:
       return GetAppStream_Cross(rcCenter, crText);
     case PCS_DIAMOND:
       return GetAppStream_Diamond(ScaleRect(rcCenter, 2.0f / 3.0f), crText);
     case PCS_SQUARE:
       return GetAppStream_Square(ScaleRect(rcCenter, 2.0f / 3.0f), crText);
     case PCS_STAR:
       return GetAppStream_Star(ScaleRect(rcCenter, 2.0f / 3.0f), crText);
   }
 }
 
-CFX_ByteString CPWL_Utils::GetDropButtonAppStream(const CFX_FloatRect& rcBBox) {
+CFX_ByteString CPWL_Utils::GetDropButtonAppStream(const CPDF_Rect& rcBBox) {
   CFX_ByteTextBuf sAppStream;
 
   if (!rcBBox.IsEmpty()) {
     sAppStream << "q\n" << CPWL_Utils::GetColorAppStream(
                                CPWL_Color(COLORTYPE_RGB, 220.0f / 255.0f,
                                           220.0f / 255.0f, 220.0f / 255.0f),
                                TRUE);
     sAppStream << rcBBox.left << " " << rcBBox.bottom << " "
                << rcBBox.right - rcBBox.left << " "
                << rcBBox.top - rcBBox.bottom << " re f\n";
     sAppStream << "Q\n";
 
     sAppStream << "q\n" << CPWL_Utils::GetBorderAppStream(
                                rcBBox, 2, CPWL_Color(COLORTYPE_GRAY, 0),
                                CPWL_Color(COLORTYPE_GRAY, 1),
                                CPWL_Color(COLORTYPE_GRAY, 0.5), PBS_BEVELED,
                                CPWL_Dash(3, 0, 0))
                << "Q\n";
 
-    CFX_FloatPoint ptCenter = CFX_FloatPoint((rcBBox.left + rcBBox.right) / 2,
-                                             (rcBBox.top + rcBBox.bottom) / 2);
+    CPDF_Point ptCenter = CPDF_Point((rcBBox.left + rcBBox.right) / 2,
+                                     (rcBBox.top + rcBBox.bottom) / 2);
     if (IsFloatBigger(rcBBox.right - rcBBox.left, 6) &&
         IsFloatBigger(rcBBox.top - rcBBox.bottom, 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 << "Q\n";
     }
@@ skipping 109 matching lines @@
   FX_FLOAT dBlue = 0;
 
   PWLColorToARGB(color, nAlpha, dRed, dGreen, dBlue);
 
   return ArgbEncode(nAlpha, (int32_t)(dRed * 255), (int32_t)(dGreen * 255),
                     (int32_t)(dBlue * 255));
 }
 
 void CPWL_Utils::DrawFillRect(CFX_RenderDevice* pDevice,
                               CFX_Matrix* pUser2Device,
-                              const CFX_FloatRect& rect,
+                              const CPDF_Rect& rect,
                               const FX_COLORREF& color) {
   CFX_PathData path;
-  CFX_FloatRect rcTemp(rect);
+  CPDF_Rect rcTemp(rect);
   path.AppendRect(rcTemp.left, rcTemp.bottom, rcTemp.right, rcTemp.top);
   pDevice->DrawPath(&path, pUser2Device, NULL, color, 0, FXFILL_WINDING);
 }
 
 void CPWL_Utils::DrawFillArea(CFX_RenderDevice* pDevice,
                               CFX_Matrix* pUser2Device,
-                              const CFX_FloatPoint* pPts,
+                              const CPDF_Point* pPts,
                               int32_t nCount,
                               const FX_COLORREF& color) {
   CFX_PathData path;
   path.SetPointCount(nCount);
 
   path.SetPoint(0, pPts[0].x, pPts[0].y, FXPT_MOVETO);
   for (int32_t i = 1; i < nCount; i++)
     path.SetPoint(i, pPts[i].x, pPts[i].y, FXPT_LINETO);
 
   pDevice->DrawPath(&path, pUser2Device, NULL, color, 0, FXFILL_ALTERNATE);
 }
 
 void CPWL_Utils::DrawStrokeRect(CFX_RenderDevice* pDevice,
                                 CFX_Matrix* pUser2Device,
-                                const CFX_FloatRect& rect,
+                                const CPDF_Rect& rect,
                                 const FX_COLORREF& color,
                                 FX_FLOAT fWidth) {
   CFX_PathData path;
-  CFX_FloatRect rcTemp(rect);
+  CPDF_Rect rcTemp(rect);
   path.AppendRect(rcTemp.left, rcTemp.bottom, rcTemp.right, rcTemp.top);
 
   CFX_GraphStateData gsd;
   gsd.m_LineWidth = fWidth;
 
   pDevice->DrawPath(&path, pUser2Device, &gsd, 0, color, FXFILL_ALTERNATE);
 }
 
 void CPWL_Utils::DrawStrokeLine(CFX_RenderDevice* pDevice,
                                 CFX_Matrix* pUser2Device,
-                                const CFX_FloatPoint& ptMoveTo,
-                                const CFX_FloatPoint& ptLineTo,
+                                const CPDF_Point& ptMoveTo,
+                                const CPDF_Point& ptLineTo,
                                 const FX_COLORREF& color,
                                 FX_FLOAT fWidth) {
   CFX_PathData path;
   path.SetPointCount(2);
   path.SetPoint(0, ptMoveTo.x, ptMoveTo.y, FXPT_MOVETO);
   path.SetPoint(1, ptLineTo.x, ptLineTo.y, FXPT_LINETO);
 
   CFX_GraphStateData gsd;
   gsd.m_LineWidth = fWidth;
 
   pDevice->DrawPath(&path, pUser2Device, &gsd, 0, color, FXFILL_ALTERNATE);
 }
 
 void CPWL_Utils::DrawFillRect(CFX_RenderDevice* pDevice,
                               CFX_Matrix* pUser2Device,
-                              const CFX_FloatRect& rect,
+                              const CPDF_Rect& rect,
                               const CPWL_Color& color,
                               int32_t nTransparancy) {
   CPWL_Utils::DrawFillRect(pDevice, pUser2Device, rect,
                            PWLColorToFXColor(color, nTransparancy));
 }
 
 void CPWL_Utils::DrawShadow(CFX_RenderDevice* pDevice,
                             CFX_Matrix* pUser2Device,
                             FX_BOOL bVertical,
                             FX_BOOL bHorizontal,
-                            CFX_FloatRect rect,
+                            CPDF_Rect rect,
                             int32_t nTransparancy,
                             int32_t nStartGray,
                             int32_t nEndGray) {
   FX_FLOAT fStepGray = 1.0f;
 
   if (bVertical) {
     fStepGray = (nEndGray - nStartGray) / rect.Height();
 
     for (FX_FLOAT fy = rect.bottom + 0.5f; fy <= rect.top - 0.5f; fy += 1.0f) {
       int32_t nGray = nStartGray + (int32_t)(fStepGray * (fy - rect.bottom));
       CPWL_Utils::DrawStrokeLine(
-          pDevice, pUser2Device, CFX_FloatPoint(rect.left, fy),
-          CFX_FloatPoint(rect.right, fy),
+          pDevice, pUser2Device, CPDF_Point(rect.left, fy),
+          CPDF_Point(rect.right, fy),
           ArgbEncode(nTransparancy, nGray, nGray, nGray), 1.5f);
     }
   }
 
   if (bHorizontal) {
     fStepGray = (nEndGray - nStartGray) / rect.Width();
 
     for (FX_FLOAT fx = rect.left + 0.5f; fx <= rect.right - 0.5f; fx += 1.0f) {
       int32_t nGray = nStartGray + (int32_t)(fStepGray * (fx - rect.left));
       CPWL_Utils::DrawStrokeLine(
-          pDevice, pUser2Device, CFX_FloatPoint(fx, rect.bottom),
-          CFX_FloatPoint(fx, rect.top),
+          pDevice, pUser2Device, CPDF_Point(fx, rect.bottom),
+          CPDF_Point(fx, rect.top),
           ArgbEncode(nTransparancy, nGray, nGray, nGray), 1.5f);
     }
   }
 }
 
 void CPWL_Utils::DrawBorder(CFX_RenderDevice* pDevice,
                             CFX_Matrix* pUser2Device,
-                            const CFX_FloatRect& rect,
+                            const CPDF_Rect& rect,
                             FX_FLOAT fWidth,
                             const CPWL_Color& color,
                             const CPWL_Color& crLeftTop,
                             const CPWL_Color& crRightBottom,
                             int32_t nStyle,
                             int32_t nTransparancy) {
   FX_FLOAT fLeft = rect.left;
   FX_FLOAT fRight = rect.right;
   FX_FLOAT fTop = rect.top;
   FX_FLOAT fBottom = rect.bottom;
@@ skipping 186 matching lines @@
 
       if (bBreak)
         break;
     } while (pIterator->NextLine());
   }
 }
 
 void CPWL_Utils::DrawEditSpellCheck(CFX_RenderDevice* pDevice,
                                     CFX_Matrix* pUser2Device,
                                     IFX_Edit* pEdit,
-                                    const CFX_FloatRect& rcClip,
-                                    const CFX_FloatPoint& ptOffset,
+                                    const CPDF_Rect& rcClip,
+                                    const CPDF_Point& ptOffset,
                                     const CPVT_WordRange* pRange,
                                     IPWL_SpellCheck* pSpellCheck) {
   const FX_COLORREF crSpell = ArgbEncode(255, 255, 0, 0);
 
   // for spellcheck
   FX_BOOL bLatinWord = FALSE;
   CPVT_WordPlace wpWordStart;
   CFX_ByteString sLatinWord;
 
   CFX_PathData pathSpell;
 
   pDevice->SaveState();
 
   if (!rcClip.IsEmpty()) {
-    CFX_FloatRect rcTemp = rcClip;
+    CPDF_Rect rcTemp = rcClip;
     pUser2Device->TransformRect(rcTemp);
     FX_RECT rcDevClip;
     rcDevClip.left = (int32_t)rcTemp.left;
     rcDevClip.right = (int32_t)rcTemp.right;
     rcDevClip.top = (int32_t)rcTemp.top;
     rcDevClip.bottom = (int32_t)rcTemp.bottom;
     pDevice->SetClip_Rect(&rcDevClip);
   }
 
   if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator()) {
@@ skipping 102 matching lines @@
       crRet.fColor2 = 1.0f - crRet.fColor2;
       crRet.fColor3 = 1.0f - crRet.fColor3;
       crRet.fColor4 = 1.0f - crRet.fColor4;
       break;
   }
 
   return crRet;
 }
 
 CFX_ByteString CPWL_Utils::GetIconAppStream(int32_t nType,
-                                            const CFX_FloatRect& rect,
+                                            const CPDF_Rect& rect,
                                             const CPWL_Color& crFill,
                                             const CPWL_Color& crStroke) {
   CFX_ByteString sAppStream = CPWL_Utils::GetColorAppStream(crStroke, FALSE);
   sAppStream += CPWL_Utils::GetColorAppStream(crFill, TRUE);
 
   CFX_ByteString sPath;
   CFX_PathData path;
 
   switch (nType) {
     case PWL_ICONTYPE_CHECKMARK:
@@ skipping 63 matching lines @@
     sAppStream += "B*\n";
   else
     sAppStream += "f*\n";
 
   return sAppStream;
 }
 
 void CPWL_Utils::DrawIconAppStream(CFX_RenderDevice* pDevice,
                                    CFX_Matrix* pUser2Device,
                                    int32_t nType,
-                                   const CFX_FloatRect& rect,
+                                   const CPDF_Rect& rect,
                                    const CPWL_Color& crFill,
                                    const CPWL_Color& crStroke,
                                    const int32_t nTransparancy) {
   CFX_GraphStateData gsd;
   gsd.m_LineWidth = 1.0f;
 
   CFX_ByteString sPath;
   CFX_PathData path;
 
   switch (nType) {
@@ skipping 61 matching lines @@
       return;
   }
 
   pDevice->DrawPath(
       &path, pUser2Device, &gsd, PWLColorToFXColor(crFill, nTransparancy),
       PWLColorToFXColor(crStroke, nTransparancy), FXFILL_ALTERNATE);
 }
 
 void CPWL_Utils::GetGraphics_Checkmark(CFX_ByteString& sPathData,
                                        CFX_PathData& path,
-                                       const CFX_FloatRect& crBBox,
+                                       const CPDF_Rect& crBBox,
                                        const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(CPWL_Point(crBBox.left + fWidth / 15.0f,
                                crBBox.bottom + fHeight * 2 / 5.0f),
                     PWLPT_MOVETO),
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth / 15.0f +
@@ skipping 66 matching lines @@
                     PWLPT_BEZIERTO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 16);
   else
     GetPathDataFromArray(path, PathArray, 16);
 }
 
 void CPWL_Utils::GetGraphics_Circle(CFX_ByteString& sPathData,
                                     CFX_PathData& path,
-                                    const CFX_FloatRect& crBBox,
+                                    const CPDF_Rect& crBBox,
                                     const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(CPWL_Point(crBBox.left + fWidth / 15.0f,
                                crBBox.bottom + fHeight / 2.0f),
                     PWLPT_MOVETO),
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth / 15.0f,
@@ skipping 102 matching lines @@
                     PWLPT_BEZIERTO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 26);
   else
     GetPathDataFromArray(path, PathArray, 26);
 }
 
 void CPWL_Utils::GetGraphics_Comment(CFX_ByteString& sPathData,
                                      CFX_PathData& path,
-                                     const CFX_FloatRect& crBBox,
+                                     const CPDF_Rect& crBBox,
                                      const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth / 15.0f, crBBox.top - fHeight / 6.0f),
           PWLPT_MOVETO),
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth / 15.0f,
@@ skipping 98 matching lines @@
                     PWLPT_LINETO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 30);
   else
     GetPathDataFromArray(path, PathArray, 30);
 }
 
 void CPWL_Utils::GetGraphics_Cross(CFX_ByteString& sPathData,
                                    CFX_PathData& path,
-                                   const CFX_FloatRect& crBBox,
+                                   const CPDF_Rect& crBBox,
                                    const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
   CPWL_Point center_point(crBBox.left + fWidth / 2,
                           crBBox.bottom + fHeight / 2);
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(
           CPWL_Point(center_point.x, center_point.y + fHeight / 10.0f),
           PWLPT_MOVETO),
@@ skipping 36 matching lines @@
           PWLPT_LINETO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 13);
   else
     GetPathDataFromArray(path, PathArray, 13);
 }
 
 void CPWL_Utils::GetGraphics_Help(CFX_ByteString& sPathData,
                                   CFX_PathData& path,
-                                  const CFX_FloatRect& crBBox,
+                                  const CPDF_Rect& crBBox,
                                   const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(CPWL_Point(crBBox.left + fWidth / 60.0f,
                                crBBox.bottom + fHeight / 2.0f),
                     PWLPT_MOVETO),
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth / 60.0f,
@@ skipping 209 matching lines @@
                     PWLPT_BEZIERTO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 59);
   else
     GetPathDataFromArray(path, PathArray, 59);
 }
 
 void CPWL_Utils::GetGraphics_InsertText(CFX_ByteString& sPathData,
                                         CFX_PathData& path,
-                                        const CFX_FloatRect& crBBox,
+                                        const CPDF_Rect& crBBox,
                                         const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth / 10, crBBox.bottom + fHeight / 10),
           PWLPT_MOVETO),
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth / 2, crBBox.top - fHeight * 2 / 15),
           PWLPT_LINETO),
       CPWL_PathData(
           CPWL_Point(crBBox.right - fWidth / 10, crBBox.bottom + fHeight / 10),
           PWLPT_LINETO),
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth / 10, crBBox.bottom + fHeight / 10),
           PWLPT_LINETO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 4);
   else
     GetPathDataFromArray(path, PathArray, 4);
 }
 
 void CPWL_Utils::GetGraphics_Key(CFX_ByteString& sPathData,
                                  CFX_PathData& path,
-                                 const CFX_FloatRect& crBBox,
+                                 const CPDF_Rect& crBBox,
                                  const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
   FX_FLOAT k = -fHeight / fWidth;
   CPWL_Point tail;
   CPWL_Point CicleCenter;
   tail.x = crBBox.left + fWidth * 0.9f;
   tail.y = k * (tail.x - crBBox.right) + crBBox.bottom;
   CicleCenter.x = crBBox.left + fWidth * 0.15f;
   CicleCenter.y = k * (CicleCenter.x - crBBox.right) + crBBox.bottom;
@@ skipping 110 matching lines @@
                     PWLPT_BEZIERTO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 28);
   else
     GetPathDataFromArray(path, PathArray, 28);
 }
 
 void CPWL_Utils::GetGraphics_NewParagraph(CFX_ByteString& sPathData,
                                           CFX_PathData& path,
-                                          const CFX_FloatRect& crBBox,
+                                          const CPDF_Rect& crBBox,
                                           const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth / 2.0f, crBBox.top - fHeight / 20.0f),
           PWLPT_MOVETO),
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth / 10.0f, crBBox.top - fHeight / 2.0f),
@@ skipping 83 matching lines @@
                     PWLPT_LINETO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 28);
   else
     GetPathDataFromArray(path, PathArray, 28);
 }
 
 void CPWL_Utils::GetGraphics_TextNote(CFX_ByteString& sPathData,
                                       CFX_PathData& path,
-                                      const CFX_FloatRect& crBBox,
+                                      const CPDF_Rect& crBBox,
                                       const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(CPWL_Point(crBBox.right - fWidth * 3 / 10.0f,
                                crBBox.bottom + fHeight / 15.0f),
                     PWLPT_MOVETO),
       CPWL_PathData(CPWL_Point(crBBox.left + fWidth * 7 / 10.0f,
                                crBBox.bottom + fHeight * 4 / 15.0f),
@@ skipping 45 matching lines @@
                     PWLPT_LINETO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 17);
   else
     GetPathDataFromArray(path, PathArray, 17);
 }
 
 void CPWL_Utils::GetGraphics_Paragraph(CFX_ByteString& sPathData,
                                        CFX_PathData& path,
-                                       const CFX_FloatRect& crBBox,
+                                       const CPDF_Rect& crBBox,
                                        const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth / 2.0f, crBBox.top - fHeight / 15.0f),
           PWLPT_MOVETO),
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth * 0.7f, crBBox.top - fHeight / 15.0f),
@@ skipping 30 matching lines @@
           PWLPT_BEZIERTO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 12);
   else
     GetPathDataFromArray(path, PathArray, 12);
 }
 
 void CPWL_Utils::GetGraphics_RightArrow(CFX_ByteString& sPathData,
                                         CFX_PathData& path,
-                                        const CFX_FloatRect& crBBox,
+                                        const CPDF_Rect& crBBox,
                                         const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(CPWL_Point(crBBox.right - fWidth / 15.0f,
                                crBBox.top - fHeight / 2.0f),
                     PWLPT_MOVETO),
       CPWL_PathData(CPWL_Point(crBBox.left + fWidth / 2.0f + fWidth / 8.0f,
                                crBBox.bottom + fHeight / 5.0f),
@@ skipping 24 matching lines @@
                     PWLPT_LINETO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 10);
   else
     GetPathDataFromArray(path, PathArray, 10);
 }
 
 void CPWL_Utils::GetGraphics_RightPointer(CFX_ByteString& sPathData,
                                           CFX_PathData& path,
-                                          const CFX_FloatRect& crBBox,
+                                          const CPDF_Rect& crBBox,
                                           const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(CPWL_Point(crBBox.right - fWidth / 30.0f,
                                crBBox.top - fHeight / 2.0f),
                     PWLPT_MOVETO),
       CPWL_PathData(CPWL_Point(crBBox.left + fWidth / 30.0f,
                                crBBox.bottom + fHeight / 6.0f),
                     PWLPT_LINETO),
       CPWL_PathData(CPWL_Point(crBBox.left + fWidth * 4 / 15.0f,
                                crBBox.top - fHeight / 2.0f),
                     PWLPT_LINETO),
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth / 30.0f, crBBox.top - fHeight / 6.0f),
           PWLPT_LINETO),
       CPWL_PathData(CPWL_Point(crBBox.right - fWidth / 30.0f,
                                crBBox.top - fHeight / 2.0f),
                     PWLPT_LINETO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 5);
   else
     GetPathDataFromArray(path, PathArray, 5);
 }
 
 void CPWL_Utils::GetGraphics_Star(CFX_ByteString& sPathData,
                                   CFX_PathData& path,
-                                  const CFX_FloatRect& crBBox,
+                                  const CPDF_Rect& crBBox,
                                   const PWL_PATH_TYPE type) {
   FX_FLOAT fLongRadius =
       (crBBox.top - crBBox.bottom) / (1 + (FX_FLOAT)cos(FX_PI / 5.0f));
   fLongRadius = fLongRadius * 0.7f;
   FX_FLOAT fShortRadius = fLongRadius * 0.55f;
-  CFX_FloatPoint ptCenter = CFX_FloatPoint((crBBox.left + crBBox.right) / 2.0f,
-                                           (crBBox.top + crBBox.bottom) / 2.0f);
+  CPDF_Point ptCenter = CPDF_Point((crBBox.left + crBBox.right) / 2.0f,
+                                   (crBBox.top + crBBox.bottom) / 2.0f);
 
   FX_FLOAT px1[5], py1[5];
   FX_FLOAT px2[5], py2[5];
 
   FX_FLOAT fAngel = FX_PI / 10.0f;
 
   for (int32_t i = 0; i < 5; i++) {
     px1[i] = ptCenter.x + fLongRadius * (FX_FLOAT)cos(fAngel);
     py1[i] = ptCenter.y + fLongRadius * (FX_FLOAT)sin(fAngel);
 
@@ skipping 23 matching lines @@
   PathArray[10] = CPWL_PathData(CPWL_Point(px1[0], py1[0]), PWLPT_LINETO);
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 11);
   else
     GetPathDataFromArray(path, PathArray, 11);
 }
 
 void CPWL_Utils::GetGraphics_UpArrow(CFX_ByteString& sPathData,
                                      CFX_PathData& path,
-                                     const CFX_FloatRect& crBBox,
+                                     const CPDF_Rect& crBBox,
                                      const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth / 2.0f, crBBox.top - fHeight / 15.0f),
           PWLPT_MOVETO),
       CPWL_PathData(CPWL_Point(crBBox.right - fWidth / 10.0f,
                                crBBox.top - fWidth * 3 / 5.0f),
@@ skipping 18 matching lines @@
           PWLPT_LINETO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 8);
   else
     GetPathDataFromArray(path, PathArray, 8);
 }
 
 void CPWL_Utils::GetGraphics_UpLeftArrow(CFX_ByteString& sPathData,
                                          CFX_PathData& path,
-                                         const CFX_FloatRect& crBBox,
+                                         const CPDF_Rect& crBBox,
                                          const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
   CPWL_Point leftup(crBBox.left, crBBox.top);
   CPWL_Point rightdown(crBBox.right, crBBox.bottom);
   FX_FLOAT k = -fHeight / fWidth;
   CPWL_Point tail;
   tail.x = crBBox.left + fWidth * 4 / 5.0f;
   tail.y = k * (tail.x - crBBox.right) + rightdown.y;
 
@@ skipping 34 matching lines @@
           PWLPT_LINETO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 8);
   else
     GetPathDataFromArray(path, PathArray, 8);
 }
 
 void CPWL_Utils::GetGraphics_Graph(CFX_ByteString& sPathData,
                                    CFX_PathData& path,
-                                   const CFX_FloatRect& crBBox,
+                                   const CPDF_Rect& crBBox,
                                    const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth * 0.05f, crBBox.top - fWidth * 0.15f),
           PWLPT_MOVETO),
       CPWL_PathData(CPWL_Point(crBBox.left + fWidth * 0.25f,
                                crBBox.top - fHeight * 0.15f),
@@ skipping 57 matching lines @@
                     PWLPT_LINETO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 20);
   else
     GetPathDataFromArray(path, PathArray, 20);
 }
 
 void CPWL_Utils::GetGraphics_Paperclip(CFX_ByteString& sPathData,
                                        CFX_PathData& path,
-                                       const CFX_FloatRect& crBBox,
+                                       const CPDF_Rect& crBBox,
                                        const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth / 60, crBBox.top - fHeight * 0.25f),
           PWLPT_MOVETO),
       CPWL_PathData(CPWL_Point(crBBox.left + fWidth / 60,
                                crBBox.bottom + fHeight * 0.25f),
@@ skipping 122 matching lines @@
           PWLPT_BEZIERTO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 33);
   else
     GetPathDataFromArray(path, PathArray, 33);
 }
 
 void CPWL_Utils::GetGraphics_Attachment(CFX_ByteString& sPathData,
                                         CFX_PathData& path,
-                                        const CFX_FloatRect& crBBox,
+                                        const CPDF_Rect& crBBox,
                                         const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth * 0.25f, crBBox.top - fHeight * 0.1f),
           PWLPT_MOVETO),
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth * 0.4f, crBBox.top - fHeight * 0.23f),
@@ skipping 75 matching lines @@
                     PWLPT_LINETO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 24);
   else
     GetPathDataFromArray(path, PathArray, 24);
 }
 
 void CPWL_Utils::GetGraphics_Tag(CFX_ByteString& sPathData,
                                  CFX_PathData& path,
-                                 const CFX_FloatRect& crBBox,
+                                 const CPDF_Rect& crBBox,
                                  const PWL_PATH_TYPE type) {
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth * 0.4f, crBBox.top - fHeight * 0.1f),
           PWLPT_MOVETO),
       CPWL_PathData(
           CPWL_Point(crBBox.left + fWidth * 0.1f, crBBox.top - fHeight * 0.5f),
@@ skipping 30 matching lines @@
           PWLPT_LINETO)};
 
   if (type == PWLPT_STREAM)
     sPathData = GetAppStreamFromArray(PathArray, 12);
   else
     GetPathDataFromArray(path, PathArray, 12);
 }
 
 void CPWL_Utils::GetGraphics_Foxit(CFX_ByteString& sPathData,
                                    CFX_PathData& path,
-                                   const CFX_FloatRect& crBBox,
+                                   const CPDF_Rect& crBBox,
                                    const PWL_PATH_TYPE type) {
   FX_FLOAT fOutWidth = crBBox.right - crBBox.left;
   FX_FLOAT fOutHeight = crBBox.top - crBBox.bottom;
 
-  CFX_FloatRect crInBox = crBBox;
+  CPDF_Rect crInBox = crBBox;
   crInBox.left = crBBox.left + fOutWidth * 0.08f;
   crInBox.right = crBBox.right - fOutWidth * 0.08f;
   crInBox.top = crBBox.top - fOutHeight * 0.08f;
   crInBox.bottom = crBBox.bottom + fOutHeight * 0.08f;
 
   FX_FLOAT fWidth = crInBox.right - crInBox.left;
   FX_FLOAT fHeight = crInBox.top - crInBox.bottom;
 
   CPWL_PathData PathArray[] = {
       CPWL_PathData(CPWL_Point(crInBox.left, crInBox.top), PWLPT_MOVETO),
@@ skipping 92 matching lines @@
           break;
         case COLORTYPE_RGB:
           CPWL_Utils::ConvertCMYK2RGB(fColor1, fColor2, fColor3, fColor4,
                                       fColor1, fColor2, fColor3);
           break;
       }
       break;
   }
   nColorType = other_nColorType;
 }