Remove CFX_PtrArray from xfa/include/fwl

xfa/src/fwl/src/lightwidget/listbox.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 <memory>
 
+#include "third_party/base/stl_util.h"
 #include "xfa/src/foxitlib.h"
 
 CFWL_ListBox* CFWL_ListBox::Create() {
   return new CFWL_ListBox;
 }
 FWL_ERR CFWL_ListBox::Initialize(const CFWL_WidgetProperties* pProperties) {
   if (m_pIface)
     return FWL_ERR_Indefinite;
   if (pProperties) {
     *m_pProperties = *pProperties;
   }
   std::unique_ptr<IFWL_ListBox> pListBox(IFWL_ListBox::Create(
       m_pProperties->MakeWidgetImpProperties(&m_ListBoxDP), nullptr));
   FWL_ERR ret = pListBox->Initialize();
   if (ret != FWL_ERR_Succeeded) {
     return ret;
   }
   m_pIface = pListBox.release();
   CFWL_Widget::Initialize();
   return FWL_ERR_Succeeded;
 }
 FWL_ERR CFWL_ListBox::AddDIBitmap(CFX_DIBitmap* pDIB, FWL_HLISTITEM hItem) {
   reinterpret_cast<CFWL_ListItem*>(hItem)->m_pDIB = pDIB;
   return FWL_ERR_Succeeded;
 }
 FWL_HLISTITEM CFWL_ListBox::AddString(const CFX_WideStringC& wsAdd,
                                       FX_BOOL bSelect) {
-  CFWL_ListItem* pItem = new CFWL_ListItem;
+  std::unique_ptr<CFWL_ListItem> pItem(new CFWL_ListItem);
   pItem->m_dwStates = 0;
   pItem->m_wsText = wsAdd;
   pItem->m_dwStates = bSelect ? FWL_ITEMSTATE_LTB_Selected : 0;
-  m_ListBoxDP.m_arrItem.Add(pItem);
-  return (FWL_HLISTITEM)pItem;
+  m_ListBoxDP.m_ItemArray.push_back(std::move(pItem));
+  return (FWL_HLISTITEM)m_ListBoxDP.m_ItemArray.back().get();
 }
 FX_BOOL CFWL_ListBox::DeleteString(FWL_HLISTITEM hItem) {
   int32_t nIndex = m_ListBoxDP.GetItemIndex(GetWidget(), hItem);
-  if (nIndex < 0 || nIndex >= m_ListBoxDP.m_arrItem.GetSize()) {
+  if (nIndex < 0 ||
+      static_cast<size_t>(nIndex) >= m_ListBoxDP.m_ItemArray.size()) {
     return FALSE;
   }
   CFWL_ListItem* pDelItem =
       reinterpret_cast<CFWL_ListItem*>(m_ListBoxDP.GetItem(m_pIface, nIndex));
   int32_t iCount = m_ListBoxDP.CountItems(m_pIface);
   int32_t iSel = nIndex + 1;
   if (iSel >= iCount) {
     iSel = nIndex - 1;
     if (iSel < 0) {
       iSel = -1;
     }
   }
   if (iSel >= 0) {
     CFWL_ListItem* pSel =
         reinterpret_cast<CFWL_ListItem*>(m_ListBoxDP.GetItem(m_pIface, iSel));
     pSel->m_dwStates |= FWL_ITEMSTATE_LTB_Selected;
   }
-  m_ListBoxDP.m_arrItem.RemoveAt(nIndex);
+  m_ListBoxDP.m_ItemArray.erase(m_ListBoxDP.m_ItemArray.begin() + nIndex);
   delete pDelItem;
   return TRUE;
 }
 FX_BOOL CFWL_ListBox::DeleteAll() {
-  int32_t iCount = m_ListBoxDP.CountItems(m_pIface);
-  for (int32_t i = 0; i < iCount; i++) {
+  size_t iCount = m_ListBoxDP.CountItems(m_pIface);
+  for (size_t i = 0; i < iCount; ++i) {
     CFWL_ListItem* pItem =
         reinterpret_cast<CFWL_ListItem*>(m_ListBoxDP.GetItem(m_pIface, i));
     delete pItem;
   }
-  m_ListBoxDP.m_arrItem.RemoveAll();
+  m_ListBoxDP.m_ItemArray.clear();
   return TRUE;
 }
 int32_t CFWL_ListBox::CountSelItems() {
   if (!m_pIface)
     return 0;
   return static_cast<IFWL_ListBox*>(m_pIface)->CountSelItems();
 }
 FWL_HLISTITEM CFWL_ListBox::GetSelItem(int32_t nIndexSel) {
   if (!m_pIface)
     return NULL;
@@ skipping 17 matching lines @@
 FWL_ERR CFWL_ListBox::GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert) {
   if (!m_pIface)
     return FWL_ERR_Indefinite;
   return static_cast<IFWL_ListBox*>(m_pIface)->GetScrollPos(fPos, bVert);
 }
 FWL_ERR CFWL_ListBox::SetItemHeight(FX_FLOAT fItemHeight) {
   m_ListBoxDP.m_fItemHeight = fItemHeight;
   return FWL_ERR_Succeeded;
 }
 FWL_HLISTITEM CFWL_ListBox::GetFocusItem() {
-  for (int32_t i = 0; i < m_ListBoxDP.m_arrItem.GetSize(); i++) {
-    CFWL_ListItem* hItem =
-        static_cast<CFWL_ListItem*>(m_ListBoxDP.m_arrItem[i]);
-    if (hItem->m_dwStates & FWL_ITEMSTATE_LTB_Focused) {
-      return (FWL_HLISTITEM)hItem;
-    }
+  for (const auto& hItem : m_ListBoxDP.m_ItemArray) {
+    if (hItem->m_dwStates & FWL_ITEMSTATE_LTB_Focused)
+      return (FWL_HLISTITEM)hItem.get();
   }
-  return NULL;
+  return nullptr;
 }
 FWL_ERR CFWL_ListBox::SetFocusItem(FWL_HLISTITEM hItem) {
   int32_t nIndex = m_ListBoxDP.GetItemIndex(GetWidget(), hItem);
-  static_cast<CFWL_ListItem*>(m_ListBoxDP.m_arrItem[nIndex])->m_dwStates |=
-      FWL_ITEMSTATE_LTB_Focused;
+  m_ListBoxDP.m_ItemArray[nIndex]->m_dwStates |= FWL_ITEMSTATE_LTB_Focused;
   return FWL_ERR_Succeeded;
 }
 FWL_ERR* CFWL_ListBox::Sort(IFWL_ListBoxCompare* pCom) {
   return static_cast<IFWL_ListBox*>(m_pIface)->Sort(pCom);
 }
 int32_t CFWL_ListBox::CountItems() {
-  return m_ListBoxDP.m_arrItem.GetSize();
+  return pdfium::CollectionSize<int32_t>(m_ListBoxDP.m_ItemArray);
 }
 FWL_HLISTITEM CFWL_ListBox::GetItem(int32_t nIndex) {
-  int32_t nCount = m_ListBoxDP.m_arrItem.GetSize();
-  if (nIndex > nCount - 1 && nIndex < 0) {
-    return NULL;
-  }
-  return (FWL_HLISTITEM)m_ListBoxDP.m_arrItem[nIndex];
+  if (nIndex < 0 || nIndex >= CountItems())
+    return nullptr;
+
+  return (FWL_HLISTITEM)m_ListBoxDP.m_ItemArray[nIndex].get();
 }
 FWL_ERR CFWL_ListBox::SetItemString(FWL_HLISTITEM hItem,
                                     const CFX_WideStringC& wsText) {
   if (!hItem)
     return FWL_ERR_Indefinite;
   reinterpret_cast<CFWL_ListItem*>(hItem)->m_wsText = wsText;
   return FWL_ERR_Succeeded;
 }
 FWL_ERR CFWL_ListBox::GetItemString(FWL_HLISTITEM hItem,
                                     CFX_WideString& wsText) {
@@ skipping 39 matching lines @@
 }
 FX_DWORD CFWL_ListBox::GetItemStates(FWL_HLISTITEM hItem) {
   if (!hItem)
     return 0;
   CFWL_ListItem* pItem = reinterpret_cast<CFWL_ListItem*>(hItem);
   return pItem->m_dwStates | pItem->m_dwCheckState;
 }
 CFWL_ListBox::CFWL_ListBox() {}
 CFWL_ListBox::~CFWL_ListBox() {}
 CFWL_ListBox::CFWL_ListBoxDP::CFWL_ListBoxDP() {}
-CFWL_ListBox::CFWL_ListBoxDP::~CFWL_ListBoxDP() {
-  int32_t nCount = m_arrItem.GetSize();
-  for (int32_t i = 0; i < nCount; i++) {
-    delete static_cast<CFWL_ListItem*>(m_arrItem[i]);
-  }
-  m_arrItem.RemoveAll();
-}
+CFWL_ListBox::CFWL_ListBoxDP::~CFWL_ListBoxDP() {}
 FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::GetCaption(IFWL_Widget* pWidget,
                                                  CFX_WideString& wsCaption) {
   wsCaption = m_wsData;
   return FWL_ERR_Succeeded;
 }
 int32_t CFWL_ListBox::CFWL_ListBoxDP::CountItems(IFWL_Widget* pWidget) {
-  return m_arrItem.GetSize();
+  return pdfium::CollectionSize<int32_t>(m_ItemArray);
 }
 FWL_HLISTITEM CFWL_ListBox::CFWL_ListBoxDP::GetItem(IFWL_Widget* pWidget,
                                                     int32_t nIndex) {
-  if (nIndex >= m_arrItem.GetSize() || nIndex < 0) {
-    return NULL;
-  } else {
-    return (FWL_HLISTITEM)m_arrItem[nIndex];
-  }
+  if (nIndex < 0 || nIndex >= CountItems(pWidget))
+    return nullptr;
+
+  return (FWL_HLISTITEM)m_ItemArray[nIndex].get();
 }
 int32_t CFWL_ListBox::CFWL_ListBoxDP::GetItemIndex(IFWL_Widget* pWidget,
                                                    FWL_HLISTITEM hItem) {
-  return m_arrItem.Find(hItem);
+  auto it = std::find_if(
+      m_ItemArray.begin(), m_ItemArray.end(),
+      [hItem](const std::unique_ptr<CFWL_ListItem>& candidate) {
+        return candidate.get() == reinterpret_cast<CFWL_ListItem*>(hItem);
+      });
+  return it != m_ItemArray.end() ? it - m_ItemArray.begin() : -1;
 }
 FX_BOOL CFWL_ListBox::CFWL_ListBoxDP::SetItemIndex(IFWL_Widget* pWidget,
                                                    FWL_HLISTITEM hItem,
                                                    int32_t nIndex) {
-  return m_arrItem.SetAt(nIndex, hItem);
+  if (nIndex < 0 || nIndex >= CountItems(pWidget))
+    return FALSE;
+  m_ItemArray[nIndex].reset(reinterpret_cast<CFWL_ListItem*>(hItem));
+  return TRUE;
 }
 FX_DWORD CFWL_ListBox::CFWL_ListBoxDP::GetItemStyles(IFWL_Widget* pWidget,
                                                      FWL_HLISTITEM hItem) {
   if (!hItem)
     return -1;
   return reinterpret_cast<CFWL_ListItem*>(hItem)->m_dwStates;
 }
 FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::GetItemText(IFWL_Widget* pWidget,
                                                   FWL_HLISTITEM hItem,
                                                   CFX_WideString& wsText) {
@@ skipping 65 matching lines @@
 FX_DWORD CFWL_ListBox::CFWL_ListBoxDP::GetItemCheckState(IFWL_Widget* pWidget,
                                                          FWL_HLISTITEM hItem) {
   return reinterpret_cast<CFWL_ListItem*>(hItem)->m_dwCheckState;
 }
 FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemCheckState(IFWL_Widget* pWidget,
                                                         FWL_HLISTITEM hItem,
                                                         FX_DWORD dwCheckState) {
   reinterpret_cast<CFWL_ListItem*>(hItem)->m_dwCheckState = dwCheckState;
   return FWL_ERR_Succeeded;
 }