Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/pdfwindow/PWL_ListCtrl.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_ListCtrl.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 CPWL_ListCtrl::CPWL_ListCtrl()
     : m_rcContent(0, 0, 0, 0),
       m_ptScroll(0, 0),
       m_fItemSpace(0.0f),
       m_fTopSpace(0.0f),
       m_fBottomSpace(0.0f) {}
 
 CPWL_ListCtrl::~CPWL_ListCtrl() {}
 
-void CPWL_ListCtrl::SetScrollPos(const CFX_FloatPoint& point) {
+void CPWL_ListCtrl::SetScrollPos(const CPDF_Point& point) {
   m_ptScroll = point;
 
   if (m_ptScroll.x < m_rcContent.left)
     m_ptScroll.x = m_rcContent.left;
 
   if (m_ptScroll.x > m_rcContent.right)
     m_ptScroll.x = m_rcContent.right;
 
   if (m_ptScroll.y > m_rcContent.top)
     m_ptScroll.y = m_rcContent.top;
 
   if (m_ptScroll.y < m_rcContent.bottom)
     m_ptScroll.y = m_rcContent.bottom;
 }
 
-CFX_FloatPoint CPWL_ListCtrl::GetScrollPos() const {
+CPDF_Point CPWL_ListCtrl::GetScrollPos() const {
   return m_ptScroll;
 }
 
-CFX_FloatRect CPWL_ListCtrl::GetScrollArea() const {
+CPDF_Rect CPWL_ListCtrl::GetScrollArea() const {
   return m_rcContent;
 }
 
 void CPWL_ListCtrl::ResetFace() {
   ResetAll(FALSE, 0);
 }
 
 void CPWL_ListCtrl::ResetContent(int32_t nStart) {
   if (nStart < 0)
     nStart = 0;
@@ skipping 20 matching lines @@
 
     fRet -= m_fItemSpace;
   }
 
   fRet += m_fBottomSpace;
 
   return fRet;
 }
 
 void CPWL_ListCtrl::ResetAll(FX_BOOL bMove, int32_t nStart) {
-  CFX_FloatRect rcClient = GetClientRect();
+  CPDF_Rect rcClient = GetClientRect();
 
   FX_FLOAT fWidth = rcClient.Width();
 
   FX_FLOAT fy = 0.0f - m_fTopSpace;
 
   if (nStart - 1 >= 0 && nStart - 1 < m_aChildren.GetSize())
     if (CPWL_Wnd* pChild = m_aChildren.GetAt(nStart - 1))
       fy = pChild->GetWindowRect().bottom - m_fItemSpace;
 
   for (int32_t i = nStart, sz = m_aChildren.GetSize(); i < sz; i++) {
     if (CPWL_Wnd* pChild = m_aChildren.GetAt(i)) {
       FX_FLOAT fLeft = pChild->GetItemLeftMargin();
       FX_FLOAT fRight = pChild->GetItemRightMargin();
 
       pChild->SetChildMatrix(CFX_Matrix(1, 0, 0, 1,
                                         rcClient.left - m_ptScroll.x,
                                         rcClient.top - m_ptScroll.y));
 
       if (bMove) {
         FX_FLOAT fItemHeight = pChild->GetItemHeight(fWidth - fLeft - fRight);
-        pChild->Move(
-            CFX_FloatRect(fLeft, fy - fItemHeight, fWidth - fRight, fy), TRUE,
-            FALSE);
+        pChild->Move(CPDF_Rect(fLeft, fy - fItemHeight, fWidth - fRight, fy),
+                     TRUE, FALSE);
         fy -= fItemHeight;
         fy -= m_fItemSpace;
       }
     }
   }
 
   fy += m_fItemSpace;
 
   fy -= m_fBottomSpace;
 
@@ skipping 17 matching lines @@
   m_fBottomSpace = fSpace;
 }
 
 void CPWL_ListCtrl::RePosChildWnd() {
   ResetFace();
 }
 
 void CPWL_ListCtrl::DrawChildAppearance(CFX_RenderDevice* pDevice,
                                         CFX_Matrix* pUser2Device) {
   pDevice->SaveState();
-  CFX_FloatRect rcClient = GetClientRect();
-  CFX_FloatRect rcTemp = rcClient;
+  CPDF_Rect rcClient = GetClientRect();
+  CPDF_Rect rcTemp = rcClient;
   pUser2Device->TransformRect(rcTemp);
   FX_RECT rcClip((int32_t)rcTemp.left, (int32_t)rcTemp.bottom,
                  (int32_t)rcTemp.right, (int32_t)rcTemp.top);
 
   pDevice->SetClip_Rect(&rcClip);
 
   for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) {
     if (CPWL_Wnd* pChild = m_aChildren.GetAt(i)) {
-      CFX_FloatRect rcChild = pChild->ChildToParent(pChild->GetWindowRect());
+      CPDF_Rect rcChild = pChild->ChildToParent(pChild->GetWindowRect());
       if (!(rcChild.top < rcClient.bottom || rcChild.bottom > rcClient.top)) {
         CFX_Matrix mt = pChild->GetChildMatrix();
         if (mt.IsIdentity()) {
           pChild->DrawAppearance(pDevice, pUser2Device);
         } else {
           mt.Concat(*pUser2Device);
           pChild->DrawAppearance(pDevice, &mt);
         }
       }
     }
   }
 
   pDevice->RestoreState();
 }
 
 int32_t CPWL_ListCtrl::GetItemIndex(CPWL_Wnd* pItem) {
   for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) {
     if (pItem == m_aChildren.GetAt(i))
       return i;
   }
 
   return -1;
 }
 
-CFX_FloatPoint CPWL_ListCtrl::InToOut(const CFX_FloatPoint& point) const {
-  CFX_FloatRect rcClient = GetClientRect();
+CPDF_Point CPWL_ListCtrl::InToOut(const CPDF_Point& point) const {
+  CPDF_Rect rcClient = GetClientRect();
 
-  return CFX_FloatPoint(point.x + rcClient.left - m_ptScroll.x,
-                        point.y + rcClient.top - m_ptScroll.y);
+  return CPDF_Point(point.x + rcClient.left - m_ptScroll.x,
+                    point.y + rcClient.top - m_ptScroll.y);
 }
 
-CFX_FloatPoint CPWL_ListCtrl::OutToIn(const CFX_FloatPoint& point) const {
-  CFX_FloatRect rcClient = GetClientRect();
+CPDF_Point CPWL_ListCtrl::OutToIn(const CPDF_Point& point) const {
+  CPDF_Rect rcClient = GetClientRect();
 
-  return CFX_FloatPoint(point.x - rcClient.left + m_ptScroll.x,
-                        point.y - rcClient.top + m_ptScroll.y);
+  return CPDF_Point(point.x - rcClient.left + m_ptScroll.x,
+                    point.y - rcClient.top + m_ptScroll.y);
 }
 
-CFX_FloatRect CPWL_ListCtrl::InToOut(const CFX_FloatRect& rect) const {
-  CFX_FloatRect rcClient = GetClientRect();
+CPDF_Rect CPWL_ListCtrl::InToOut(const CPDF_Rect& rect) const {
+  CPDF_Rect rcClient = GetClientRect();
 
-  return CFX_FloatRect(rect.left + rcClient.left - m_ptScroll.x,
-                       rect.bottom + rcClient.top - m_ptScroll.y,
-                       rect.right + rcClient.left - m_ptScroll.x,
-                       rect.top + rcClient.top - m_ptScroll.y);
+  return CPDF_Rect(rect.left + rcClient.left - m_ptScroll.x,
+                   rect.bottom + rcClient.top - m_ptScroll.y,
+                   rect.right + rcClient.left - m_ptScroll.x,
+                   rect.top + rcClient.top - m_ptScroll.y);
 }
 
-CFX_FloatRect CPWL_ListCtrl::OutToIn(const CFX_FloatRect& rect) const {
-  CFX_FloatRect rcClient = GetClientRect();
+CPDF_Rect CPWL_ListCtrl::OutToIn(const CPDF_Rect& rect) const {
+  CPDF_Rect rcClient = GetClientRect();
 
-  return CFX_FloatRect(rect.left - rcClient.left + m_ptScroll.x,
-                       rect.bottom - rcClient.top + m_ptScroll.y,
-                       rect.right - rcClient.left + m_ptScroll.x,
-                       rect.top - rcClient.top + m_ptScroll.y);
+  return CPDF_Rect(rect.left - rcClient.left + m_ptScroll.x,
+                   rect.bottom - rcClient.top + m_ptScroll.y,
+                   rect.right - rcClient.left + m_ptScroll.x,
+                   rect.top - rcClient.top + m_ptScroll.y);
 }