Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/pdfwindow/PWL_Note.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_Note.h"
 
 #include "fpdfsdk/include/pdfwindow/PWL_Button.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
@@ skipping 24 matching lines @@
 
 void CPWL_Note_Options::SetTextColor(const CPWL_Color& color) {
   CPWL_Wnd::SetTextColor(color);
 
   if (m_pText)
     m_pText->SetTextColor(color);
 }
 
 void CPWL_Note_Options::RePosChildWnd() {
   if (IsValid()) {
-    CFX_FloatRect rcClient = GetClientRect();
+    CPDF_Rect rcClient = GetClientRect();
 
     if (rcClient.Width() > 15.0f) {
       rcClient.right -= 15.0f;
       m_pText->Move(rcClient, TRUE, FALSE);
       m_pText->SetVisible(TRUE);
     } else {
-      m_pText->Move(CFX_FloatRect(0, 0, 0, 0), TRUE, FALSE);
+      m_pText->Move(CPDF_Rect(0, 0, 0, 0), TRUE, FALSE);
       m_pText->SetVisible(FALSE);
     }
   }
 }
 
 void CPWL_Note_Options::CreateChildWnd(const PWL_CREATEPARAM& cp) {
   m_pText = new CPWL_Label;
   PWL_CREATEPARAM tcp = cp;
   tcp.pParentWnd = this;
   tcp.dwFlags = PWS_CHILD | PWS_VISIBLE;
   m_pText->Create(tcp);
 }
 
 void CPWL_Note_Options::SetText(const CFX_WideString& sText) {
   m_pText->SetText(sText.c_str());
 }
 
 void CPWL_Note_Options::DrawThisAppearance(CFX_RenderDevice* pDevice,
                                            CFX_Matrix* pUser2Device) {
   CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
 
-  CFX_FloatRect rcClient = GetClientRect();
+  CPDF_Rect rcClient = GetClientRect();
   rcClient.left = rcClient.right - 15.0f;
 
-  CFX_FloatPoint ptCenter =
-      CFX_FloatPoint((rcClient.left + rcClient.right) * 0.5f,
-                     (rcClient.top + rcClient.bottom) * 0.5f);
+  CPDF_Point ptCenter = CPDF_Point((rcClient.left + rcClient.right) * 0.5f,
+                                   (rcClient.top + rcClient.bottom) * 0.5f);
 
-  CFX_FloatPoint pt1(ptCenter.x - 2.0f, ptCenter.y + 2.0f * 0.5f);
-  CFX_FloatPoint pt2(ptCenter.x + 2.0f, ptCenter.y + 2.0f * 0.5f);
-  CFX_FloatPoint pt3(ptCenter.x, ptCenter.y - 3.0f * 0.5f);
+  CPDF_Point pt1(ptCenter.x - 2.0f, ptCenter.y + 2.0f * 0.5f);
+  CPDF_Point pt2(ptCenter.x + 2.0f, ptCenter.y + 2.0f * 0.5f);
+  CPDF_Point pt3(ptCenter.x, ptCenter.y - 3.0f * 0.5f);
 
   CFX_PathData path;
 
   path.SetPointCount(4);
   path.SetPoint(0, pt1.x, pt1.y, FXPT_MOVETO);
   path.SetPoint(1, pt2.x, pt2.y, FXPT_LINETO);
   path.SetPoint(2, pt3.x, pt3.y, FXPT_LINETO);
   path.SetPoint(3, pt1.x, pt1.y, FXPT_LINETO);
 
   pDevice->DrawPath(
       &path, pUser2Device, NULL,
       CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()), 0,
       FXFILL_ALTERNATE);
 }
 
-CFX_FloatRect CPWL_Note_Options::GetContentRect() const {
-  CFX_FloatRect rcText = m_pText->GetContentRect();
+CPDF_Rect CPWL_Note_Options::GetContentRect() const {
+  CPDF_Rect rcText = m_pText->GetContentRect();
   rcText.right += 15.0f;
   return rcText;
 }
 
 CPWL_Note_Edit::CPWL_Note_Edit()
     : m_bEnableNotify(TRUE),
       m_fOldItemHeight(0.0f),
       m_bSizeChanged(FALSE),
       m_fOldMin(0.0f),
       m_fOldMax(0.0f) {}
@@ skipping 88 matching lines @@
   if (fLimitWidth > 0) {
     if (!m_bSizeChanged)
       return m_fOldItemHeight;
 
     m_bSizeChanged = FALSE;
 
     EnableNotify(FALSE);
     EnableRefresh(FALSE);
     m_pEdit->EnableNotify(FALSE);
 
-    Move(CFX_FloatRect(0, 0, fLimitWidth, 0), TRUE, FALSE);
+    Move(CPDF_Rect(0, 0, fLimitWidth, 0), TRUE, FALSE);
     FX_FLOAT fRet = GetContentRect().Height();
 
     m_pEdit->EnableNotify(TRUE);
     EnableNotify(TRUE);
     EnableRefresh(TRUE);
 
     return fRet;
   }
 
   return 0;
 }
 
 FX_FLOAT CPWL_Note_Edit::GetItemLeftMargin() {
   return POPUP_ITEM_TEXT_INDENT;
 }
 
 FX_FLOAT CPWL_Note_Edit::GetItemRightMargin() {
   return POPUP_ITEM_TEXT_INDENT;
 }
 
 CPWL_Note_LBBox::CPWL_Note_LBBox() {}
 
 CPWL_Note_LBBox::~CPWL_Note_LBBox() {}
 
 void CPWL_Note_LBBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
                                          CFX_Matrix* pUser2Device) {
-  CFX_FloatRect rcClient = GetClientRect();
+  CPDF_Rect rcClient = GetClientRect();
 
   CFX_GraphStateData gsd;
   gsd.m_LineWidth = 1.0f;
 
   CFX_PathData pathCross;
 
   pathCross.SetPointCount(4);
   pathCross.SetPoint(0, rcClient.left, rcClient.top, FXPT_MOVETO);
   pathCross.SetPoint(1, rcClient.right, rcClient.bottom, FXPT_LINETO);
   pathCross.SetPoint(2, rcClient.left,
                      rcClient.bottom + rcClient.Height() * 0.5f, FXPT_MOVETO);
   pathCross.SetPoint(3, rcClient.left + rcClient.Width() * 0.5f,
                      rcClient.bottom, FXPT_LINETO);
 
   pDevice->DrawPath(
       &pathCross, pUser2Device, &gsd, 0,
       CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()),
       FXFILL_ALTERNATE);
 }
 
 CPWL_Note_RBBox::CPWL_Note_RBBox() {}
 
 CPWL_Note_RBBox::~CPWL_Note_RBBox() {}
 
 void CPWL_Note_RBBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
                                          CFX_Matrix* pUser2Device) {
-  CFX_FloatRect rcClient = GetClientRect();
+  CPDF_Rect rcClient = GetClientRect();
 
   CFX_GraphStateData gsd;
   gsd.m_LineWidth = 1.0f;
 
   CFX_PathData pathCross;
 
   pathCross.SetPointCount(4);
   pathCross.SetPoint(0, rcClient.right, rcClient.top, FXPT_MOVETO);
   pathCross.SetPoint(1, rcClient.left, rcClient.bottom, FXPT_LINETO);
   pathCross.SetPoint(2, rcClient.right,
@@ skipping 23 matching lines @@
 }
 
 CPWL_Note_CloseBox::CPWL_Note_CloseBox() : m_bMouseDown(FALSE) {}
 
 CPWL_Note_CloseBox::~CPWL_Note_CloseBox() {}
 
 void CPWL_Note_CloseBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
                                             CFX_Matrix* pUser2Device) {
   CPWL_Button::DrawThisAppearance(pDevice, pUser2Device);
 
-  CFX_FloatRect rcClient = GetClientRect();
+  CPDF_Rect rcClient = GetClientRect();
   rcClient = CPWL_Utils::DeflateRect(rcClient, 2.0f);
 
   CFX_GraphStateData gsd;
   gsd.m_LineWidth = 1.0f;
 
   CFX_PathData pathCross;
 
   if (m_bMouseDown) {
     rcClient.left += 0.5f;
     rcClient.right += 0.5f;
     rcClient.top -= 0.5f;
     rcClient.bottom -= 0.5f;
   }
 
   pathCross.SetPointCount(4);
   pathCross.SetPoint(0, rcClient.left, rcClient.bottom, FXPT_MOVETO);
   pathCross.SetPoint(1, rcClient.right, rcClient.top, FXPT_LINETO);
   pathCross.SetPoint(2, rcClient.left, rcClient.top, FXPT_MOVETO);
   pathCross.SetPoint(3, rcClient.right, rcClient.bottom, FXPT_LINETO);
 
   pDevice->DrawPath(
       &pathCross, pUser2Device, &gsd, 0,
       CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()),
       FXFILL_ALTERNATE);
 }
 
-FX_BOOL CPWL_Note_CloseBox::OnLButtonDown(const CFX_FloatPoint& point,
+FX_BOOL CPWL_Note_CloseBox::OnLButtonDown(const CPDF_Point& point,
                                           FX_DWORD nFlag) {
   SetBorderStyle(PBS_INSET);
   InvalidateRect(NULL);
 
   m_bMouseDown = TRUE;
 
   return CPWL_Button::OnLButtonDown(point, nFlag);
 }
 
-FX_BOOL CPWL_Note_CloseBox::OnLButtonUp(const CFX_FloatPoint& point,
+FX_BOOL CPWL_Note_CloseBox::OnLButtonUp(const CPDF_Point& point,
                                         FX_DWORD nFlag) {
   m_bMouseDown = FALSE;
 
   SetBorderStyle(PBS_BEVELED);
   InvalidateRect(NULL);
 
   return CPWL_Button::OnLButtonUp(point, nFlag);
 }
 
 CPWL_Note_Contents::CPWL_Note_Contents() : m_pEdit(NULL) {}
@@ skipping 87 matching lines @@
         ASSERT(pChild->GetClassName() == "CPWL_NoteItem");
         CPWL_NoteItem* pItem = (CPWL_NoteItem*)pChild;
         pItem->ResetSubjectName(i);
       }
     }
 
     OnNotify(this, PNM_NOTEEDITCHANGED, 0, 0);
   }
 }
 
-IPWL_NoteItem* CPWL_Note_Contents::GetHitNoteItem(const CFX_FloatPoint& point) {
-  CFX_FloatPoint pt = ParentToChild(point);
+IPWL_NoteItem* CPWL_Note_Contents::GetHitNoteItem(const CPDF_Point& point) {
+  CPDF_Point pt = ParentToChild(point);
 
   for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) {
     if (CPWL_Wnd* pChild = m_aChildren.GetAt(i)) {
       if (pChild->GetClassName() == "CPWL_NoteItem") {
         CPWL_NoteItem* pNoteItem = (CPWL_NoteItem*)pChild;
         if (IPWL_NoteItem* pRet = pNoteItem->GetHitNoteItem(pt))
           return pRet;
       }
     }
   }
@@ skipping 18 matching lines @@
         if (CPWL_Wnd* pChild = m_aChildren.GetAt(i))
           pChild->OnNotify(this, PNM_NOTERESET, 0, 0);
       }
 
       if (CPWL_Wnd* pParent = GetParentWindow()) {
         pParent->OnNotify(this, PNM_NOTEEDITCHANGED, 0, 0);
       }
     }
       return;
     case PNM_SCROLLWINDOW:
-      SetScrollPos(CFX_FloatPoint(0.0f, *(FX_FLOAT*)lParam));
+      SetScrollPos(CPDF_Point(0.0f, *(FX_FLOAT*)lParam));
       ResetFace();
       InvalidateRect(NULL);
       return;
     case PNM_SETCARETINFO:
       if (PWL_CARET_INFO* pInfo = (PWL_CARET_INFO*)wParam) {
         PWL_CARET_INFO newInfo = *pInfo;
         newInfo.bVisible = TRUE;
         newInfo.ptHead = ChildToParent(pInfo->ptHead);
         newInfo.ptFoot = ChildToParent(pInfo->ptFoot);
 
@@ skipping 15 matching lines @@
       m_pEdit->EnableNotify(FALSE);
       ResetContent(0);
       m_pEdit->EnableNotify(TRUE);
     }
       return;
   }
 
   CPWL_Wnd::OnNotify(pWnd, msg, wParam, lParam);
 }
 
-FX_BOOL CPWL_Note_Contents::OnLButtonDown(const CFX_FloatPoint& point,
+FX_BOOL CPWL_Note_Contents::OnLButtonDown(const CPDF_Point& point,
                                           FX_DWORD nFlag) {
   if (CPWL_Wnd::OnLButtonDown(point, nFlag))
     return TRUE;
 
   if (!m_pEdit->IsFocused()) {
     m_pEdit->SetFocus();
   }
 
   return TRUE;
 }
@@ skipping 86 matching lines @@
       CPWL_Color(COLORTYPE_RGB, 240 / 255.0f, 240 / 255.0f, 240 / 255.0f);
   ccp.dwFlags = PWS_VISIBLE | PWS_CHILD | PWS_BACKGROUND;
   m_pContents->Create(ccp);
   m_pContents->SetItemSpace(POPUP_ITEM_SPACE);
   m_pContents->SetTopSpace(POPUP_ITEM_SPACE);
   m_pContents->SetBottomSpace(POPUP_ITEM_SPACE);
 }
 
 void CPWL_NoteItem::RePosChildWnd() {
   if (IsValid()) {
-    CFX_FloatRect rcClient = GetClientRect();
+    CPDF_Rect rcClient = GetClientRect();
 
-    CFX_FloatRect rcSubject = rcClient;
+    CPDF_Rect rcSubject = rcClient;
     rcSubject.left += POPUP_ITEM_TEXT_INDENT;
     rcSubject.top = rcClient.top;
     rcSubject.right =
         PWL_MIN(rcSubject.left + m_pSubject->GetContentRect().Width() + 1.0f,
                 rcClient.right);
     rcSubject.bottom = rcSubject.top - m_pSubject->GetContentRect().Height();
     rcSubject.Normalize();
     m_pSubject->Move(rcSubject, TRUE, FALSE);
     m_pSubject->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcSubject));
 
-    CFX_FloatRect rcDate = rcClient;
+    CPDF_Rect rcDate = rcClient;
     rcDate.right -= POPUP_ITEM_TEXT_INDENT;
     rcDate.left =
         PWL_MAX(rcDate.right - m_pDateTime->GetContentRect().Width() - 1.0f,
                 rcSubject.right);
     rcDate.bottom = rcDate.top - m_pDateTime->GetContentRect().Height();
     rcDate.Normalize();
     m_pDateTime->Move(rcDate, TRUE, FALSE);
     m_pDateTime->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcDate));
 
-    CFX_FloatRect rcContents = rcClient;
+    CPDF_Rect rcContents = rcClient;
     rcContents.left += 1.0f;
     rcContents.right -= 1.0f;
     rcContents.top = rcDate.bottom - POPUP_ITEM_HEAD_BOTTOM;
     rcContents.bottom += POPUP_ITEM_BOTTOMWIDTH;
     rcContents.Normalize();
     m_pContents->Move(rcContents, TRUE, FALSE);
     m_pContents->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcContents));
   }
 
   SetClipRect(CPWL_Utils::InflateRect(GetWindowRect(), 1.0f));
@@ skipping 175 matching lines @@
   KillFocus();
 
   if (IPWL_NoteNotify* pNotify = GetNoteNotify()) {
     pNotify->OnItemDelete(pNoteItem);
   }
 
   if (m_pContents)
     m_pContents->DeleteSubItem(pNoteItem);
 }
 
-IPWL_NoteItem* CPWL_NoteItem::GetHitNoteItem(const CFX_FloatPoint& point) {
-  CFX_FloatPoint pt = ParentToChild(point);
+IPWL_NoteItem* CPWL_NoteItem::GetHitNoteItem(const CPDF_Point& point) {
+  CPDF_Point pt = ParentToChild(point);
 
   if (WndHitTest(pt)) {
     if (m_pContents) {
       if (IPWL_NoteItem* pNoteItem = m_pContents->GetHitNoteItem(pt))
         return pNoteItem;
     }
 
     return this;
   }
 
@@ skipping 37 matching lines @@
 }
 
 FX_FLOAT CPWL_NoteItem::GetItemLeftMargin() {
   return POPUP_ITEM_SIDEMARGIN;
 }
 
 FX_FLOAT CPWL_NoteItem::GetItemRightMargin() {
   return POPUP_ITEM_SIDEMARGIN;
 }
 
-FX_BOOL CPWL_NoteItem::OnLButtonDown(const CFX_FloatPoint& point,
-                                     FX_DWORD nFlag) {
+FX_BOOL CPWL_NoteItem::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) {
   if (!m_pContents->WndHitTest(m_pContents->ParentToChild(point))) {
     SetNoteFocus(FALSE);
   }
 
   CPWL_Wnd::OnLButtonDown(point, nFlag);
 
   return TRUE;
 }
 
-FX_BOOL CPWL_NoteItem::OnRButtonUp(const CFX_FloatPoint& point,
-                                   FX_DWORD nFlag) {
+FX_BOOL CPWL_NoteItem::OnRButtonUp(const CPDF_Point& point, FX_DWORD nFlag) {
   if (!m_pContents->WndHitTest(m_pContents->ParentToChild(point))) {
     SetNoteFocus(FALSE);
     PopupNoteItemMenu(point);
 
     return TRUE;
   }
 
   return CPWL_Wnd::OnRButtonUp(point, nFlag);
 }
 
@@ skipping 24 matching lines @@
     case PNM_NOTERESET:
       m_bSizeChanged = TRUE;
       m_pContents->OnNotify(this, PNM_NOTERESET, 0, 0);
 
       return;
   }
 
   CPWL_Wnd::OnNotify(pWnd, msg, wParam, lParam);
 }
 
-void CPWL_NoteItem::PopupNoteItemMenu(const CFX_FloatPoint& point) {
+void CPWL_NoteItem::PopupNoteItemMenu(const CPDF_Point& point) {
   if (IPWL_NoteNotify* pNotify = GetNoteNotify()) {
     int32_t x, y;
     PWLtoWnd(point, x, y);
     if (IFX_SystemHandler* pSH = GetSystemHandler())
       pSH->ClientToScreen(GetAttachedHWnd(), x, y);
     pNotify->OnPopupMenu(this, x, y);
   }
 }
 
 const CPWL_Note* CPWL_NoteItem::GetNote() const {
@@ skipping 92 matching lines @@
   } else {
     if (m_pContentsBar->IsVisible()) {
       m_pContentsBar->SetVisible(FALSE);
       m_pContentsBar->InvalidateRect(NULL);
 
       bScrollChanged = TRUE;
     }
   }
 
   if (bScrollChanged) {
-    CFX_FloatRect rcNote = GetClientRect();
-    CFX_FloatRect rcContents = m_pContents->GetWindowRect();
+    CPDF_Rect rcNote = GetClientRect();
+    CPDF_Rect rcContents = m_pContents->GetWindowRect();
     rcContents.right = rcNote.right - 3.0f;
     if (m_pContentsBar->IsVisible())
       rcContents.right -= PWL_SCROLLBAR_WIDTH;
     m_pContents->Move(rcContents, TRUE, TRUE);
-    m_pContents->SetScrollPos(CFX_FloatPoint(0.0f, 0.0f));
+    m_pContents->SetScrollPos(CPDF_Point(0.0f, 0.0f));
     m_pContents->InvalidateRect(NULL);
   }
 
   return bScrollChanged;
 }
 
 FX_BOOL CPWL_Note::ScrollBarShouldVisible() {
-  CFX_FloatRect rcContentsFact = m_pContents->GetScrollArea();
-  CFX_FloatRect rcContentsClient = m_pContents->GetClientRect();
+  CPDF_Rect rcContentsFact = m_pContents->GetScrollArea();
+  CPDF_Rect rcContentsClient = m_pContents->GetClientRect();
 
   return rcContentsFact.Height() > rcContentsClient.Height();
 }
 
 void CPWL_Note::SetOptionsText(const CFX_WideString& sText) {
   if (m_pOptions)
     m_pOptions->SetText(sText);
 
   RePosNoteChildren();
 }
 
 void CPWL_Note::RePosNoteChildren() {
   if (m_bResizing)
     return;
 
   m_bResizing = TRUE;
 
   if (IsValid()) {
-    CFX_FloatRect rcClient = GetClientRect();
+    CPDF_Rect rcClient = GetClientRect();
 
-    CFX_FloatRect rcIcon = rcClient;
+    CPDF_Rect rcIcon = rcClient;
     rcIcon.top -= 2.0f;
     rcIcon.right = rcIcon.left + 14.0f;
     rcIcon.bottom = rcIcon.top - 14.0f;
     rcIcon.Normalize();
     m_pIcon->Move(rcIcon, TRUE, FALSE);
     m_pIcon->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcIcon));
 
-    CFX_FloatRect rcCloseBox = rcClient;
+    CPDF_Rect rcCloseBox = rcClient;
     rcCloseBox.right -= 1.0f;
     rcCloseBox.top -= 1.0f;
     rcCloseBox.left = rcCloseBox.right - 14.0f;
     rcCloseBox.bottom = rcCloseBox.top - 14.0f;
     rcCloseBox.Normalize();
     m_pCloseBox->Move(rcCloseBox, TRUE, FALSE);
     m_pCloseBox->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcCloseBox));
 
-    CFX_FloatRect rcDate = rcClient;
+    CPDF_Rect rcDate = rcClient;
     rcDate.right = rcCloseBox.left - POPUP_ITEM_TEXT_INDENT;
     rcDate.left =
         PWL_MAX(rcDate.right - m_pDateTime->GetContentRect().Width() - 1.0f,
                 rcIcon.right + 1.0f);
     rcDate.top = rcClient.top - 2.0f;
     rcDate.bottom = rcDate.top - m_pDateTime->GetContentRect().Height();
     rcDate.Normalize();
     m_pDateTime->Move(rcDate, TRUE, FALSE);
     m_pDateTime->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcDate));
 
-    CFX_FloatRect rcSubject = rcClient;
+    CPDF_Rect rcSubject = rcClient;
     rcSubject.top = rcClient.top - 2.0f;
     rcSubject.left = rcIcon.right + POPUP_ITEM_TEXT_INDENT;
     rcSubject.right =
         PWL_MIN(rcSubject.left + m_pSubject->GetContentRect().Width() + 1.0f,
                 rcDate.left - 1.0f);
     rcSubject.bottom = rcSubject.top - m_pSubject->GetContentRect().Height();
     rcSubject.Normalize();
     m_pSubject->Move(rcSubject, TRUE, FALSE);
     m_pSubject->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcSubject));
 
-    CFX_FloatRect rcOptions = rcClient;
+    CPDF_Rect rcOptions = rcClient;
     rcOptions.left =
         PWL_MAX(rcOptions.right - m_pOptions->GetContentRect().Width(),
                 rcIcon.right + 1.0f);
     rcOptions.top = rcSubject.bottom - 4.0f;
     rcOptions.bottom = rcOptions.top - m_pOptions->GetContentRect().Height();
     rcOptions.Normalize();
     m_pOptions->Move(rcOptions, TRUE, FALSE);
     m_pOptions->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcOptions));
 
-    CFX_FloatRect rcAuthor = rcClient;
+    CPDF_Rect rcAuthor = rcClient;
     rcAuthor.top = rcSubject.bottom - 4.0f;
     rcAuthor.left = rcSubject.left;
     rcAuthor.right =
         PWL_MIN(rcSubject.left + m_pAuthor->GetContentRect().Width() + 1.0f,
                 rcOptions.left - 1.0f);
     rcAuthor.bottom = rcAuthor.top - m_pAuthor->GetContentRect().Height();
     rcAuthor.Normalize();
     m_pAuthor->Move(rcAuthor, TRUE, FALSE);
     m_pAuthor->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcAuthor));
 
-    CFX_FloatRect rcLBBox = rcClient;
+    CPDF_Rect rcLBBox = rcClient;
     rcLBBox.top = rcLBBox.bottom + 7.0f;
     rcLBBox.right = rcLBBox.left + 7.0f;
     rcLBBox.Normalize();
     m_pLBBox->Move(rcLBBox, TRUE, FALSE);
     m_pLBBox->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcLBBox));
 
-    CFX_FloatRect rcRBBox = rcClient;
+    CPDF_Rect rcRBBox = rcClient;
     rcRBBox.top = rcRBBox.bottom + 7.0f;
     rcRBBox.left = rcRBBox.right - 7.0f;
     rcRBBox.Normalize();
     m_pRBBox->Move(rcRBBox, TRUE, FALSE);
     m_pRBBox->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcRBBox));
 
-    CFX_FloatRect rcContents = rcClient;
+    CPDF_Rect rcContents = rcClient;
     rcContents.top = rcAuthor.bottom - POPUP_ITEM_HEAD_BOTTOM;
     rcContents.left += 3.0f;
     rcContents.right -= 3.0f;
     if (m_pContentsBar->IsVisible())
       rcContents.right -= PWL_SCROLLBAR_WIDTH;
     rcContents.bottom += 14.0f;
     rcContents.Normalize();
     m_pContents->Move(rcContents, FALSE, FALSE);
     m_pContents->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcContents));
 
-    CFX_FloatRect rcContentsBar = rcContents;
+    CPDF_Rect rcContentsBar = rcContents;
     rcContentsBar.right = rcClient.right - 3.0f;
     rcContentsBar.left = rcContentsBar.right - PWL_SCROLLBAR_WIDTH;
     rcContentsBar.Normalize();
     m_pContentsBar->Move(rcContentsBar, TRUE, FALSE);
   }
 
   m_bResizing = FALSE;
 }
 
 void CPWL_Note::CreateChildWnd(const PWL_CREATEPARAM& cp) {
@@ skipping 78 matching lines @@
 }
 
 CFX_WideString CPWL_Note::GetAuthorName() const {
   if (m_pAuthor)
     return m_pAuthor->GetText();
 
   return L"";
 }
 
 FX_BOOL CPWL_Note::OnMouseWheel(short zDelta,
-                                const CFX_FloatPoint& point,
+                                const CPDF_Point& point,
                                 FX_DWORD nFlag) {
-  CFX_FloatPoint ptScroll = m_pContents->GetScrollPos();
-  CFX_FloatRect rcScroll = m_pContents->GetScrollArea();
-  CFX_FloatRect rcContents = m_pContents->GetClientRect();
+  CPDF_Point ptScroll = m_pContents->GetScrollPos();
+  CPDF_Rect rcScroll = m_pContents->GetScrollArea();
+  CPDF_Rect rcContents = m_pContents->GetClientRect();
 
   if (rcScroll.top - rcScroll.bottom > rcContents.Height()) {
-    CFX_FloatPoint ptNew = ptScroll;
+    CPDF_Point ptNew = ptScroll;
 
     if (zDelta > 0)
       ptNew.y += 30;
     else
       ptNew.y -= 30;
 
     if (ptNew.y > rcScroll.top)
       ptNew.y = rcScroll.top;
     if (ptNew.y < rcScroll.bottom + rcContents.Height())
       ptNew.y = rcScroll.bottom + rcContents.Height();
@@ skipping 13 matching lines @@
 
   return FALSE;
 }
 
 void CPWL_Note::OnNotify(CPWL_Wnd* pWnd,
                          FX_DWORD msg,
                          intptr_t wParam,
                          intptr_t lParam) {
   switch (msg) {
     case PNM_NOTEEDITCHANGED: {
-      CFX_FloatRect rcScroll = m_pContents->GetScrollArea();
+      CPDF_Rect rcScroll = m_pContents->GetScrollArea();
 
       PWL_SCROLL_INFO sInfo;
       sInfo.fContentMin = rcScroll.bottom;
       sInfo.fContentMax = rcScroll.top;
       sInfo.fPlateWidth = m_pContents->GetClientRect().Height();
       sInfo.fSmallStep = 13.0f;
       sInfo.fBigStep = sInfo.fPlateWidth;
 
       if (FXSYS_memcmp(&m_OldScrollInfo, &sInfo, sizeof(PWL_SCROLL_INFO)) !=
           0) {
         FX_BOOL bScrollChanged = FALSE;
 
         if (lParam < 3) {
           bScrollChanged = ResetScrollBar();
           if (bScrollChanged) {
             lParam++;
             m_pContents->OnNotify(this, PNM_NOTERESET, 0, 0);
             OnNotify(this, PNM_NOTEEDITCHANGED, 0, lParam);
           }
         }
 
         if (!bScrollChanged) {
           if (m_pContentsBar->IsVisible()) {
             m_pContentsBar->OnNotify(pWnd, PNM_SETSCROLLINFO, SBT_VSCROLL,
                                      (intptr_t)&sInfo);
             m_OldScrollInfo = sInfo;
 
-            CFX_FloatPoint ptScroll = m_pContents->GetScrollPos();
-            CFX_FloatPoint ptOld = ptScroll;
+            CPDF_Point ptScroll = m_pContents->GetScrollPos();
+            CPDF_Point ptOld = ptScroll;
 
             if (ptScroll.y > sInfo.fContentMax)
               ptScroll.y = sInfo.fContentMax;
             if (ptScroll.y < sInfo.fContentMin + sInfo.fPlateWidth)
               ptScroll.y = sInfo.fContentMin + sInfo.fPlateWidth;
             if (ptScroll.y < sInfo.fContentMin)
               ptScroll.y = sInfo.fContentMin;
 
             if (ptOld.y != ptScroll.y) {
               m_pContentsBar->OnNotify(this, PNM_SETSCROLLPOS, SBT_VSCROLL,
@@ skipping 16 matching lines @@
       return;
     case PNM_SETSCROLLPOS:
       if (m_pContentsBar)
         m_pContentsBar->OnNotify(pWnd, PNM_SETSCROLLPOS, wParam, lParam);
       return;
   }
 
   if (msg == PNM_SETCARETINFO && IsValid()) {
     if (PWL_CARET_INFO* pInfo = (PWL_CARET_INFO*)wParam) {
       if (m_pContents) {
-        CFX_FloatRect rcClient = m_pContents->GetClientRect();
+        CPDF_Rect rcClient = m_pContents->GetClientRect();
         if (pInfo->ptHead.y > rcClient.top) {
-          CFX_FloatPoint pt = m_pContents->OutToIn(pInfo->ptHead);
+          CPDF_Point pt = m_pContents->OutToIn(pInfo->ptHead);
           m_pContents->OnNotify(this, PNM_SCROLLWINDOW, SBT_VSCROLL,
                                 (intptr_t)&pt.y);
 
-          CFX_FloatPoint ptScroll = m_pContents->GetScrollPos();
+          CPDF_Point ptScroll = m_pContents->GetScrollPos();
           m_pContentsBar->OnNotify(this, PNM_SETSCROLLPOS, SBT_VSCROLL,
                                    (intptr_t)&ptScroll.y);
 
           return;
         }
 
         if (pInfo->ptFoot.y < rcClient.bottom) {
-          CFX_FloatPoint pt = m_pContents->OutToIn(pInfo->ptFoot);
+          CPDF_Point pt = m_pContents->OutToIn(pInfo->ptFoot);
           pt.y += rcClient.Height();
           m_pContents->OnNotify(this, PNM_SCROLLWINDOW, SBT_VSCROLL,
                                 (intptr_t)&pt.y);
 
-          CFX_FloatPoint ptScroll = m_pContents->GetScrollPos();
+          CPDF_Point ptScroll = m_pContents->GetScrollPos();
           m_pContentsBar->OnNotify(this, PNM_SETSCROLLPOS, SBT_VSCROLL,
                                    (intptr_t)&ptScroll.y);
 
           return;
         }
       }
     }
   }
 
   CPWL_NoteItem::OnNotify(pWnd, msg, wParam, lParam);
@@ skipping 14 matching lines @@
   if (m_pAuthor)
     m_pAuthor->SetTextColor(sTextColor);
   if (m_pOptions)
     m_pOptions->SetTextColor(sTextColor);
   if (m_pLBBox)
     m_pLBBox->SetTextColor(sTextColor);
   if (m_pRBBox)
     m_pRBBox->SetTextColor(sTextColor);
 }
 
-FX_BOOL CPWL_Note::OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) {
+FX_BOOL CPWL_Note::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) {
   if (m_pOptions->WndHitTest(m_pOptions->ParentToChild(point))) {
     if (IPWL_NoteNotify* pNotify = GetNoteNotify()) {
       int32_t x, y;
       PWLtoWnd(point, x, y);
       if (IFX_SystemHandler* pSH = GetSystemHandler())
         pSH->ClientToScreen(GetAttachedHWnd(), x, y);
       KillFocus();
       pNotify->OnPopupMenu(x, y);
 
       return TRUE;
     }
   }
 
   return CPWL_Wnd::OnLButtonDown(point, nFlag);
 }
 
-FX_BOOL CPWL_Note::OnRButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) {
+FX_BOOL CPWL_Note::OnRButtonUp(const CPDF_Point& point, FX_DWORD nFlag) {
   return CPWL_Wnd::OnRButtonUp(point, nFlag);
 }
 
 const CPWL_Note* CPWL_Note::GetNote() const {
   return this;
 }
 
 IPWL_NoteNotify* CPWL_Note::GetNoteNotify() const {
   return m_bEnableNotify ? m_pNoteNotify : nullptr;
 }
@@ skipping 11 matching lines @@
   m_pContents->EnableRead(bEnabled);
 }
 
 CFX_WideString CPWL_Note::GetReplyString() const {
   return m_sReplyString;
 }
 
 void CPWL_Note::SetReplyString(const CFX_WideString& string) {
   m_sReplyString = string;
 }