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

fpdfsdk/src/fsdk_baseform.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/fsdk_baseform.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 798 matching lines @@
                                     CPDF_Annot::AppearanceMode mode,
                                     const CPDF_RenderOptions* pOptions) {
   int nFieldType = GetFieldType();
 
   if ((nFieldType == FIELDTYPE_CHECKBOX ||
        nFieldType == FIELDTYPE_RADIOBUTTON) &&
       mode == CPDF_Annot::Normal &&
       !IsWidgetAppearanceValid(CPDF_Annot::Normal)) {
     CFX_PathData pathData;
 
-    CPDF_Rect rcAnnot = GetRect();
+    CFX_FloatRect rcAnnot = GetRect();
 
     pathData.AppendRect(rcAnnot.left, rcAnnot.bottom, rcAnnot.right,
                         rcAnnot.top);
 
     CFX_GraphStateData gsd;
     gsd.m_LineWidth = 0.0f;
 
     pDevice->DrawPath(&pathData, pUser2Device, &gsd, 0, 0xFFAAAAAA,
                       FXFILL_ALTERNATE);
   } else {
     CPDFSDK_BAAnnot::DrawAppearance(pDevice, pUser2Device, mode, pOptions);
   }
 }
 
 void CPDFSDK_Widget::UpdateField() {
   CPDF_FormField* pFormField = GetFormField();
   ASSERT(pFormField);
   m_pInterForm->UpdateField(pFormField);
 }
 
 void CPDFSDK_Widget::DrawShadow(CFX_RenderDevice* pDevice,
                                 CPDFSDK_PageView* pPageView) {
   int nFieldType = GetFieldType();
   if (m_pInterForm->IsNeedHighLight(nFieldType)) {
-    CPDF_Rect rc = GetRect();
+    CFX_FloatRect rc = GetRect();
     FX_COLORREF color = m_pInterForm->GetHighlightColor(nFieldType);
     uint8_t alpha = m_pInterForm->GetHighlightAlpha();
 
     CFX_FloatRect rcDevice;
     ASSERT(m_pInterForm->GetDocument());
     CPDFDoc_Environment* pEnv = m_pInterForm->GetDocument()->GetEnv();
     if (!pEnv)
       return;
     CFX_Matrix page2device;
     pPageView->GetCurrentMatrix(page2device);
     page2device.Transform(((FX_FLOAT)rc.left), ((FX_FLOAT)rc.bottom),
                           rcDevice.left, rcDevice.bottom);
     page2device.Transform(((FX_FLOAT)rc.right), ((FX_FLOAT)rc.top),
                           rcDevice.right, rcDevice.top);
 
     rcDevice.Normalize();
 
     FX_ARGB argb = ArgbEncode((int)alpha, color);
     FX_RECT rcDev((int)rcDevice.left, (int)rcDevice.top, (int)rcDevice.right,
                   (int)rcDevice.bottom);
     pDevice->FillRect(&rcDev, argb);
   }
 }
 
 void CPDFSDK_Widget::ResetAppearance_PushButton() {
   CPDF_FormControl* pControl = GetFormControl();
-  CPDF_Rect rcWindow = GetRotatedRect();
+  CFX_FloatRect rcWindow = GetRotatedRect();
   int32_t nLayout = 0;
   switch (pControl->GetTextPosition()) {
     case TEXTPOS_ICON:
       nLayout = PPBL_ICON;
       break;
     case TEXTPOS_BELOW:
       nLayout = PPBL_ICONTOPLABELBOTTOM;
       break;
     case TEXTPOS_ABOVE:
       nLayout = PPBL_LABELTOPICONBOTTOM;
@@ skipping 48 matching lines @@
       crRightBottom = CPWL_Color(COLORTYPE_GRAY, 0.75);
       break;
     case BBS_UNDERLINE:
       nBorderStyle = PBS_UNDERLINED;
       break;
     default:
       nBorderStyle = PBS_SOLID;
       break;
   }
 
-  CPDF_Rect rcClient = CPWL_Utils::DeflateRect(rcWindow, fBorderWidth);
+  CFX_FloatRect rcClient = CPWL_Utils::DeflateRect(rcWindow, fBorderWidth);
 
   CPWL_Color crText(COLORTYPE_GRAY, 0);
 
   FX_FLOAT fFontSize = 12.0f;
   CFX_ByteString csNameTag;
 
   CPDF_DefaultAppearance da = pControl->GetDefaultAppearance();
   if (da.HasColor()) {
     da.GetColor(iColorType, fc);
     crText = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
@@ skipping 167 matching lines @@
       crRightBottom = CPWL_Color(COLORTYPE_GRAY, 0.75);
       break;
     case BBS_UNDERLINE:
       nBorderStyle = PBS_UNDERLINED;
       break;
     default:
       nBorderStyle = PBS_SOLID;
       break;
   }
 
-  CPDF_Rect rcWindow = GetRotatedRect();
-  CPDF_Rect rcClient = CPWL_Utils::DeflateRect(rcWindow, fBorderWidth);
+  CFX_FloatRect rcWindow = GetRotatedRect();
+  CFX_FloatRect rcClient = CPWL_Utils::DeflateRect(rcWindow, fBorderWidth);
 
   CPDF_DefaultAppearance da = pControl->GetDefaultAppearance();
   if (da.HasColor()) {
     da.GetColor(iColorType, fc);
     crText = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
   }
 
   int32_t nStyle = 0;
 
   CFX_WideString csWCaption = pControl->GetNormalCaption();
@@ skipping 104 matching lines @@
       crRightBottom = CPWL_Color(COLORTYPE_GRAY, 0.75);
       break;
     case BBS_UNDERLINE:
       nBorderStyle = PBS_UNDERLINED;
       break;
     default:
       nBorderStyle = PBS_SOLID;
       break;
   }
 
-  CPDF_Rect rcWindow = GetRotatedRect();
-  CPDF_Rect rcClient = CPWL_Utils::DeflateRect(rcWindow, fBorderWidth);
+  CFX_FloatRect rcWindow = GetRotatedRect();
+  CFX_FloatRect rcClient = CPWL_Utils::DeflateRect(rcWindow, fBorderWidth);
 
   CPDF_DefaultAppearance da = pControl->GetDefaultAppearance();
   if (da.HasColor()) {
     da.GetColor(iColorType, fc);
     crText = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
   }
 
   int32_t nStyle = 0;
 
   CFX_WideString csWCaption = pControl->GetNormalCaption();
@@ skipping 17 matching lines @@
       case L'4':
         nStyle = PCS_CHECK;
         break;
     }
   } else {
     nStyle = PCS_CIRCLE;
   }
 
   CFX_ByteString csAP_N_ON;
 
-  CPDF_Rect rcCenter =
+  CFX_FloatRect rcCenter =
       CPWL_Utils::DeflateRect(CPWL_Utils::GetCenterSquare(rcWindow), 1.0f);
 
   if (nStyle == PCS_CIRCLE) {
     if (nBorderStyle == PBS_BEVELED) {
       crLeftTop = CPWL_Color(COLORTYPE_GRAY, 1);
       crRightBottom = CPWL_Utils::SubstractColor(crBackground, 0.25f);
     } else if (nBorderStyle == PBS_INSET) {
       crLeftTop = CPWL_Color(COLORTYPE_GRAY, 0.5f);
       crRightBottom = CPWL_Color(COLORTYPE_GRAY, 0.75f);
     }
@@ skipping 64 matching lines @@
   CFX_ByteString csAS = GetAppState();
   if (csAS.IsEmpty())
     SetAppState("Off");
 }
 
 void CPDFSDK_Widget::ResetAppearance_ComboBox(const FX_WCHAR* sValue) {
   CPDF_FormControl* pControl = GetFormControl();
   CPDF_FormField* pField = pControl->GetField();
   CFX_ByteTextBuf sBody, sLines;
 
-  CPDF_Rect rcClient = GetClientRect();
-  CPDF_Rect rcButton = rcClient;
+  CFX_FloatRect rcClient = GetClientRect();
+  CFX_FloatRect rcButton = rcClient;
   rcButton.left = rcButton.right - 13;
   rcButton.Normalize();
 
   if (IFX_Edit* pEdit = IFX_Edit::NewEdit()) {
     pEdit->EnableRefresh(FALSE);
 
     CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
     CPDFDoc_Environment* pEnv = pDoc->GetEnv();
     CBA_FontMap font_map(this, pEnv->GetSysHandler());
     pEdit->SetFontMap(&font_map);
 
-    CPDF_Rect rcEdit = rcClient;
+    CFX_FloatRect rcEdit = rcClient;
     rcEdit.right = rcButton.left;
     rcEdit.Normalize();
 
     pEdit->SetPlateRect(rcEdit);
     pEdit->SetAlignmentV(1);
 
     FX_FLOAT fFontSize = GetFontSize();
     if (IsFloatZero(fFontSize))
       pEdit->SetAutoFontSize(TRUE);
     else
       pEdit->SetFontSize(fFontSize);
 
     pEdit->Initialize();
 
     if (sValue) {
       pEdit->SetText(sValue);
     } else {
       int32_t nCurSel = pField->GetSelectedIndex(0);
 
       if (nCurSel < 0)
         pEdit->SetText(pField->GetValue().c_str());
       else
         pEdit->SetText(pField->GetOptionLabel(nCurSel).c_str());
     }
 
-    CPDF_Rect rcContent = pEdit->GetContentRect();
+    CFX_FloatRect rcContent = pEdit->GetContentRect();
 
     CFX_ByteString sEdit =
-        CPWL_Utils::GetEditAppStream(pEdit, CPDF_Point(0.0f, 0.0f));
+        CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, 0.0f));
     if (sEdit.GetLength() > 0) {
       sBody << "/Tx BMC\n"
             << "q\n";
       if (rcContent.Width() > rcEdit.Width() ||
           rcContent.Height() > rcEdit.Height()) {
         sBody << rcEdit.left << " " << rcEdit.bottom << " " << rcEdit.Width()
               << " " << rcEdit.Height() << " re\nW\nn\n";
       }
 
       CPWL_Color crText = GetTextPWLColor();
       sBody << "BT\n" << CPWL_Utils::GetColorAppStream(crText) << sEdit
             << "ET\n"
             << "Q\nEMC\n";
     }
 
     IFX_Edit::DelEdit(pEdit);
   }
 
   sBody << CPWL_Utils::GetDropButtonAppStream(rcButton);
 
   CFX_ByteString sAP = GetBackgroundAppStream() + GetBorderAppStream() +
                        sLines.GetByteString() + sBody.GetByteString();
 
   WriteAppearance("N", GetRotatedRect(), GetMatrix(), sAP);
 }
 
 void CPDFSDK_Widget::ResetAppearance_ListBox() {
   CPDF_FormControl* pControl = GetFormControl();
   CPDF_FormField* pField = pControl->GetField();
-  CPDF_Rect rcClient = GetClientRect();
+  CFX_FloatRect rcClient = GetClientRect();
   CFX_ByteTextBuf sBody, sLines;
 
   if (IFX_Edit* pEdit = IFX_Edit::NewEdit()) {
     pEdit->EnableRefresh(FALSE);
 
     CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
     CPDFDoc_Environment* pEnv = pDoc->GetEnv();
 
     CBA_FontMap font_map(this, pEnv->GetSysHandler());
     pEdit->SetFontMap(&font_map);
 
-    pEdit->SetPlateRect(CPDF_Rect(rcClient.left, 0.0f, rcClient.right, 0.0f));
+    pEdit->SetPlateRect(
+        CFX_FloatRect(rcClient.left, 0.0f, rcClient.right, 0.0f));
 
     FX_FLOAT fFontSize = GetFontSize();
 
     if (IsFloatZero(fFontSize))
       pEdit->SetFontSize(12.0f);
     else
       pEdit->SetFontSize(fFontSize);
 
     pEdit->Initialize();
 
     CFX_ByteTextBuf sList;
     FX_FLOAT fy = rcClient.top;
 
     int32_t nTop = pField->GetTopVisibleIndex();
     int32_t nCount = pField->CountOptions();
     int32_t nSelCount = pField->CountSelectedItems();
 
     for (int32_t i = nTop; i < nCount; i++) {
       FX_BOOL bSelected = FALSE;
       for (int32_t j = 0; j < nSelCount; j++) {
         if (pField->GetSelectedIndex(j) == i) {
           bSelected = TRUE;
           break;
         }
       }
 
       pEdit->SetText(pField->GetOptionLabel(i).c_str());
 
-      CPDF_Rect rcContent = pEdit->GetContentRect();
+      CFX_FloatRect rcContent = pEdit->GetContentRect();
       FX_FLOAT fItemHeight = rcContent.Height();
 
       if (bSelected) {
-        CPDF_Rect rcItem =
-            CPDF_Rect(rcClient.left, fy - fItemHeight, rcClient.right, fy);
+        CFX_FloatRect rcItem =
+            CFX_FloatRect(rcClient.left, fy - fItemHeight, rcClient.right, fy);
         sList << "q\n" << CPWL_Utils::GetColorAppStream(
                               CPWL_Color(COLORTYPE_RGB, 0, 51.0f / 255.0f,
                                          113.0f / 255.0f),
                               TRUE)
               << rcItem.left << " " << rcItem.bottom << " " << rcItem.Width()
               << " " << rcItem.Height() << " re f\n"
               << "Q\n";
 
         sList << "BT\n" << CPWL_Utils::GetColorAppStream(
                                CPWL_Color(COLORTYPE_GRAY, 1), TRUE)
-              << CPWL_Utils::GetEditAppStream(pEdit, CPDF_Point(0.0f, fy))
+              << CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, fy))
               << "ET\n";
       } else {
         CPWL_Color crText = GetTextPWLColor();
         sList << "BT\n" << CPWL_Utils::GetColorAppStream(crText, TRUE)
-              << CPWL_Utils::GetEditAppStream(pEdit, CPDF_Point(0.0f, fy))
+              << CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, fy))
               << "ET\n";
       }
 
       fy -= fItemHeight;
     }
 
     if (sList.GetSize() > 0) {
       sBody << "/Tx BMC\n"
             << "q\n" << rcClient.left << " " << rcClient.bottom << " "
             << rcClient.Width() << " " << rcClient.Height() << " re\nW\nn\n";
@@ skipping 16 matching lines @@
 
   if (IFX_Edit* pEdit = IFX_Edit::NewEdit()) {
     pEdit->EnableRefresh(FALSE);
 
     CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
     CPDFDoc_Environment* pEnv = pDoc->GetEnv();
 
     CBA_FontMap font_map(this, pEnv->GetSysHandler());
     pEdit->SetFontMap(&font_map);
 
-    CPDF_Rect rcClient = GetClientRect();
+    CFX_FloatRect rcClient = GetClientRect();
     pEdit->SetPlateRect(rcClient);
     pEdit->SetAlignmentH(pControl->GetControlAlignment());
 
     FX_DWORD dwFieldFlags = pField->GetFieldFlags();
     FX_BOOL bMultiLine = (dwFieldFlags >> 12) & 1;
 
     if (bMultiLine) {
       pEdit->SetMultiLine(TRUE);
       pEdit->SetAutoReturn(TRUE);
     } else {
@@ skipping 38 matching lines @@
     else
       pEdit->SetFontSize(fFontSize);
 
     pEdit->Initialize();
 
     if (sValue)
       pEdit->SetText(sValue);
     else
       pEdit->SetText(pField->GetValue().c_str());
 
-    CPDF_Rect rcContent = pEdit->GetContentRect();
+    CFX_FloatRect rcContent = pEdit->GetContentRect();
 
     CFX_ByteString sEdit = CPWL_Utils::GetEditAppStream(
-        pEdit, CPDF_Point(0.0f, 0.0f), NULL, !bCharArray, subWord);
+        pEdit, CFX_FloatPoint(0.0f, 0.0f), NULL, !bCharArray, subWord);
 
     if (sEdit.GetLength() > 0) {
       sBody << "/Tx BMC\n"
             << "q\n";
       if (rcContent.Width() > rcClient.Width() ||
           rcContent.Height() > rcClient.Height()) {
         sBody << rcClient.left << " " << rcClient.bottom << " "
               << rcClient.Width() << " " << rcClient.Height() << " re\nW\nn\n";
       }
       CPWL_Color crText = GetTextPWLColor();
@@ skipping 51 matching lines @@
     }
 
     IFX_Edit::DelEdit(pEdit);
   }
 
   CFX_ByteString sAP = GetBackgroundAppStream() + GetBorderAppStream() +
                        sLines.GetByteString() + sBody.GetByteString();
   WriteAppearance("N", GetRotatedRect(), GetMatrix(), sAP);
 }
 
-CPDF_Rect CPDFSDK_Widget::GetClientRect() const {
-  CPDF_Rect rcWindow = GetRotatedRect();
+CFX_FloatRect CPDFSDK_Widget::GetClientRect() const {
+  CFX_FloatRect rcWindow = GetRotatedRect();
   FX_FLOAT fBorderWidth = (FX_FLOAT)GetBorderWidth();
   switch (GetBorderStyle()) {
     case BBS_BEVELED:
     case BBS_INSET:
       fBorderWidth *= 2.0f;
       break;
   }
 
   return CPWL_Utils::DeflateRect(rcWindow, fBorderWidth);
 }
 
-CPDF_Rect CPDFSDK_Widget::GetRotatedRect() const {
-  CPDF_Rect rectAnnot = GetRect();
+CFX_FloatRect CPDFSDK_Widget::GetRotatedRect() const {
+  CFX_FloatRect rectAnnot = GetRect();
   FX_FLOAT fWidth = rectAnnot.right - rectAnnot.left;
   FX_FLOAT fHeight = rectAnnot.top - rectAnnot.bottom;
 
   CPDF_FormControl* pControl = GetFormControl();
-  CPDF_Rect rcPDFWindow;
+  CFX_FloatRect rcPDFWindow;
   switch (abs(pControl->GetRotation() % 360)) {
     case 0:
     case 180:
     default:
-      rcPDFWindow = CPDF_Rect(0, 0, fWidth, fHeight);
+      rcPDFWindow = CFX_FloatRect(0, 0, fWidth, fHeight);
       break;
     case 90:
     case 270:
-      rcPDFWindow = CPDF_Rect(0, 0, fHeight, fWidth);
+      rcPDFWindow = CFX_FloatRect(0, 0, fHeight, fWidth);
       break;
   }
 
   return rcPDFWindow;
 }
 
 CFX_ByteString CPDFSDK_Widget::GetBackgroundAppStream() const {
   CPWL_Color crBackground = GetFillPWLColor();
   if (crBackground.nColorType != COLORTYPE_TRANSPARENT) {
     return CPWL_Utils::GetRectFillAppStream(GetRotatedRect(), crBackground);
   }
   return "";
 }
 
 CFX_ByteString CPDFSDK_Widget::GetBorderAppStream() const {
-  CPDF_Rect rcWindow = GetRotatedRect();
+  CFX_FloatRect rcWindow = GetRotatedRect();
   CPWL_Color crBorder = GetBorderPWLColor();
   CPWL_Color crBackground = GetFillPWLColor();
   CPWL_Color crLeftTop, crRightBottom;
 
   FX_FLOAT fBorderWidth = (FX_FLOAT)GetBorderWidth();
   int32_t nBorderStyle = 0;
   CPWL_Dash dsBorder(3, 0, 0);
 
   switch (GetBorderStyle()) {
     case BBS_DASH:
@@ skipping 21 matching lines @@
   }
 
   return CPWL_Utils::GetBorderAppStream(rcWindow, fBorderWidth, crBorder,
                                         crLeftTop, crRightBottom, nBorderStyle,
                                         dsBorder);
 }
 
 CFX_Matrix CPDFSDK_Widget::GetMatrix() const {
   CFX_Matrix mt;
   CPDF_FormControl* pControl = GetFormControl();
-  CPDF_Rect rcAnnot = GetRect();
+  CFX_FloatRect rcAnnot = GetRect();
   FX_FLOAT fWidth = rcAnnot.right - rcAnnot.left;
   FX_FLOAT fHeight = rcAnnot.top - rcAnnot.bottom;
 
   switch (abs(pControl->GetRotation() % 360)) {
     case 0:
     default:
       mt = CFX_Matrix(1, 0, 0, 1, 0, 0);
       break;
     case 90:
       mt = CFX_Matrix(0, 1, -1, 0, fWidth, 0);
@@ skipping 998 matching lines @@
         CPDFSDK_Annot* pAnnot = m_pPageView->GetAnnot(i);
         if (pAnnot->GetType() == m_sType && pAnnot->GetSubType() == m_sSubType)
           sa.push_back(pAnnot);
       }
 
       std::sort(sa.begin(), sa.end(), CompareByLeftAscending);
       while (!sa.empty()) {
         int nLeftTopIndex = -1;
         FX_FLOAT fTop = 0.0f;
         for (int i = sa.size() - 1; i >= 0; i--) {
-          CPDF_Rect rcAnnot = GetAnnotRect(sa[i]);
+          CFX_FloatRect rcAnnot = GetAnnotRect(sa[i]);
           if (rcAnnot.top > fTop) {
             nLeftTopIndex = i;
             fTop = rcAnnot.top;
           }
         }
         if (nLeftTopIndex >= 0) {
           CPDFSDK_Annot* pLeftTopAnnot = sa[nLeftTopIndex];
-          CPDF_Rect rcLeftTop = GetAnnotRect(pLeftTopAnnot);
+          CFX_FloatRect rcLeftTop = GetAnnotRect(pLeftTopAnnot);
           m_Annots.push_back(pLeftTopAnnot);
           sa.erase(sa.begin() + nLeftTopIndex);
 
           std::vector<int> aSelect;
           for (int i = 0; i < sa.size(); ++i) {
-            CPDF_Rect rcAnnot = GetAnnotRect(sa[i]);
+            CFX_FloatRect rcAnnot = GetAnnotRect(sa[i]);
             FX_FLOAT fCenterY = (rcAnnot.top + rcAnnot.bottom) / 2.0f;
             if (fCenterY > rcLeftTop.bottom && fCenterY < rcLeftTop.top)
               aSelect.push_back(i);
           }
           for (int i = 0; i < aSelect.size(); ++i)
             m_Annots.push_back(sa[aSelect[i]]);
 
           for (int i = aSelect.size() - 1; i >= 0; --i)
             sa.erase(sa.begin() + aSelect[i]);
         }
       }
     } break;
     case COLUMN: {
       std::vector<CPDFSDK_Annot*> sa;
       for (size_t i = 0; i < m_pPageView->CountAnnots(); ++i) {
         CPDFSDK_Annot* pAnnot = m_pPageView->GetAnnot(i);
         if (pAnnot->GetType() == m_sType && pAnnot->GetSubType() == m_sSubType)
           sa.push_back(pAnnot);
       }
 
       std::sort(sa.begin(), sa.end(), CompareByTopDescending);
       while (!sa.empty()) {
         int nLeftTopIndex = -1;
         FX_FLOAT fLeft = -1.0f;
         for (int i = sa.size() - 1; i >= 0; --i) {
-          CPDF_Rect rcAnnot = GetAnnotRect(sa[i]);
+          CFX_FloatRect rcAnnot = GetAnnotRect(sa[i]);
           if (fLeft < 0) {
             nLeftTopIndex = 0;
             fLeft = rcAnnot.left;
           } else if (rcAnnot.left < fLeft) {
             nLeftTopIndex = i;
             fLeft = rcAnnot.left;
           }
         }
 
         if (nLeftTopIndex >= 0) {
           CPDFSDK_Annot* pLeftTopAnnot = sa[nLeftTopIndex];
-          CPDF_Rect rcLeftTop = GetAnnotRect(pLeftTopAnnot);
+          CFX_FloatRect rcLeftTop = GetAnnotRect(pLeftTopAnnot);
           m_Annots.push_back(pLeftTopAnnot);
           sa.erase(sa.begin() + nLeftTopIndex);
 
           std::vector<int> aSelect;
           for (int i = 0; i < sa.size(); ++i) {
-            CPDF_Rect rcAnnot = GetAnnotRect(sa[i]);
+            CFX_FloatRect rcAnnot = GetAnnotRect(sa[i]);
             FX_FLOAT fCenterX = (rcAnnot.left + rcAnnot.right) / 2.0f;
             if (fCenterX > rcLeftTop.left && fCenterX < rcLeftTop.right)
               aSelect.push_back(i);
           }
           for (int i = 0; i < aSelect.size(); ++i)
             m_Annots.push_back(sa[aSelect[i]]);
 
           for (int i = aSelect.size() - 1; i >= 0; --i)
             sa.erase(sa.begin() + aSelect[i]);
         }
       }
       break;
     }
   }
 }
 
-CPDF_Rect CBA_AnnotIterator::GetAnnotRect(const CPDFSDK_Annot* pAnnot) {
-  CPDF_Rect rcAnnot;
+CFX_FloatRect CBA_AnnotIterator::GetAnnotRect(const CPDFSDK_Annot* pAnnot) {
+  CFX_FloatRect rcAnnot;
   pAnnot->GetPDFAnnot()->GetRect(rcAnnot);
   return rcAnnot;
 }